Merge branch 'main' into release-dallas

Author: v-alje

docs/azure-data-studio/extensions/azure-monitor-logs-extension.md

@@ -57,10 +57,10 @@ To set up an Azure Monitor Log workspace, follow the steps below.
 2. Fill in the **Connection Details** information.
     1. For **Connection type**, select *Azure Monitor Logs*.
     2. For **Workspace ID**, enter in your Log Analytics Workspace ID.
-    3. For **Authentication Type**, use the default - *Azure Active Directory - Universal with MFA account*.
+    3. For **Authentication type**, use the default - *Azure Active Directory - Universal with MFA account*.
     4. For **Account**, use your account information.
     5. For **Database**, select the same Workspace ID.
-    6. For **Server Group**, use *Default*.
+    6. For **Server group**, use *Default*.
         1. You can use this field to organize your servers in a specific group.
     7. For **Name (optional)**, leave blank.
         1. You can use this field to give your server an alias.

docs/relational-databases/databases/sql-server-data-files-in-microsoft-azure.md

@@ -23,7 +23,7 @@ SQL Server Data Files in Microsoft Azure enables native support for SQL Server d
 
  This topic introduces concepts and considerations that are central to storing SQL Server data files in Microsoft Azure Storage Service.  
 
-For a practical hands-on experience on how to use this feature, see [Tutorial: Using the Microsoft Azure Blob storage service with SQL Server 2016 databases](../tutorial-use-azure-blob-storage-service-with-sql-server-2016.md).  
+For a practical hands-on experience on how to use this feature, see [Tutorial: Using the Microsoft Azure Blob Storage with SQL Server 2016 databases](../tutorial-use-azure-blob-storage-service-with-sql-server-2016.md).  
 
 ## Why use SQL Server data files in Microsoft Azure? 
 
@@ -181,10 +181,10 @@ Starting with SQL Server 2014, a new SQL Server object has been added to be used
 **Database errors**  
 
 **Errors when creating a database**
