Skip to content

Commit bccedf3

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into versioning
2 parents c1603e3 + 2ab68cc commit bccedf3

34 files changed

Lines changed: 319 additions & 269 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<Token>**APPLIES TO:** ![Yes](media/yes-icon.png)SQL Server ![Yes](media/yes-icon.png)Azure SQL Database ![Yes](media/yes-icon.png)Azure Synapse Analytics (SQL DW) ![Yes](media/yes-icon.png)Parallel Data Warehouse </Token>
1+
<Token>**APPLIES TO:** ![Yes](media/yes-icon.png)SQL Server ![Yes](media/yes-icon.png)Azure SQL Database ![Yes](media/yes-icon.png)Azure Synapse Analytics (SQL Data Warehouse) ![Yes](media/yes-icon.png)Parallel Data Warehouse </Token>
22

docs/includes/sssdwfull-md.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Azure Synapse Analytics (SQL DW)
1+
Azure Synapse Analytics (SQL Data Warehouse)

docs/integration-services/devops/ssis-devops-overview.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,14 @@ The configuration JSON schema has three layers:
339339

340340
## Release notes
341341

342+
### Version 1.0.0
343+
344+
Release Date: May 8, 2020
345+
346+
- General Availability (GA) release.
347+
- Added a restriction of minimum .NET framework version on agent. Currently the minimum .NET framework version is 4.6.2.
348+
- Refined description of SSIS Build task and SSIS Deploy task.
349+
342350
### Version 0.2.0 Preview
343351

344352
Release Date: March 31, 2020

docs/linux/sql-server-linux-availability-group-cluster-ubuntu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ sudo apt-get install mssql-server-ha
189189
To create the availability group resource, use `pcs resource create` command and set the resource properties. Below command creates a `ocf:mssql:ag` master/slave type resource for availability group with name `ag1`.
190190

191191
```bash
192-
sudo pcs resource create ag_cluster ocf:mssql:ag ag_name=ag1 meta failure-timeout=30s --master meta notify=true
192+
sudo pcs resource create ag_cluster ocf:mssql:ag ag_name=ag1 meta failure-timeout=30s master meta notify=true
193193

194194
```
195195

docs/relational-databases/blob/avoid-conflicts-with-database-operations-in-filestream-applications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Avoid conflicts - FILESTREAM database operations | Microsoft Docs"
3-
description: Avoid Conflicts with Database Operations in FILESTREAM Applications
3+
description: Applications that read or write FILESTREAM blob data can encounter conflict errors with Transact-SQL statements. Learn how to avoid these types of conflicts.
44
ms.custom: "seo-lt-2019"
55
ms.date: "12/13/2019"
66
ms.prod: sql

docs/relational-databases/blob/binary-large-object-blob-data-sql-server.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "Binary Large Object (Blob) Data (SQL Server) | Microsoft Docs"
3+
description: With FILESTREAM, FileTables, and Remote Blob Store (RBS), SQL Server can store blobs in the database or in remote storage. Compare options for storing blobs.
34
ms.custom: ""
45
ms.date: "03/14/2017"
56
ms.prod: sql

docs/relational-databases/blob/compare-options-for-storing-blobs-sql-server.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: Compare Options for Storing Blobs (SQL Server) | Microsoft Docs
3+
description: SQL Server can store binary large object (blob) data used by Windows applications. Compare options in this relational database for storing unstructured data.
34
ms.custom: ""
45
ms.date: 03/04/2019
56
ms.prod: sql

docs/relational-databases/blob/create-alter-and-drop-filetables.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "Create, Alter, and Drop FileTables | Microsoft Docs"
3+
description: In SQL Server, the FileTables feature uses a directory structure to store files. Learn how to create a new FileTable or alter or drop an existing FileTable.
34
ms.custom: ""
45
ms.date: "03/06/2017"
56
ms.prod: sql

docs/relational-databases/blob/enable-and-configure-filestream.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "Enable and configure FILESTREAM | Microsoft Docs"
3+
description: To use FILESTREAM, first enable it on the SQL Server Database Engine instance. Learn how to enable FILESTREAM by using SQL Server Configuration Manager.
34
ms.custom: ""
45
ms.date: "08/23/2017"
56
ms.prod: sql

docs/relational-databases/blob/enable-the-prerequisites-for-filetable.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "Enable the Prerequisites for FileTable | Microsoft Docs"
3+
description: To use FileTables, first turn on FILESTREAM, specify a directory, and set certain options and access levels. Learn how to meet all prerequisites.
34
ms.custom: ""
45
ms.date: "03/14/2017"
56
ms.prod: sql

0 commit comments

Comments
 (0)