Skip to content

Commit 2628d33

Browse files
authored
Merge pull request #7927 from MicrosoftDocs/FromPublicRepo
Confirm merge from FromPublicRepo to master to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)
2 parents 4fbb6f2 + dac443b commit 2628d33

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

docs/azure-data-studio/download.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ For an optimal experience, please use the recommended system requirements.
152152
## Check for updates
153153
To check for latest updates, click the gear icon on the bottom left of the window and click **Check for Updates**
154154

155-
## Supported SQL offerings (SSMS 18.0 preview)
155+
## Supported SQL offerings
156156

157157
* This version of Azure Data Studio works with all [supported versions of SQL Server 2014 - [!INCLUDE[sql-server-2019](..\includes\sssqlv15-md.md)]](https://support.microsoft.com/lifecycle?C2=1044) and provides support for working with the latest cloud features in Azure SQL Database and Azure SQL Data Warehouse. Azure Data Studio also provides preview support for Azure SQL Managed Instance.
158158

docs/master-data-services/microsoft-excel-add-in/master-data-services-add-in-for-microsoft-excel.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ manager: craigg
2424

2525
## Downloads
2626
>* Download the Master Data Services Add-in for Excel for SQL Server 2016 SP1 from [this Microsoft Download Center page](https://go.microsoft.com/fwlink/?linkid=836866).
27-
>* Download the [!INCLUDE[ssMDSshort](../../includes/ssmdsshort-md.md)] [!INCLUDE[ssMDSXLS](../../includes/ssmdsxls-md.md)] for SQL Server 2017 CTP1 from [this Microsoft Download Center page](https://go.microsoft.com/fwlink/?linkid=836867). This add-in also works for SQL Server 2017 RC1.
28-
27+
>* Download the [!INCLUDE[ssMDSshort](../../includes/ssmdsshort-md.md)] [!INCLUDE[ssMDSXLS](../../includes/ssmdsxls-md.md)] for SQL Server 2017 from [this Microsoft Download Center page](https://go.microsoft.com/fwlink/?linkid=836867).
2928
3029

3130
## Terms

docs/t-sql/statements/alter-database-scoped-configuration-transact-sql.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,19 +211,19 @@ DISABLE_INTERLEAVED_EXECUTION_TVF = { ON | OFF }
211211

212212
**Applies to**: [!INCLUDE[ssSQL17](../../includes/sssql17-md.md)] and [!INCLUDE[ssSDSfull](../../includes/sssdsfull-md.md)]
213213

214-
Allows you to enable or disable Interleaved execution for multi-statement table valued functions at the database or statement scope while still maintaining database compatibility level 140 and higher. Interleaved execution is a feature that is part of Adaptive query processing in SQL databases. For more information, please refer to https://docs.microsoft.com/en-us/sql/relational-databases/performance/adaptive-query-processing?view=sql-server-2017 (sorry don't know how to do the links yet)
214+
Allows you to enable or disable Interleaved execution for multi-statement table valued functions at the database or statement scope while still maintaining database compatibility level 140 and higher. Interleaved execution is a feature that is part of Adaptive query processing in SQL databases. For more information, please see [Adaptive query processing](https://docs.microsoft.com/sql/relational-databases/performance/adaptive-query-processing).
215215

216216
DISABLE_BATCH_MODE_ADAPTIVE_JOINS = { ON | OFF }
217217

218218
**Applies to**: [!INCLUDE[ssSQL17](../../includes/sssql17-md.md)] and [!INCLUDE[ssSDSfull](../../includes/sssdsfull-md.md)]
219219

220-
Allows you to enable or disable Adaptive joins at the database or statement scope while still maintaining database compatibility level 140 and higher. Adaptive Joins is a feature that is part of Adaptive Query Processing (bolded is a link https://docs.microsoft.com/en-us/sql/relational-databases/performance/adaptive-query-processing?view=sql-server-2017) introduced in SQL Server 2017.
220+
Allows you to enable or disable Adaptive joins at the database or statement scope while still maintaining database compatibility level 140 and higher. Adaptive Joins is a feature that is part of [Adaptive query processing](https://docs.microsoft.com/sql/relational-databases/performance/adaptive-query-processing) introduced in SQL Server 2017.
221221

222222
ROW_MODE_MEMORY_GRANT_FEEDBACK = { ON | OFF}
223223

224224
***Applies to**: [!INCLUDE[ssSDS](../../includes/sssds-md.md)] and [!INCLUDE[ssNoVersion](../../includes/sssqlv15-md.md)] as a public preview feature
225225

226-
Allows you to enable or disable Row mode memory grant feedback at the database or statement scope while still maintaining database compatibility level 150 and higher. Row mode memory grant feedback a feature that is part of Adaptive Query Processing (bolded is a link https://docs.microsoft.com/en-us/sql/relational-databases/performance/adaptive-query-processing?view=sql-server-2017) introduced in SQL Server 2019.
226+
Allows you to enable or disable Row mode memory grant feedback at the database or statement scope while still maintaining database compatibility level 150 and higher. Row mode memory grant feedback a feature that is part of [Adaptive query processing](https://docs.microsoft.com/sql/relational-databases/performance/adaptive-query-processing) introduced in SQL Server 2019.
227227

228228

229229
## <a name="Permissions"></a> Permissions

0 commit comments

Comments
 (0)