merged and resolved conflicts

Author: Andre Chan

.openpublishing.redirection.json

@@ -41811,27 +41811,27 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "sql/advanced-analytics/tutorials/quickstart-r-verify.md",
+      "source_path": "docs/advanced-analytics/tutorials/quickstart-r-verify.md",
       "redirect_url": "/sql/advanced-analytics/tutorials/quickstart-r-create-script",
       "redirect_document_id": false
     },
     {
-      "source_path": "sql/advanced-analytics/tutorials/quickstart-r-run-using-tsql.md",
+      "source_path": "docs/advanced-analytics/tutorials/quickstart-r-run-using-tsql.md",
       "redirect_url": "/sql/advanced-analytics/tutorials/quickstart-r-create-script",
       "redirect_document_id": true
     },
     {
-      "source_path": "sql/advanced-analytics/tutorials/quickstart-r-inputs-and-outputs.md",
+      "source_path": "docs/advanced-analytics/tutorials/quickstart-r-inputs-and-outputs.md",
       "redirect_url": "/sql/advanced-analytics/tutorials/quickstart-r-create-script",
       "redirect_document_id": false
     },
     {
-      "source_path": "sql/advanced-analytics/tutorials/quickstart-r-create-predictive-model.md",
+      "source_path": "docs/advanced-analytics/tutorials/quickstart-r-create-predictive-model.md",
       "redirect_url": "/sql/advanced-analytics/tutorials/quickstart-r-train-score-model",
       "redirect_document_id": true
     },
     {
-      "source_path": "sql/advanced-analytics/tutorials/quickstart-r-predict-from-model.md",
+      "source_path": "docs/advanced-analytics/tutorials/quickstart-r-predict-from-model.md",
       "redirect_url": "/sql/advanced-analytics/tutorials/quickstart-r-train-score-model",
       "redirect_document_id": false
     },
@@ -59114,6 +59114,11 @@
       "source_path": "docs/ssms/quickstarts/connect-query-sql-server.md",
       "redirect_url": "/sql/ssms/quickstarts/ssms-connect-query-sql-server",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/relational-databases/security/encryption/always-encrypted-enclaves-query-columns-ssms.md",
+      "redirect_url": "/sql/relational-databases/security/encryption/always-encrypted-enclaves-query-columns",
+      "redirect_document_id": true
     }
   ]
 }

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/analytics-platform-system/whats-new-analytics-platform-system.md

@@ -136,7 +136,7 @@ New APS SSIS destination adapter that supports SQL Server 2017 as deployment tar
 Release date - July 2018
 
 ### DBCC commands do not consume concurrency slots (behavior change)
