resolved conflict

Author: lilgreenbird

docs/ado/guide/data/calling-a-stored-procedure-with-a-command.md

@@ -128,4 +128,4 @@ End Function
 ```  
 
 ## See Also  
- [Knowledge Base article 117500](https://go.microsoft.com/fwlink/?LinkId=117500)
+ [Knowledge Base article 117500](https://www.betaarchive.com/wiki/index.php?title=Microsoft_KB_Archive/185125)

docs/analytics-platform-system/polybase-configure-azure-blob-storage.md

@@ -1,6 +1,6 @@
 ---
-title: "Use PolyBase to access external data in Azure Blob storage"
-description: Explains how to use PolyBase on a Parallel Data Warehouse (APS) to query external data in Azure Blob storage. 
+title: "Use PolyBase to access external data in Azure Blob Storage"
+description: Explains how to use PolyBase on a Parallel Data Warehouse (APS) to query external data in Azure Blob Storage. 
 author: mzaman1 
 ms.prod: sql
 ms.technology: data-warehouse
@@ -10,28 +10,28 @@ ms.author: murshedz
 ms.reviewer: martinle
 ms.custom: seo-dt-2019
 ---
-# Configure PolyBase to access external data in Azure Blob storage
+# Configure PolyBase to access external data in Azure Blob Storage
 
-The article explains how to use PolyBase on a SQL Server instance to query external data in Azure Blob storage.
+The article explains how to use PolyBase on a SQL Server instance to query external data in Azure Blob Storage.
 
 > [!NOTE]
-> APS currently only supports standard general purpose v1 locally redundant (LRS) Azure Blob storage.
+> APS currently only supports standard general purpose v1 locally redundant (LRS) Azure Blob Storage.
 
 ## Prerequisites
 
- - Azure Blob storage in your subscription.
- - A container created in the Azure Blob storage.
+ - Azure Blob Storage in your subscription.
+ - A container created in the Azure Blob Storage.
 
-### Configure Azure Blob storage connectivity
+### Configure Azure Blob Storage connectivity
 
-First, configure APS to use Azure Blob storage.
+First, configure APS to use Azure Blob Storage.
 
-1. Run [sp_configure](../relational-databases/system-stored-procedures/sp-configure-transact-sql.md) with 'hadoop connectivity' set to an Azure Blob storage provider. To find the value for providers, see [PolyBase Connectivity Configuration](../database-engine/configure-windows/polybase-connectivity-configuration-transact-sql.md).
+1. Run [sp_configure](../relational-databases/system-stored-procedures/sp-configure-transact-sql.md) with 'hadoop connectivity' set to an Azure Blob Storage provider. To find the value for providers, see [PolyBase Connectivity Configuration](../database-engine/configure-windows/polybase-connectivity-configuration-transact-sql.md).
 
    ```sql  
    -- Values map to various external data sources.  
    -- Example: value 7 stands for Hortonworks HDP 2.1 to 2.6 on Linux,
-   -- 2.1 to 2.3 on Windows Server, and Azure Blob storage  
+   -- 2.1 to 2.3 on Windows Server, and Azure Blob Storage  
    sp_configure @configname = 'hadoop connectivity', @configvalue = 7;
    GO
 
@@ -43,15 +43,15 @@ First, configure APS to use Azure Blob storage.
 
 ## Configure an external table
 
-To query the data in your Azure Blob storage, you must define an external table to use in Transact-SQL queries. The following steps describe how to configure the external table.
+To query the data in your Azure Blob Storage, you must define an external table to use in Transact-SQL queries. The following steps describe how to configure the external table.
 
 1. Create a master key on the database. It is required to encrypt the credential secret.
 
    ```sql
    CREATE MASTER KEY ENCRYPTION BY PASSWORD = 'S0me!nfo';  
    ```
 
