Merge pull request #20662 from MicrosoftDocs/master

huypub · web-flow · commit 639b3b97bfb5 · 2021-11-12T15:37:07.000-08:00
11/12 PM Publish
diff --git a/docs/big-data-cluster/notebooks-tutorial-spark.md b/docs/big-data-cluster/notebooks-tutorial-spark.md
@@ -56,6 +56,9 @@ The following steps show how to open the notebook file in Azure Data Studio:
 
    ![Set Kernel and Attach to](media/notebook-tutorial-spark/set-kernel-and-attach-to.png)
 
+> [!IMPORTANT]
+> In Azure Data Studio, all Spark notebook types (Scala Spark, PySpark and SparkR) conventionally define some important Spark session related variables upon first cell execution. Those variables are: `spark`, `sc`, and `sqlContext`. When copying logic out of notebooks for batch submission (into a Python file to be run with `azdata bdc spark batch create` for example), make sure you define the variables accordingly.
+
 ## Run the notebook cells
 
 You can run each notebook cell by pressing the play button to the left of the cell. The results are shown in the notebook after the cell finishes running.
diff --git a/docs/big-data-cluster/release-notes-big-data-cluster.md b/docs/big-data-cluster/release-notes-big-data-cluster.md
@@ -50,7 +50,7 @@ The following table lists the release history for [!INCLUDE[big-data-clusters-no
 | Release <sup>1</sup> | [!INCLUDE[big-data-clusters-nover](../includes/ssbigdataclusters-ss-nover.md)] version | [!INCLUDE [azure-data-cli-azdata](../includes/azure-data-cli-azdata.md)] version <sup>2</sup> | Release date |
 |--|--|--|--|
 | [CU13](release-notes-cumulative-update-13.md) |  15.0.4178.15 | 20.3.8    | 2021-09-29 |
-| [CU12](release-notes-cumulative-update-12.md) |  15.0.4153.1 | 20.3.7    | 2021-08-04 |
+| [CU12](release-notes-cumulative-update-12.md) |  15.0.4153.13 | 20.3.7    | 2021-08-04 |
 | [CU11](release-notes-cumulative-updates-history.md#cu11) |  15.0.4138.2 | 20.3.5    | 2021-06-10 |
 | [CU10](release-notes-cumulative-updates-history.md#cu10) |  15.0.4123.1 | 20.3.2    | 2021-04-06 |
 | [CU9](release-notes-cumulative-updates-history.md#cu9) |  15.0.4102.2 | 20.3.0    | 2021-02-11 |
diff --git a/docs/relational-databases/collations/collation-and-unicode-support.md b/docs/relational-databases/collations/collation-and-unicode-support.md
@@ -2,7 +2,7 @@
 description: "Collation and Unicode support"
 title: "Collation and Unicode support | Microsoft Docs"
 ms.custom: ""
-ms.date: 12/05/2019
+ms.date: 08/02/2021
 ms.prod: sql
 ms.reviewer: ""
 ms.technology: 
@@ -25,6 +25,7 @@ helpviewer_keywords:
   - "SQL Server collations"
   - "UTF-8"
   - "UTF-16"
+  - "UCS-2"
   - "UTF8"
   - "UTF16"
   - "UCS2"
@@ -372,7 +373,7 @@ After you've assigned a collation to the server, you can change it only by expor
 To query the server collation for an instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], use the `SERVERPROPERTY` function:
 
 ```sql
-SELECT CONVERT(varchar, SERVERPROPERTY('collation'));
+SELECT CONVERT(nvarchar(128), SERVERPROPERTY('collation'));
 ```
 
 To query the server for all available collations, use the following `fn_helpcollations()` built-in function:
@@ -403,7 +404,7 @@ ALTER DATABASE myDB COLLATE Greek_CS_AI;
 You can retrieve the current collation of a database by using a statement that's similar to the following:
 
 ```sql
-SELECT CONVERT (VARCHAR(50), DATABASEPROPERTYEX('database_name','collation'));
+SELECT CONVERT (nvarchar(128), DATABASEPROPERTYEX('database_name', 'collation'));
 ```
 
 #### <a name="Column-level-collations"></a> Column-level collations    
@@ -454,7 +455,7 @@ It would be difficult to select a code page for character data types that will s
 If you store character data that reflects multiple languages in [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] ([!INCLUDE[ssVersion2005](../../includes/ssversion2005-md.md)] and later), use Unicode data types (**nchar**, **nvarchar**, and **ntext**) instead of non-Unicode data types (**char**, **varchar**, and **text**). 
 
 > [!NOTE]
-> For Unicode data types, the [!INCLUDE[ssde_md](../../includes/ssde_md.md)] can represent up to 65,535 characters using UCS-2, or the full Unicode range (‭1,114,111‬ characters) if supplementary characters are used. For more information about enabling supplementary characters, see [Supplementary Characters](#Supplementary_Characters).
+> For Unicode data types, the [!INCLUDE[ssde_md](../../includes/ssde_md.md)] can represent up to 65,536 characters using UCS-2, or the full Unicode range (‭1,114,112‬ characters) if supplementary characters are used. For more information about enabling supplementary characters, see [Supplementary Characters](#Supplementary_Characters).
 
 Alternatively, starting with [!INCLUDE[sql-server-2019](../../includes/sssql19-md.md)], if a UTF-8 enabled collation (\_UTF8) is used, previously non-Unicode data types (**char** and **varchar**) become Unicode data types using UTF-8 encoding. [!INCLUDE[sql-server-2019](../../includes/sssql19-md.md)] doesn't change the behavior of previously existing Unicode data types (**nchar**, **nvarchar**, and **ntext**), which continue to use UCS-2 or UTF-16 encoding. For more information, see [Storage differences between UTF-8 and UTF-16](#storage_differences).
 
@@ -499,7 +500,7 @@ The following table provides information about using multilingual data with vari
 |Non-Unicode|Non-Unicode|This is a very limiting scenario for multilingual data. You can use only a single code page.|    
     
 ##  <a name="Supplementary_Characters"></a> Supplementary characters    
-The Unicode Consortium allocates to each character a unique code point, which is a value in the range 000000–10FFFF. The most frequently used characters have code point values in the range 000000–00FFFF (65,535 characters) which fit into an 8-bit or 16-bit word in memory and on-disk. This range is usually designated as the Basic Multilingual Plane (BMP). 
+The Unicode Consortium allocates to each character a unique code point, which is a value in the range 000000–10FFFF. The most frequently used characters have code point values in the range 000000–00FFFF (65,536 characters) which fit into an 8-bit or 16-bit word in memory and on-disk. This range is usually designated as the Basic Multilingual Plane (BMP). 
 
 But the Unicode Consortium has established 16 additional "planes" of characters, each the same size as the BMP. This definition allows Unicode the potential to represent 1,114,112 characters (that is, 2<sup>16</sup> * 17 characters) within the code point range 000000–10FFFF. Characters with code point values larger than 00FFFF require two to four consecutive 8-bit words (UTF-8), or two consecutive 16-bit words (UTF-16). These characters located beyond the BMP are called *supplementary characters*, and the additional consecutive 8-bit or 16-bit words are called *surrogate pairs*. For more information about supplementary characters, surrogates, and surrogate pairs, refer to [the Unicode Standard](http://www.unicode.org/standard/standard.html).    
 
@@ -510,7 +511,7 @@ But the Unicode Consortium has established 16 additional "planes" of characters,
 [!INCLUDE[sql-server-2019](../../includes/sssql19-md.md)] extends supplementary character support to the **char** and **varchar** data types with the new UTF-8 enabled collations ([\_UTF8](#utf8)). These data types are also capable of representing the full Unicode character range.   
 
 > [!NOTE]
-> Starting with [!INCLUDE[ssSQL14](../../includes/sssql14-md.md)], all new \_140 collations automatically support supplementary characters.
+> Starting with [!INCLUDE[sssql17-md](../../includes/sssql17-md.md)], all new collations automatically support supplementary characters.
 
 If you use supplementary characters:    
     
@@ -540,7 +541,7 @@ The following table compares the behavior of some string functions and string op
 ## <a name="GB18030"></a> GB18030 support    
 GB18030 is a separate standard that's used in the People's Republic of China for encoding Chinese characters. In GB18030, characters can be 1, 2, or 4 bytes in length. [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] provides support for GB18030-encoded characters by recognizing them when they enter the server from a client-side application and converting and storing them natively as Unicode characters. After they're stored in the server, they're treated as Unicode characters in any subsequent operations. 
 
-You can use any Chinese collation, preferably the latest 100 version. All \_100 level collations support linguistic sorting with GB18030 characters. If the data includes supplementary characters (surrogate pairs), you can use the SC collations that are available in [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] to improve searching and sorting.    
+You can use any Chinese collation, preferably the latest 100 version. All version 100 collations support linguistic sorting with GB18030 characters. If the data includes supplementary characters (surrogate pairs), you can use the SC collations that are available in [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] to improve searching and sorting.    
 
 > [!NOTE]
 > Ensure that your client tools, such as [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)], use the Dengxian font to correctly display strings that contain GB18030-encoded characters.
@@ -556,16 +557,17 @@ Database applications that interact with [!INCLUDE[ssNoVersion](../../includes/s
 
 ## <a name="Japanese_Collations"></a> Japanese collations added in  [!INCLUDE [sssql17-md](../../includes/sssql17-md.md)]
  
-Starting with [!INCLUDE [sssql17-md](../../includes/sssql17-md.md)], new Japanese collation families are supported, with the permutations of various options (\_CS, \_AS, \_KS, \_WS, and \_VSS). 
+Starting with [!INCLUDE [sssql17-md](../../includes/sssql17-md.md)], new Japanese collation families are supported, with the permutations of various options (\_CS, \_AS, \_KS, \_WS, and \_VSS), as well as \_BIN and \_BIN2. 
 
 To list these collations, you can query the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)]:      
 
 ```sql 
-SELECT Name, Description FROM fn_helpcollations()  
-WHERE Name LIKE 'Japanese_Bushu_Kakusu_140%' OR Name LIKE 'Japanese_XJIS_140%'
+SELECT name, description
+FROM   sys.fn_helpcollations()  
+WHERE  COLLATIONPROPERTY(name, 'Version') = 3;
 ``` 
 
-All the new collations have built-in support for supplementary characters, so none of the new **\_140** collations has (or needs) the SC flag.
+All the new collations have built-in support for supplementary characters, so none of the new **140** collations has (or needs) the SC flag.
 
 These collations are supported in [!INCLUDE[ssde_md](../../includes/ssde_md.md)] indexes, memory-optimized tables, columnstore indexes, and natively compiled modules.
 
diff --git a/docs/relational-databases/indexes/create-nonclustered-indexes.md b/docs/relational-databases/indexes/create-nonclustered-indexes.md
@@ -2,7 +2,7 @@
 description: "Create Nonclustered Indexes"
 title: "Create Nonclustered Indexes | Microsoft Docs"
 ms.custom: ""
-ms.date: "02/17/2017"
+ms.date: 11/12/2021
 ms.prod: sql
 ms.prod_service: "table-view-index, sql-database"
 ms.reviewer: ""
@@ -56,7 +56,7 @@ monikerRange: "=azuresqldb-current||>=sql-server-2016||>=sql-server-linux-2017||
   
 3.  Right-click the table on which you want to create a nonclustered index and select **Design**.  
   
-4.  On the **Table Designer** menu, click **Indexes/Keys**.  
+4.  Right-click on the column you want to create the nonclustered index on and select **Indexes/Keys**.  
   
 5.  In the **Indexes/Keys** dialog box, click **Add**.  
   
@@ -92,14 +92,13 @@ monikerRange: "=azuresqldb-current||>=sql-server-2016||>=sql-server-linux-2017||
   
 #### To create a nonclustered index on a table  
   
-1.  In **Object Explorer**, connect to an instance of [!INCLUDE[ssDE](../../includes/ssde-md.md)].  
-  
+1.  In **Object Explorer**, connect to an instance of [!INCLUDE[ssDE](../../includes/ssde-md.md)] with AdventurWorks2019 installed. See [AdventureWorks sample databases](../../samples/adventureworks-install-configure.md?view=sql-server-ver15&tabs=ssms&preserve-view=true) to download AdventureWorks2019.
 2.  On the Standard bar, click **New Query**.  
   
 3.  Copy and paste the following example into the query window and click **Execute**.  
   
     ```sql  
-    USE AdventureWorks2012;  
+    USE AdventureWorks2019;  
     GO  
     -- Find an existing index named IX_ProductVendor_VendorID and delete it if found.   
     IF EXISTS (SELECT name FROM sys.indexes  
@@ -113,6 +112,7 @@ monikerRange: "=azuresqldb-current||>=sql-server-2016||>=sql-server-linux-2017||
     GO  
     ```  
   
-## Related content  
+## Next steps
+  
 [CREATE INDEX &#40;Transact-SQL&#41;](../../t-sql/statements/create-index-transact-sql.md)   
 [SQL Server Index Design Guide](../../relational-databases/sql-server-index-design-guide.md) 
diff --git a/docs/samples/adventureworks-install-configure.md b/docs/samples/adventureworks-install-configure.md
@@ -4,7 +4,7 @@ description: Follow these instructions to download and install AdventureWorks sa
 ms.prod: sql
 ms.prod_service: sql
 ms.technology: samples
-ms.date: "06/16/2020"
+ms.date: 11/12/2021
 ms.reviewer: ""
 ms.topic: conceptual
 author: MashaMSFT
@@ -66,14 +66,14 @@ To restore your database in SQL Server Management Studio, follow these steps:
 
    `C:\Program Files\Microsoft SQL Server\MSSQL15.MSSQLSERVER\MSSQL\Backup`. 
 
-3. Open SQL Server Management Studio (SSMS) and connect to your SQL Server in. 
+3. Open SQL Server Management Studio (SSMS) and connect to your SQL Server. 
 4. Right-click **Databases** in **Object Explorer** > **Restore Database...** to launch the **Restore Database** wizard. 
 
    :::image type="content" source="media/adventureworks-install-configure/restore-db-ssms.png" alt-text="Screenshot showing how to choose to restore your database by right-clicking databases in Object Explorer and then selecting Restore Database.":::
 
 
 1. Select **Device** and then select the ellipses **(...)** to choose a device. 
-1. Select **Add** and then choose the `.bak` file you recently moved to this location. If you moved your file to this location but you're not able to see it in the wizard, this typically indicates a permissions issue - SQL Server or the user signed into SQL Server does not have permission to this file in this folder. 
+1. Select **Add** and then choose the `.bak` file you recently moved to the backup location. If you moved your file to this location but you're not able to see it in the wizard, this typically indicates a permissions issue - SQL Server or the user signed into SQL Server does not have permission to this file in this folder. 
 1. Select **OK** to confirm your database backup selection and close the **Select backup devices** window. 
 1. Check the **Files** tab to confirm the **Restore as** location and file names match your intended location and file names in the **Restore Database** wizard. 
 1. Select **OK** to restore your database. 
@@ -113,7 +113,7 @@ GO
 
 # [Azure Data Studio](#tab/data-studio)
 
-If you're not familiar using [Azure Data Studio Studio](../azure-data-studio/download-azure-data-studio.md), you can see [connect & query](../azure-data-studio/quickstart-sql-server.md) to get started
+If you're not familiar using [Azure Data Studio Studio](../azure-data-studio/download-azure-data-studio.md), see [connect & query](../azure-data-studio/quickstart-sql-server.md) to get started
 
 To restore your database in Azure Data Studio, follow these steps:
 
@@ -155,9 +155,9 @@ To get sample data for Azure SQL Managed Instance instead, see [restore World Wi
 
 ### Deploy new sample database
 
-When you create a new database in Azure SQL Database, you have the option to create a blank database, or a sample database. 
+When you create a new database in Azure SQL Database, you have the option to create a blank database, restore from a backup or select sample data to populate your new database. 
 
-Follow these steps to use a sample database to create a new database: 
+Follow these steps to add a sample data to your new database: 
 
 1. Connect to your Azure portal.
 1. Select **Create a resource** in the top left of the navigation pane. 
@@ -167,8 +167,7 @@ Follow these steps to use a sample database to create a new database:
 
    :::image type="content" source="media/adventureworks-install-configure/deploy-sample-to-azure.png" alt-text="Choose sample as the data source on the Additional settings tab in the Azure portal when creating your Azure SQL Database":::
 
-1. Select **Create** to create your new SQL Database, which is the restored copy of the AdventureWorksLT database. 
-
+1. Select **Create** to create your new SQL Database, which is the restored copy of the AdventureWorksLT database.
 
 ### Deploy database from SQL Server
 
diff --git a/docs/t-sql/functions/json-modify-transact-sql.md b/docs/t-sql/functions/json-modify-transact-sql.md
@@ -74,7 +74,7 @@ JSON_MODIFY escapes all special characters in the new value if the type of the v
   
  The following table compares the behavior of **JSON_MODIFY** in lax mode and in strict mode. For more info about the optional path mode specification (lax or strict), see [JSON Path Expressions &#40;SQL Server&#41;](../../relational-databases/json/json-path-expressions-sql-server.md).  
   
-|Existing value|Path exists|Lax mode|Strict mode|  
+|New value|Path exists|Lax mode|Strict mode|  
 |--------------------|-----------------|--------------|-----------------|  
 |Not NULL|Yes|Update the existing value.|Update the existing value.|  
 |Not NULL|No|Try to create a new key:value pair on the specified path.<br /><br /> This may fail. For example, if you specify the path `$.user.setting.theme`, JSON_MODIFY does not insert the key `theme` if the `$.user` or `$.user.settings` objects do not exist, or if settings is an array or a scalar value.|Error - INVALID_PROPERTY|  