-APS supports a subset of the T-SQL [DBCC commands](../t-sql/database-console-commands/dbcc-transact-sql.md) such as [DBCC DROPCLEANBUFFERS](../t-sql/database-console-commands/dbcc-dropcleanbuffers-transact-sql.md). Previously, these commands would consume a [concurrency slot](./workload-management.md?view=aps-pdw-2016-au7#concurrency-slots) reducing the number of user loads/queries that could be executed. The `DBCC` commands are now run in a local queue that do not consume a user concurrency slot improving overall query execution performance.
+APS supports a subset of the T-SQL [DBCC commands](../t-sql/database-console-commands/dbcc-transact-sql.md) such as [DBCC DROPCLEANBUFFERS](../t-sql/database-console-commands/dbcc-dropcleanbuffers-transact-sql.md). Previously, these commands would consume a [concurrency slot](./workload-management.md?view=aps-pdw-2016-au7&preserve-view=true&#concurrency-slots) reducing the number of user loads/queries that could be executed. The `DBCC` commands are now run in a local queue that do not consume a user concurrency slot improving overall query execution performance.
 
 ### Replaces some metadata calls with catalog objects
 Using catalog objects for metadata calls instead of using SMO has shown performance improvement in APS. Starting from CU7.1, some of these metadata calls now use catalog objects by default. This behavior can be turned off by [feature switch](appliance-feature-switch.md) if customers using metadata queries run into any issues.

docs/azure-data-studio/deploy-azure-sql-server-vm.md

@@ -42,7 +42,7 @@ Next, enter all of the required parameters in the Azure SQL VM wizard.
 
 3. Enter a unique Virtual Machine name and your username and password credentials.
 
-4. Select your preferred image, SKU, and version, and then select your preferred VM size. You can learn more about [available VM sizes](https://docs.microsoft.com/azure/virtual-machines/sizes) to help you make your selection. Then select **Next**.
+4. Select your preferred image, SKU, and version, and then select your preferred VM size. You can learn more about [available VM sizes](/azure/virtual-machines/sizes) to help you make your selection. Then select **Next**.
 
 5. Either select an existing virtual network from the dropdown, or check the **New virtual network** checkbox to enter a name for a new virtual network.
 
@@ -70,6 +70,6 @@ The last step is to select **Run all** to run all cells in the Notebook. Once th
 To learn more about how to migrate your data to the new SQL VM, see the following article.
 
 > [!div class="nextstepaction"]
-> [Migrate a database to a SQL VM](https://docs.microsoft.com/azure/azure-sql/virtual-machines/windows/migrate-to-vm-from-sql-server)
+> [Migrate a database to a SQL VM](/azure/azure-sql/virtual-machines/windows/migrate-to-vm-from-sql-server)
 
-For other information about using SQL Server in Azure, see [SQL Server on Azure Virtual Machines](https://docs.microsoft.com/azure/azure-sql/virtual-machines/windows/sql-server-on-azure-vm-iaas-what-is-overview) and the [Frequently Asked Questions](https://docs.microsoft.com/azure/azure-sql/virtual-machines/windows/frequently-asked-questions-faq).
+For other information about using SQL Server in Azure, see [SQL Server on Azure Virtual Machines](/azure/azure-sql/virtual-machines/windows/sql-server-on-azure-vm-iaas-what-is-overview) and the [Frequently Asked Questions](/azure/azure-sql/virtual-machines/windows/frequently-asked-questions-faq).

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).**
 
@@ -145,6 +145,7 @@ Azure Data Studio runs on Windows, macOS, and Linux and is supported on the foll
 - macOS 10.14 Mojave
 - macOS 10.13 High Sierra
 - macOS 10.12 Sierra
+- macOS 11.1  Big Sur
 
 ### Linux
 

docs/azure-data-studio/extensions/extension-authoring.md

@@ -30,7 +30,7 @@ To develop an extension, you need [Node.js](https://nodejs.org/) installed and a
 To create your new extension, you can use the Azure Data Studio extension generator. The Yeoman [extension generator](https://www.npmjs.com/package/generator-azuredatastudio) is a beneficial starting point for extension projects. To start the generator, enter the following command in a command prompt:
 
 ```console
-npm install -g yo generator-azuredatastudio # Install the generator
+npm install -g yo generator-azuredatastudio
 yo azuredatastudio
 ```
 

docs/azure-data-studio/notebooks/notebooks-kqlmagic.md

@@ -249,9 +249,9 @@ Query data using the [render operator](/azure/data-explorer/kusto/query/renderop
 
 Learn more about notebooks and Kqlmagic:
 
-- [Kusto (KQL) extension for Azure Data Studio (Preview)](https://docs.microsoft.com/sql/azure-data-studio/extensions/kusto-extension)
-- [Create and run a Kusto (KQL) notebook (Preview)](https://docs.microsoft.com/sql/azure-data-studio/notebooks/notebooks-kusto-kernel)
+- [Kusto (KQL) extension for Azure Data Studio (Preview)](../extensions/kusto-extension.md)
+- [Create and run a Kusto (KQL) notebook (Preview)](./notebooks-kusto-kernel.md)
 - [Use a Jupyter Notebook and Kqlmagic extension to analyze data in Azure Data Explorer](/azure/data-explorer/Kqlmagic)
 - [Extension (Magic) to Jupyter Notebook and Jupyter lab](https://github.com/Microsoft/jupyter-Kqlmagic), that enable notebook experience working with Kusto, Application Insights, and LogAnalytics data.
 - [Kqlmagic](https://pypi.org/project/Kqlmagic/)
-- [How to use notebooks in Azure Data Studio](./notebooks-guidance.md)
+- [How to use notebooks in Azure Data Studio](./notebooks-guidance.md)

docs/azure-data-studio/quickstart-sql-dw.md

@@ -134,6 +134,6 @@ The query editor is still connected to the *master* database, but we want to cre
 If you don't plan to continue working with the sample databases created in this article, then [delete the resource group](/azure/synapse-analytics/sql-data-warehouse/create-data-warehouse-portal#clean-up-resources).
 
 ## Next steps
-For more information, visit [Connecting to Synapse SQL with Azure Data Studio](https://docs.microsoft.com/azure/synapse-analytics/sql/get-started-azure-data-studio).
+For more information, visit [Connecting to Synapse SQL with Azure Data Studio](/azure/synapse-analytics/sql/get-started-azure-data-studio).
 
 Now that you've successfully connected to an Azure Synapse Analytics and ran a query, try out the [Code editor tutorial](tutorial-sql-editor.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
@@ -45,7 +53,7 @@ November 12, 2020   /   version: 1.24.0
 | New Item | Details | Workaround |
 |----------|---------|------------|
 | Azure Arc extension | [Known Issue:](https://github.com/microsoft/azuredatastudio/issues/13319) The "Script to Notebook" button for Arc MIAA & PG deployments does not do field validation before scripting the notebook. This means that if users enter the password wrong in the password confirm inputs then they may end up with a notebook that has the wrong value for the password.| The "Deploy" button works as expected though so users should use that instead. |
-| Object Explorer | Releases of ADS before 1.24.0 have a breaking change in object explorer due to the engine's changes related to [Azure Synapse Analytics serverless SQL pool](https://docs.microsoft.com/azure/synapse-analytics/sql/on-demand-workspace-overview). | To continue utilizing object explorer in Azure Data Studio with Azure Synapse Analytics serverless SQL pool, you need to use Azure Data Studio 1.24.0 or later. |
+| Object Explorer | Releases of ADS before 1.24.0 have a breaking change in object explorer due to the engine's changes related to [Azure Synapse Analytics serverless SQL pool](/azure/synapse-analytics/sql/on-demand-workspace-overview). | To continue utilizing object explorer in Azure Data Studio with Azure Synapse Analytics serverless SQL pool, you need to use Azure Data Studio 1.24.0 or later. |
 
 You can reference [Azure Data Studio feedback](https://github.com/microsoft/azuredatastudio) for other known issues and to provide feedback to the product team.