-1. Create a database scoped credential for Azure Blob storage.
+1. Create a database scoped credential for Azure Blob Storage.
 
    ```sql
    -- IDENTITY: any string (this is not used for authentication to Azure storage).  
@@ -75,7 +75,7 @@ To query the data in your Azure Blob storage, you must define an external table
 1. Create an external file format with [CREATE EXTERNAL FILE FORMAT](../t-sql/statements/create-external-file-format-transact-sql.md).
 
    ```sql
-   -- FORMAT TYPE: Type of format in Azure Blob storage (DELIMITEDTEXT,  RCFILE, ORC, PARQUET).
+   -- FORMAT TYPE: Type of format in Azure Blob Storage (DELIMITEDTEXT,  RCFILE, ORC, PARQUET).
    -- In this example, the files are pipe (|) delimited
    CREATE EXTERNAL FILE FORMAT TextFileFormat WITH (  
          FORMAT_TYPE = DELIMITEDTEXT,
@@ -118,7 +118,7 @@ The following queries provide example with fictional car sensor data.
 
 ### Ad hoc queries  
 
-The following ad hoc query joins relational with data in Azure Blob storage. It selects customers who drive faster than 35 mph, joining structured customer data stored in SQL Server with car sensor data stored in Azure Blob storage.  
+The following ad hoc query joins relational with data in Azure Blob Storage. It selects customers who drive faster than 35 mph, joining structured customer data stored in SQL Server with car sensor data stored in Azure Blob Storage.  
 
 ```sql  
 SELECT DISTINCT Insured_Customers.FirstName,Insured_Customers.LastName,
@@ -149,10 +149,10 @@ ON Insured_Customers.CustomerKey = SensorD.CustomerKey
 
 ### Exporting data  
 
-The following query exports data from APS to Azure Blob storage. It can be used to archive relational data to Azure Blob storage while still be able to query it.
+The following query exports data from APS to Azure Blob Storage. It can be used to archive relational data to Azure Blob Storage while still be able to query it.
 
 ```sql
--- Export data: Move old data to Azure Blob storage while keeping it query-able via an external table.  
+-- Export data: Move old data to Azure Blob Storage while keeping it query-able via an external table.  
 CREATE EXTERNAL TABLE [dbo].[FastCustomers2009] 
 WITH (  
       LOCATION='/archive/customer/2009',  

docs/azure-data-studio/download-azure-data-studio.md

@@ -8,7 +8,7 @@ author: yualan
 ms.author: alayu
 ms.reviewer: maghan
 ms.custom: seodec18
-ms.date: 12/11/2020
+ms.date: 1/22/2020
 ---
 
 # Download and install Azure Data Studio
@@ -21,9 +21,9 @@ Azure Data Studio offers a modern editor experience with IntelliSense, code snip
 
 | Platform | Download | Release date | Version |
 |----------|----------|--------------|---------|
-| Windows | [User Installer (recommended)](https://go.microsoft.com/fwlink/?linkid=2150927)<br>[System Installer](https://go.microsoft.com/fwlink/?linkid=2150928)<br>[.zip](https://go.microsoft.com/fwlink/?linkid=2151312) | December 11, 2020 | 1.25.1 |
-| macOS | [.zip](https://go.microsoft.com/fwlink/?linkid=2151311) | December 11, 2020 | 1.25.1 |
-| Linux | [.deb](https://go.microsoft.com/fwlink/?linkid=2151506)<br>[.rpm](https://go.microsoft.com/fwlink/?linkid=2151407)<br>[.tar.gz](https://go.microsoft.com/fwlink/?linkid=2151508) | December 11, 2020 | 1.25.1 |
+| Windows | [User Installer (recommended)](https://go.microsoft.com/fwlink/?linkid=2150927)<br>[System Installer](https://go.microsoft.com/fwlink/?linkid=2150928)<br>[.zip](https://go.microsoft.com/fwlink/?linkid=2151312) | January 22, 2020 | 1.25.2 |
+| macOS | [.zip](https://go.microsoft.com/fwlink/?linkid=2151311) | January 22, 2020 | 1.25.2 |
+| Linux | [.deb](https://go.microsoft.com/fwlink/?linkid=2151506)<br>[.rpm](https://go.microsoft.com/fwlink/?linkid=2151407)<br>[.tar.gz](https://go.microsoft.com/fwlink/?linkid=2151508) | January 22, 2020 | 1.25.2 |
 
 **For details about the latest release, see the [release notes](./release-notes-azure-data-studio.md).**
 

docs/azure-data-studio/release-notes-azure-data-studio.md

@@ -8,13 +8,21 @@ author: yualan
 ms.author: alayu
 ms.reviewer: maghan
 ms.custom: seodec18
-ms.date: 12/9/2020
+ms.date: 1/22/2020
 ---
 
 # Release notes for Azure Data Studio
 
 **[Download and install the latest release!](./download-azure-data-studio.md)**
 
+## December 2020 (hotfix)
+
+January 22, 2020   /   version: 1.25.2
+
+| Change | Details |
+| ------ | ------- |
+| Fix bug [#13899](https://github.com/microsoft/azuredatastudio/issues/13899)| Scrolling to the appropriate cross-reference links in Notebooks |
+
 ## December 2020
 
 December 9, 2020   /   version: 1.25.0
@@ -953,4 +961,4 @@ See one of the following quickstarts to get started:
 
 Contribute to Azure Data Studio:
 
-- [https://github.com/Microsoft/azuredatastudio](https://github.com/Microsoft/azuredatastudio)
+- [https://github.com/Microsoft/azuredatastudio](https://github.com/Microsoft/azuredatastudio)

docs/big-data-cluster/private-deploy.md

@@ -31,7 +31,7 @@ This section shows you deploy a BDC cluster in Azure Kubernetes Service (AKS) pr
 
 ## Create a private AKS cluster with advanced networking
 
-```console
+```bash
 
 export REGION_NAME=<your Azure region >
 export RESOURCE_GROUP=< your resource group name >
@@ -65,7 +65,7 @@ echo $SUBNET_ID
 
 To be able to get to next step, you need to provision an AKS cluster with Standard Load Balancer with private cluster feature enabled. Your command will look like as follows: 
 
-```console
+```bash
 az aks create \
     --resource-group $RESOURCE_GROUP \
     --name $AKS_NAME \
@@ -85,21 +85,21 @@ After a successful deployment, you can go to `<MC_yourakscluster>` resource grou
 
 ## Connect to an AKS cluster
 
-```console
+```azurecli
 az aks get-credentials -n $AKS_NAME -g $RESOURCE_GROUP
 ```
 
 ## Build Big Data Cluster (BDC) deployment profile
 
 After connecting to an AKS cluster, you can start to deploy BDC, and you can prepare the environment variable and initiate a deployment: 
 
-```console
+```azurecli
 azdata bdc config init --source aks-dev-test --target private-bdc-aks --force
 ```
 
 Generate and config BDC custom deployment profile:
 
-```console
+```azurecli
 azdata bdc config replace -c private-bdc-aks/control.json -j "$.spec.docker.imageTag=2019-CU6-ubuntu-16.04"
 azdata bdc config replace -c private-bdc-aks/control.json -j "$.spec.storage.data.className=default"
 azdata bdc config replace -c private-bdc-aks/control.json -j "$.spec.storage.logs.className=default"
@@ -118,13 +118,13 @@ In case you are [deploying a SQL Server Big Data Cluster (SQL-BDC) with high ava
 
 The following example sets the `ServiceType` as `NodePort`:
 
-```console
+```azurecli
 azdata bdc config replace -c private-bdc-aks /bdc.json -j "$.spec.resources.master.spec.endpoints[1].serviceType=NodePort"
 ```
 
 ## Deploy BDC in AKS private cluster
 
-```console
+```azurecli
 export AZDATA_USERNAME=<your bdcadmin username>
 export AZDATA_PASSWORD=< your bdcadmin password>
 

docs/big-data-cluster/quickstart-big-data-cluster-deploy-aro.md

@@ -39,7 +39,7 @@ The default big data cluster deployment used here consists of a SQL Master insta
 
 The script uses Azure CLI to automate the creation of an ARO cluster. Before running the script, you must log in to your Azure account with Azure CLI at least once. Run the following command from a command prompt.
 
-```terminal
+```azurecli
 az login
 ```
 
@@ -53,7 +53,7 @@ az login
 
 1. Run the script using:
 
-```terminal
+```console
 python deploy-sql-big-data-aro.py
 ```
 
@@ -77,7 +77,7 @@ If you are testing [!INCLUDE[big-data-clusters-2019](../includes/ssbigdatacluste
 
 Run the following Azure CLI command to remove the big data cluster and the ARO service in Azure (replace `<resource group name>` with the **Azure resource group** you specified in the deployment script):
 
-```terminal
+```azurecli
 az group delete -n <resource group name>
 ```
 

docs/connect/ado-net/sql/sqlclient-support-always-encrypted.md

@@ -82,7 +82,7 @@ To enable enclave computations for a database connection, you need to set the fo
 - `Enclave Attestation URL` - specifies an attestation URL (an attestation service endpoint). You need to obtain an attestation URL for your environment from your attestation service administrator.
 
   - If you're using [!INCLUDE[ssnoversion-md](../../../includes/ssnoversion-md.md)] and Host Guardian Service (HGS), see [Determine and share the HGS attestation URL](../../../relational-databases/security/encryption/always-encrypted-enclaves-host-guardian-service-deploy.md#step-6-determine-and-share-the-hgs-attestation-url).
-  - If you're using [!INCLUDE[ssSDSfull](../../../includes/sssdsfull-md.md)] and Microsoft Azure Attestation, see [Determine the attestation URL for your attestation policy](/azure-sql/database/always-encrypted-enclaves-configure-attestation#determine-the-attestation-url-for-your-attestation-policy).
+  - If you're using [!INCLUDE[ssSDSfull](../../../includes/sssdsfull-md.md)] and Microsoft Azure Attestation, see [Determine the attestation URL for your attestation policy](/sql/relational-databases/security/encryption/always-encrypted-enclaves?view=sql-server-ver15#secure-enclave-attestation).
 
 For a step-by-step tutorial, see [Tutorial: Develop a .NET application using Always Encrypted with secure enclaves](tutorial-always-encrypted-enclaves-develop-net-apps.md).
 

docs/connect/jdbc/download-microsoft-jdbc-driver-for-sql-server.md

@@ -1,7 +1,7 @@
 ---
 title: Download Microsoft JDBC Driver for SQL Server
 description: "Download the Microsoft JDBC Driver for SQL Server to develop Java applications that connect to SQL Server and Azure SQL Database."
-ms.date: 08/24/2020
+ms.date: 01/29/2021
 ms.prod: sql
 ms.prod_service: connectivity
 ms.reviewer: ""
@@ -17,15 +17,15 @@ The Microsoft JDBC Driver for SQL Server is a Type 4 JDBC driver that provides d
 
 ## Download
 
-Version 8.4 is the latest general availability (GA) version. It supports Java 8, 11, and 14. If you need to run on a Java runtime older than that, see the [Java and JDBC specification support matrix](microsoft-jdbc-driver-for-sql-server-support-matrix.md#java-and-jdbc-specification-support) to see if there is a supported driver version you can use. We are continually improving Java connectivity support. As such we highly recommend that you work with the latest version of Microsoft JDBC driver.
+Version 9.2 is the latest general availability (GA) version. It supports Java 8, 11, and 15. If you need to run on a Java runtime older than that, see the [Java and JDBC specification support matrix](microsoft-jdbc-driver-for-sql-server-support-matrix.md#java-and-jdbc-specification-support) to see if there is a supported driver version you can use. We are continually improving Java connectivity support. As such we highly recommend that you work with the latest version of Microsoft JDBC driver.
 
-**[![Download](../../ssms/media/download-icon.png) Download Microsoft JDBC Driver 8.4 for SQL Server (zip)](https://go.microsoft.com/fwlink/?linkid=2137600)**  
-**[![Download](../../ssms/media/download-icon.png) Download Microsoft JDBC Driver 8.4 for SQL Server (tar.gz)](https://go.microsoft.com/fwlink/?linkid=2137502)**  
+**[![Download](../../ssms/media/download-icon.png) Download Microsoft JDBC Driver 9.2 for SQL Server (zip)](https://go.microsoft.com/fwlink/?linkid=2153622)**  
+**[![Download](../../ssms/media/download-icon.png) Download Microsoft JDBC Driver 9.2 for SQL Server (tar.gz)](https://go.microsoft.com/fwlink/?linkid=2153521)**  
 
 ### Version information
 
-- Release number: 8.4.1
-- Released: August 27, 2020
+- Release number: 9.2.0
+- Released: January 29, 2021
 
 When you download the driver, there are multiple JAR files. The name of the JAR file indicates the version of Java that it supports.
 
@@ -36,11 +36,11 @@ When you download the driver, there are multiple JAR files. The name of the JAR
 
 This release of Microsoft JDBC Driver for SQL Server is available in the following languages:
 
-Microsoft JDBC Driver 8.4.1 for SQL Server (zip):
-[Chinese (Simplified)](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x804) | [Chinese (Traditional)](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x404) | [English (United States)](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x409) | [French](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x40c) | [German](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x407) | [Italian](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x410) | [Japanese](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x411) | [Korean](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x412) | [Portuguese (Brazil)](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x416) | [Russian](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x419) | [Spanish](https://go.microsoft.com/fwlink/?linkid=2137600&clcid=0x40a)
+Microsoft JDBC Driver 9.2.0 for SQL Server (zip):
+[Chinese (Simplified)](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x804) | [Chinese (Traditional)](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x404) | [English (United States)](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x409) | [French](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x40c) | [German](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x407) | [Italian](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x410) | [Japanese](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x411) | [Korean](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x412) | [Portuguese (Brazil)](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x416) | [Russian](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x419) | [Spanish](https://go.microsoft.com/fwlink/?linkid=2153622&clcid=0x40a)
 
-Microsoft JDBC Driver 8.4.1 for SQL Server (tar.gz):
-[Chinese (Simplified)](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x804) | [Chinese (Traditional)](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x404) | [English (United States)](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x409) | [French](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x40c) | [German](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x407) | [Italian](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x410) | [Japanese](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x411) | [Korean](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x412) | [Portuguese (Brazil)](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x416) | [Russian](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x419) | [Spanish](https://go.microsoft.com/fwlink/?linkid=2137502&clcid=0x40a)
+Microsoft JDBC Driver 9.2.0 for SQL Server (tar.gz):
+[Chinese (Simplified)](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x804) | [Chinese (Traditional)](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x404) | [English (United States)](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x409) | [French](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x40c) | [German](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x407) | [Italian](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x410) | [Japanese](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x411) | [Korean](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x412) | [Portuguese (Brazil)](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x416) | [Russian](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x419) | [Spanish](https://go.microsoft.com/fwlink/?linkid=2153521&clcid=0x40a)
 
 ### Release notes
 
@@ -58,7 +58,7 @@ The JDBC driver can be added to a Maven project by adding it as a dependency in
 <dependency>
     <groupId>com.microsoft.sqlserver</groupId>
     <artifactId>mssql-jdbc</artifactId>
-    <version>8.4.1.jre11</version>
+    <version>9.2.0.jre11</version>
 </dependency>
 ```