-Resolution: Review the instructions given in Lesson 4 in [Tutorial: Using the Microsoft Azure Blob storage service with SQL Server 2016 databases](../tutorial-use-azure-blob-storage-service-with-sql-server-2016.md#4----restore-database-to-virtual-machine-from-url).  
+Resolution: Review the instructions given in Lesson 4 in [Tutorial: Using the Microsoft Azure Blob Storage with SQL Server 2016 databases](../tutorial-use-azure-blob-storage-service-with-sql-server-2016.md#4----restore-database-to-virtual-machine-from-url).  
 
 **Errors when running the Alter statement** 
-Resolution: Make sure to execute the Alter Database statement when the database is online. When copying the data files to Azure Storage, always create a page blob not a block blob. Otherwise, ALTER Database will fail. Review the instructions given in Lesson 7 in [Tutorial: Using the Microsoft Azure Blob storage service with SQL Server 2016 databases](../tutorial-use-azure-blob-storage-service-with-sql-server-2016.md).  
+Resolution: Make sure to execute the Alter Database statement when the database is online. When copying the data files to Azure Storage, always create a page blob not a block blob. Otherwise, ALTER Database will fail. Review the instructions given in Lesson 7 in [Tutorial: Using the Microsoft Azure Blob Storage with SQL Server 2016 databases](../tutorial-use-azure-blob-storage-service-with-sql-server-2016.md).  
 
 **Error code - 5120 Unable to open the physical file "%.\*ls". Operating system error %d: "%ls"**   
 

docs/relational-databases/tables/use-column-sets.md

@@ -1,8 +1,8 @@
 ---
-description: "Use Column Sets"
+description: "Use Column Sets to designate a column set to return all sparse columns in the table. A column set is an untyped XML representation that combines all the sparse columns of a table into a structured output."
 title: "Use Column Sets"
 ms.custom: ""
-ms.date: "07/09/2021"
+ms.date: "04/25/2022"
 ms.prod: sql
 ms.prod_service: "database-engine, sql-database, synapse-analytics, pdw"
 ms.reviewer: ""
@@ -31,10 +31,9 @@ monikerRange: "=azuresqldb-current||>=sql-server-2016||>=sql-server-linux-2017||
 
 -   A column set cannot be added to a table if that table already contains sparse columns.  
 
--   The column set cannot be changed. To change a column set, you must delete and re-create the sparse columns and the column set.  
-  
--   A column set can be added to a table that does not include any sparse columns. If sparse columns are later added to the table, they will appear in the column set.  
+-   The column set column cannot be changed or renamed. To change a column set, you must delete and re-create the sparse columns and the column set. Columns with the SPARSE keyword can be added and dropped from the table.
 
+-   A column set can be added to a table that does not include any sparse columns. If sparse columns are later added to the table, they will appear in the column set.    
 -   Only one column set is allowed per table.  
 
 -   A column set is optional and is not required to use sparse columns.  
@@ -136,7 +135,7 @@ GO
 ## Examples  
  In the following examples, a document table contains the common set of columns `DocID` and `Title`. The Production group wants a `ProductionSpecification` and `ProductionLocation` column for all production documents. The Marketing group wants a `MarketingSurveyGroup` column for marketing documents.  
 
-### A. Creating a table that has a column set  
+### A. Create a table that has a column set  
  The following example creates the table that uses sparse columns and includes the column set `SpecialPurposeColumns`. The example inserts two rows into the table, and then selects data from the table.  
 
 > [!NOTE]  
@@ -157,7 +156,7 @@ CREATE TABLE DocumentStoreWithColumnSet
 GO  
 ```  
 
-### B. Inserting data to a table by using the names of the sparse columns  
+### B. Insert data to a table using the names of the sparse columns  
  The following examples insert two rows into the table that is created in example A. The examples use the names of the sparse columns and do not reference the column set.  
 
 ```sql  
@@ -170,7 +169,7 @@ VALUES (2, 'Survey 2142', 'Men 25 - 35');
 GO  
 ```  
 
-### C. Inserting data to a table by using the name of the column set  
+### C. Insert data to a table by using the name of the column set  
  The following example inserts a third row into the table that is created in example A. This time the names of the sparse columns are not used. Instead, the name of the column set is used, and the insert provides the values for two of the four sparse columns in XML format.  
 
 ```sql  
@@ -179,7 +178,7 @@ VALUES (3, 'Tire Spec 2', '<ProductionSpecification>AXW9R411</ProductionSpecific
 GO  
 ```  
 
-### D. Observing the results of a column set when SELECT * is used  
+### D. Observe the results of a column set when SELECT * is used  
  The following example selects all the columns from the table that contains a column set. It returns an XML column with the combined values of the sparse columns. It does not return the sparse columns individually.  
 
 ```sql  
@@ -188,14 +187,14 @@ SELECT DocID, Title, SpecialPurposeColumns FROM DocumentStoreWithColumnSet ;
 
  [!INCLUDE[ssResult](../../includes/ssresult-md.md)]  
 
- ```
+ ```output
  DocID  Title        SpecialPurposeColumns  
  1      Tire Spec 1  <ProductionSpecification>AXZZ217</ProductionSpecification><ProductionLocation>27</ProductionLocation>  
  2      Survey 2142  <MarketingSurveyGroup>Men 25 - 35</MarketingSurveyGroup>  
  3      Tire Spec 2  <ProductionSpecification>AXW9R411</ProductionSpecification><ProductionLocation>38</ProductionLocation> 
  ```
 
-### E. Observing the results of selecting the column set by name  
+### E. Observe the results of selecting the column set by name  
  Because the Production department is not interested in the marketing data, this example adds a `WHERE` clause to restrict the output. The example uses the name of the column set.  
 
 ```sql  
@@ -206,13 +205,13 @@ WHERE ProductionSpecification IS NOT NULL ;
 
  [!INCLUDE[ssResult](../../includes/ssresult-md.md)]  
 
- ```
+ ```output
  DocID  Title        SpecialPurposeColumns  
  1      Tire Spec 1  <ProductionSpecification>AXZZ217</ProductionSpecification><ProductionLocation>27</ProductionLocation>  
  3      Tire Spec 2  <ProductionSpecification>AXW9R411</ProductionSpecification><ProductionLocation>38</ProductionLocation>  
  ```
 
-### F. Observing the results of selecting sparse columns by name  
+### F. Observe the results of selecting sparse columns by name  
  When a table contains a column set, you can still query the table by using the individual column names as shown in the following example.  
 
 ```sql  
@@ -223,7 +222,7 @@ WHERE ProductionSpecification IS NOT NULL ;
 
  [!INCLUDE[ssResult](../../includes/ssresult-md.md)]  
 
- ```
+ ```output
  DocID  Title        ProductionSpecification ProductionLocation`  
  1      Tire Spec 1  AXZZ217                 27`  
  3      Tire Spec 2  AXW9R411                38`  
@@ -240,9 +239,9 @@ GO
 ```  
 
 > [!IMPORTANT]  
->  An UPDATE statement that uses a column set updates all the sparse columns in the table. Sparse columns that are not referenced are updated to NULL.  
+>  An UPDATE statement that uses a column set updates all the sparse columns in the table. Sparse columns that are not referenced are updated to `NULL`.  
   
- The following example updates the third record, but only specifies the value of one of the two populated columns. The second column `ProductionLocation` is not included in the `UPDATE` statement and is updated to NULL.  
+ The following example updates the third record, but only specifies the value of one of the two populated columns. The second column `ProductionLocation` is not included in the `UPDATE` statement and is updated to `NULL`.  
 
 ```sql  
 UPDATE DocumentStoreWithColumnSet  
@@ -251,5 +250,5 @@ WHERE DocID = 3 ;
 GO  
 ```  
 
-## See also  
+## Next steps
  - [Use Sparse Columns](../../relational-databases/tables/use-sparse-columns.md)  

docs/t-sql/language-elements/try-catch-transact-sql.md

@@ -325,9 +325,7 @@ BEGIN CATCH
 END CATCH;  
 GO  
 ```  
-  
-## Examples: [!INCLUDE[ssSDWfull](../../includes/sssdwfull-md.md)] and [!INCLUDE[ssPDW](../../includes/sspdw-md.md)]  
-  
+   
 ### D. Using TRY...CATCH  
  The following example shows a `SELECT` statement that will generate a divide-by-zero error. The error causes execution to jump to the associated `CATCH` block.  
 

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

@@ -23,7 +23,7 @@ author: WilliamDAssafMSFT
 ms.author: wiassaf
 ms.reviewer: ""
 ms.custom: "seo-lt-2019"
-ms.date: 02/17/2022
+ms.date: 04/25/2022
 monikerRange: "= azuresqldb-current || = azuresqldb-mi-current || >= sql-server-2016 || >= sql-server-linux-2017 ||=azure-sqldw-latest"
 ---
 # ALTER DATABASE SCOPED CONFIGURATION (Transact-SQL)
@@ -35,7 +35,7 @@ This command enables several database configuration settings at the **individual
 Following settings are supported in [!INCLUDE[sssdsfull](../../includes/sssdsfull-md.md)], [!INCLUDE[ssSDSMIfull](../../includes/sssdsmifull-md.md)] and in [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] as indicated by the **APPLIES TO** line for each setting in the [Arguments](#arguments) section: 
 
 - Clear procedure cache.
-- Set the MAXDOP parameter to an arbitrary value (1,2, ...) for the primary database based on what works best for that particular database and set a different value (such as 0) for all secondary database used (such as for reporting queries).
+- Set the MAXDOP parameter to a recommended value (1,2, ...) for the primary database based on what works best for that particular workload, and set a different value for secondary replica databases used by reporting queries. For guidance on choosing a MAXDOP, review [Configure the max degree of parallelism Server Configuration Option](../../database-engine/configure-windows/configure-the-max-degree-of-parallelism-server-configuration-option.md).
 - Set the query optimizer cardinality estimation model independent of the database to compatibility level.
 - Enable or disable parameter sniffing at the database level.
 - Enable or disable query optimization hotfixes at the database level.