Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into 10-14-update-articles-for-mi

garyericson · garyericson · commit ca32068608fe · 2020-10-15T11:11:58.000-07:00
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -59049,6 +59049,11 @@
       "source_path": "docs/ssms/tutorials/connect-query-sql-server.md",
       "redirect_url": "/sql/ssms/quickstarts/connect-query-sql-server",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/azure-data-studio/sanddance-extension.md",
+      "redirect_url": "/sql/azure-data-studio/extensions/sanddance-extension",
+      "redirect_document_id": true
     }
   ]
 }
diff --git a/docs/ado/guide/ado-programmer-s-guide.md b/docs/ado/guide/ado-programmer-s-guide.md
@@ -1,4 +1,4 @@
-﻿---
+---
 description: "ADO Programmer's Guide for using ADO Objects"
 title: "ADO Programmer's Guide | Microsoft Docs"
 ms.custom: ""
@@ -21,12 +21,12 @@ This documentation provides an overview of how to use ADO objects to work with d
 
 -   [Introduction](./ado-introduction.md)
 
--   [ActiveX Data Objects (ADO)](./data/ado-fundamentals.md?view=sql-server-ver15&preserve-view=true)
+-   [ActiveX Data Objects (ADO)](./data/ado-fundamentals.md?view=sql-server-ver15)
 
 -   [Remote Data Services (RDS)](./remote-data-service/remote-data-service-rds.md)
 
 -   [ADO (Multidimensional) (ADO MD)](./multidimensional/ado-multidimensional-ado-md.md)
 
 -   [ADO Extensions for Data Definition Language and Security (ADOX)](./extensions/ado-extensions-for-data-definition-language-and-security-adox.md)
 
--   [Appendixes](./appendixes/appendix-a-providers.md?view=sql-server-ver15&preserve-view=true)
+-   [Appendixes](./appendixes/appendix-a-providers.md?view=sql-server-ver15)
diff --git a/docs/ado/guide/extensions/adox-fundamentals.md b/docs/ado/guide/extensions/adox-fundamentals.md
@@ -1,4 +1,4 @@
-﻿---
+---
 description: "ADOX Fundamentals"
 title: "ADOX Fundamentals | Microsoft Docs"
 ms.prod: sql
@@ -38,7 +38,7 @@ Microsoft® ActiveX® Data Objects Extensions for Data Definition Language and S
 -   [ADOX Examples](../../reference/adox-api/adox-code-examples.md)  
   
 ## See Also  
- [ADOX API Reference](../../reference/adox-api/adox-object-model.md?view=sql-server-ver15&preserve-view=true)   
+ [ADOX API Reference](../../reference/adox-api/adox-object-model.md?view=sql-server-ver15)   
  [ADOX Code Examples](../../reference/adox-api/adox-code-examples.md)   
  [ADOX Collections](../../reference/adox-api/adox-collections.md)   
  [ADOX Enumerated Constants](../../reference/adox-api/adox-enumerated-constants.md)   
diff --git a/docs/ado/reference/ado-md-api/ado-md-code-examples.md b/docs/ado/reference/ado-md-api/ado-md-code-examples.md
@@ -1,4 +1,4 @@
-﻿---
+---
 description: "ADO MD Code Examples"
 title: "ADO MD Code Examples | Microsoft Docs"
 ms.prod: sql
@@ -24,7 +24,7 @@ Use the following code examples to learn how to use the ADO MD objects, methods,
 -   [ADO MD Code Examples in Visual Basic, Scripting Edition](./ado-md-code-examples-in-visual-basic-scripting-edition.md)  
   
 ## See Also  
- [ADO MD API Reference](./ado-md-object-model.md?view=sql-server-ver15&preserve-view=true)   
+ [ADO MD API Reference](./ado-md-object-model.md?view=sql-server-ver15)   
  [ADO MD Collections](./ado-md-collections.md)   
  [ADO MD Enumerated Constants](./ado-md-enumerated-constants.md)   
  [ADO MD Methods](./ado-md-methods.md)   
diff --git a/docs/ado/reference/ado-md-api/ado-md-collections.md b/docs/ado/reference/ado-md-api/ado-md-collections.md
@@ -1,4 +1,4 @@
-﻿---
+---
 description: "ADO MD Collections"
 title: "ADO MD Collections | Microsoft Docs"
 ms.prod: sql
@@ -28,7 +28,7 @@ ms.author: jroth
 |[Positions](./positions-collection-ado-md.md)|Contains the **Position** objects that define a point on an axis.|  
   
 ## See Also  
- [ADO MD API Reference](./ado-md-object-model.md?view=sql-server-ver15&preserve-view=true)   
+ [ADO MD API Reference](./ado-md-object-model.md?view=sql-server-ver15)   
  [ADO MD Code Examples](./ado-md-code-examples.md)   
  [ADO MD Enumerated Constants](./ado-md-enumerated-constants.md)   
  [ADO MD Methods](./ado-md-methods.md)   
diff --git a/docs/ado/reference/ado-md-api/ado-md-enumerated-constants.md b/docs/ado/reference/ado-md-api/ado-md-enumerated-constants.md
@@ -1,4 +1,4 @@
-﻿---
+---
 description: "ADO MD Enumerated Constants"
 title: "ADO MD Enumerated Constants | Microsoft Docs"
 ms.prod: sql
@@ -24,7 +24,7 @@ To assist debugging, the ADO MD enumerated constants list a value for each const
 -   [MemberTypeEnum](./membertypeenum.md)  
   
 ## See Also  
- [ADO MD API Reference](./ado-md-object-model.md?view=sql-server-ver15&preserve-view=true)   
+ [ADO MD API Reference](./ado-md-object-model.md?view=sql-server-ver15)   
  [ADO MD Code Examples](./ado-md-code-examples.md)   
  [ADO MD Collections](./ado-md-collections.md)   
  [ADO MD Methods](./ado-md-methods.md)   
diff --git a/docs/ado/reference/ado-md-api/ado-md-methods.md b/docs/ado/reference/ado-md-api/ado-md-methods.md
@@ -1,4 +1,4 @@
-﻿---
+---
 description: "ADO MD Methods"
 title: "ADO MD Methods | Microsoft Docs"
 ms.prod: sql
@@ -24,7 +24,7 @@ ms.author: jroth
 |[Open](./open-method-ado-md.md)|Retrieves the results of a multidimensional query and returns the results to a cellset.|  
   
 ## See Also  
- [ADO MD API Reference](./ado-md-object-model.md?view=sql-server-ver15&preserve-view=true)   
+ [ADO MD API Reference](./ado-md-object-model.md?view=sql-server-ver15)   
  [ADO MD Code Examples](./ado-md-code-examples.md)   
  [ADO MD Collections](./ado-md-collections.md)   
  [ADO MD Enumerated Constants](./ado-md-enumerated-constants.md)   
diff --git a/docs/ado/reference/ado-md-api/ado-md-object-model.md b/docs/ado/reference/ado-md-api/ado-md-object-model.md
@@ -1,4 +1,4 @@
-﻿---
+---
 description: "ADO MD Object Model"
 title: "ADO MD Object Model | Microsoft Docs"
 ms.prod: sql
@@ -26,7 +26,7 @@ This topic describes how objects are represented and related in ADO MD.
  The [Axis](./axis-object-ado-md.md), [Cell](./cell-object-ado-md.md), [Cellset](./cellset-object-ado-md.md), [CubeDef](./cubedef-object-ado-md.md), [Dimension](./dimension-object-ado-md.md), [Hierarchy](./hierarchy-object-ado-md.md), [Level](./level-object-ado-md.md), and [Member](./member-object-ado-md.md) objects each have a standard ADO [Properties](../ado-api/properties-collection-ado.md) collection.  
   
 ## See Also  
- [ADO MD API Reference](?view=sql-server-ver15&preserve-view=true)   
+ [ADO MD API Reference](?view=sql-server-ver15)   
  [ADO MD Code Examples](./ado-md-code-examples.md)   
  [ADO MD Collections](./ado-md-collections.md)   
  [ADO MD Enumerated Constants](./ado-md-enumerated-constants.md)   
diff --git a/docs/ado/reference/ado-programmer-s-reference.md b/docs/ado/reference/ado-programmer-s-reference.md
@@ -1,4 +1,4 @@
-﻿---
+---
 description: "ADO Programmer&#39;s Reference"
 title: "ADO Programmer&#39;s Reference | Microsoft Docs"
 ms.custom: ""
@@ -21,6 +21,6 @@ This section contains the following topics.
   
 -   [RDS API Reference](./rds-api/rds-api-reference.md)  
   
--   [ADO MD API Reference](./ado-md-api/ado-md-object-model.md?view=sql-server-ver15&preserve-view=true)  
+-   [ADO MD API Reference](./ado-md-api/ado-md-object-model.md?view=sql-server-ver15)  
   
--   [ADOX API Reference](./adox-api/adox-object-model.md?view=sql-server-ver15&preserve-view=true)
+-   [ADOX API Reference](./adox-api/adox-object-model.md?view=sql-server-ver15)
diff --git a/docs/azure-data-studio/extensions/kusto-extension.md b/docs/azure-data-studio/extensions/kusto-extension.md
@@ -119,7 +119,7 @@ The extensions settings look like this:
 
 ## SandDance visualization
 
-The [SandDance extension](../sanddance-extension.md) with the Kusto (KQL) extension in Azure Data Studio bring rich interactive visualization together. From the KQL query result set, select the **Visualizer** button to launch [SandDance](https://sanddance.js.org/).
+The [SandDance extension](sanddance-extension.md) with the Kusto (KQL) extension in Azure Data Studio bring rich interactive visualization together. From the KQL query result set, select the **Visualizer** button to launch [SandDance](https://sanddance.js.org/).
 
 :::image type="content" source="media/kusto-extension/kusto-extension-sanddance-demo.gif" alt-text="SandDance visualization":::
 
diff --git a/docs/azure-data-studio/extensions/sanddance-extension.md b/docs/azure-data-studio/extensions/sanddance-extension.md
@@ -8,7 +8,7 @@ author: yualan
 ms.author: alayu
 ms.reviewer: maghan, sstein
 ms.custom: seodec18
-ms.date: 07/03/2019
+ms.date: 07/03/2019 
 ---
 
 # SandDance for Azure Data Studio (Preview)
diff --git a/docs/azure-data-studio/toc.yml b/docs/azure-data-studio/toc.yml
@@ -61,7 +61,7 @@
     - name: PowerShell extension
       href: extensions/powershell-extension.md
     - name: SandDance extension
-      href: sanddance-extension.md
+      href: extensions/sanddance-extension.md
     - name: Schema Compare extension
       href: extensions/schema-compare-extension.md
     - name: SQL Database Projects extension
diff --git a/docs/integration-services/devops/ssis-devops-standalone.md b/docs/integration-services/devops/ssis-devops-standalone.md
@@ -88,7 +88,7 @@ SSISDeploy.exe -source|-s:<source path> -destination|-d:<type>;<path>[;server] [
 
 |Parameter|Description|
 |---------|---------|
-|-source\|-s:\<source path>|Local file path of artifacts to be deployed. Path of folder, ISPAC, DTSX, SSISDeploymentManfiest are allowed.|
+|-source\|-s:\<source path>|Local file path of artifacts to be deployed. ISPAC, DTSX, path of folder for DTSX, SSISDeploymentManfiest are allowed.|
 |-destination\|-d:\<type>;\<path>[;server]|Destination type, path of the destination folder, and server name of the SSIS catalog where the source file will be deployed to. Currently we support following two destination types: <li> *CATALOG*: deploy single or multiple ISPAC files to the specified SSIS catalog. The path of CATALOG destination should be in such format: <br> /SSISDB/\<folder name>[/\<project name>] <br> The optional <project name> is only valid when the source specifies a single ISPAC file path. Server name must be specified for CATALOG destination. <li> *FILE*: deploy SSIS packages or files specified in a single or multiple SSISDeploymentManifest files to the specified path of the file system. The path of FILE destination can be a local folder path or a network folder path in such format: <br>\\\\\<machine name>\\\<folder name>[\\\<sub folder name>\...]|
 |-authType\|-at:\<auth type name>|Authentication type to access SQL Server. Mandatory for CATALOG destination. Following types are supported: <li> WIN:  Windows Authentication <li> SQL:  SQL Server Authentication <li> ADPWD:  Active Directory - Password <li> ADINT:  Active Directory - Integrated|
 |-connectionStringSuffix\|-css:\<connection string suffix> |Suffix of the connection string, which is used to connect to the SSIS catalog.|
@@ -111,11 +111,6 @@ SSISDeploy.exe -source|-s:<source path> -destination|-d:<type>;<path>[;server] [
     SSISDeploy.exe -s:D:\myfolder\test.ispac -d:catalog;/SSISDB/folder/testproj;myssisserver -at:sql -u:sqlusername -p:sqlpassword -pp:encryptionpassword
     ```
 
-- Deploy ISPAC files from a folder that are encrypted with a same password to SSIS catalog with Windows authentication, and append TrustServerCertificate=True to the connection string.
-    ```
-    SSISDeploy.exe -s:D:\myfolder -d:catalog;/SSISDB/folder;myssisserver -at:win -css:TrustServerCertificate=True -pp:encryptionpassword
-    ```
-
 - Deploy a single SSISDeploymentManifest and its associated files to Azure file share.
     ```
     SSISDeploy.exe -s:D:\myfolder\mypackage.SSISDeploymentManifest -d:file;\\myssisshare.file.core.windows.net\destfolder -u:Azure\myssisshare -p:storagekey
diff --git a/docs/machine-learning/python/python-libraries-and-data-types.md b/docs/machine-learning/python/python-libraries-and-data-types.md
@@ -11,7 +11,7 @@ ms.custom: seo-lt-2019
 monikerRange: ">=sql-server-2017||>=sql-server-linux-ver15||=azuresqldb-mi-current||=sqlallproducts-allversions"
 ---
 # Data type mappings between Python and SQL Server
-[!INCLUDE [SQL Server 2017 and later](../../includes/applies-to-version/sqlserver2017.md)]
+[!INCLUDE [SQL Server 2017 SQL MI](../../includes/applies-to-version/sqlserver2017-asdbmi.md)]
 
 This article lists the supported data types, and the data type conversions performed, when using the Python integration feature in SQL Server Machine Learning Services.
 
diff --git a/docs/machine-learning/r/converting-r-code-for-use-in-sql-server.md b/docs/machine-learning/r/converting-r-code-for-use-in-sql-server.md
@@ -12,7 +12,7 @@ ms.custom: seo-lt-2019
 monikerRange: ">=sql-server-2016||>=sql-server-linux-ver15||=azuresqldb-mi-current||=sqlallproducts-allversions"
 ---
 # Convert R code for execution in SQL Server (In-Database) instances
-[!INCLUDE [SQL Server 2016 and later](../../includes/applies-to-version/sqlserver2016.md)]
+[!INCLUDE [SQL Server 2016 SQL MI](../../includes/applies-to-version/sqlserver2016-asdbmi.md)]
 
 This article provides high-level guidance on how to modify R code to work in SQL Server. 
 
diff --git a/docs/machine-learning/r/how-to-create-a-stored-procedure-using-sqlrutils.md b/docs/machine-learning/r/how-to-create-a-stored-procedure-using-sqlrutils.md
@@ -12,7 +12,7 @@ ms.custom: seo-lt-2019
 monikerRange: ">=sql-server-2016||>=sql-server-linux-ver15||=azuresqldb-mi-current||=sqlallproducts-allversions"
 ---
 # Create a stored procedure using sqlrutils
-[!INCLUDE [SQL Server 2016 and later](../../includes/applies-to-version/sqlserver2016.md)]
+[!INCLUDE [SQL Server 2016 SQL MI](../../includes/applies-to-version/sqlserver2016-asdbmi.md)]
 
 This article describes the steps for converting your R code to run as a T-SQL stored procedure. For best possible results, your code might need to be modified somewhat, to ensure that all inputs can be parameterized.
 
diff --git a/docs/machine-learning/r/operationalizing-your-r-code.md b/docs/machine-learning/r/operationalizing-your-r-code.md
@@ -12,7 +12,7 @@ ms.custom: seo-lt-2019
 monikerRange: ">=sql-server-2016||>=sql-server-linux-ver15||=azuresqldb-mi-current||=sqlallproducts-allversions"
 ---
 # Operationalize R code using stored procedures in SQL Server Machine Learning Services
-[!INCLUDE [SQL Server 2016 and later](../../includes/applies-to-version/sqlserver2016.md)]
+[!INCLUDE [SQL Server 2016 SQL MI](../../includes/applies-to-version/sqlserver2016-asdbmi.md)]
 
 When using the R and Python features in SQL Server Machine Learning Services, the most common approach for moving solutions to a production environment is by embedding code in stored procedures. This article summarizes the key points for the SQL developer to consider when operationalizing R code using SQL Server.
 
diff --git a/docs/machine-learning/r/r-libraries-and-data-types.md b/docs/machine-learning/r/r-libraries-and-data-types.md
@@ -11,7 +11,7 @@ ms.custom: seo-lt-2019
 monikerRange: ">=sql-server-2016||>=sql-server-linux-ver15||=azuresqldb-mi-current||=sqlallproducts-allversions"
 ---
 # Data type mappings between R and SQL Server
-[!INCLUDE [SQL Server 2016 and later](../../includes/applies-to-version/sqlserver2016.md)]
+[!INCLUDE [SQL Server 2016 SQL MI](../../includes/applies-to-version/sqlserver2016-asdbmi.md)]
 
 This article lists the supported data types, and the data type conversions performed, when using the R integration feature in SQL Server Machine Learning Services.
 
diff --git a/docs/machine-learning/sql-server-machine-learning-services.md b/docs/machine-learning/sql-server-machine-learning-services.md
@@ -11,7 +11,7 @@ ms.author: davidph
 monikerRange: ">=sql-server-2017||>=sql-server-linux-ver15||=azuresqldb-mi-current||=sqlallproducts-allversions"
 ---
 # What is SQL Server Machine Learning Services (Python and R)?
-[!INCLUDE [SQL Server 2017](../includes/applies-to-version/sqlserver2017.md)]
+[!INCLUDE [SQL Server 2017 SQL MI](../includes/applies-to-version/sqlserver2017-asdbmi.md)]
 
 Machine Learning Services is a feature in SQL Server that gives the ability to run Python and R scripts with relational data. You can use open-source packages and frameworks, and the [Microsoft Python and R packages](#packages), for predictive analytics and machine learning. The scripts are executed in-database without moving data outside SQL Server or over the network. This article explains the basics of SQL Server Machine Learning Services and how to get started.
 
diff --git a/docs/sql-server/editions-and-components-of-sql-server-version-15.md b/docs/sql-server/editions-and-components-of-sql-server-version-15.md
@@ -162,7 +162,7 @@ The Developer edition continues to support only 1 client for [[!INCLUDE[ssNoVers
 |Hot add memory and CPU|Yes|No|No|No|No|
 |Database recovery advisor|Yes|Yes|Yes|Yes|Yes|
 |Encrypted backup|Yes|Yes|No|No|No|
-|Hybrid backup to Windows Azure (backup to URL)|Yes|Yes|No|No|No|
+|Hybrid backup to Windows Azure (backup to URL)|Yes|Yes|Yes|No|No|
 |Cluster-less availability group <sup>5,6</sup>|Yes|Yes|No|No|No|
 |Failover servers for disaster recovery<sup>7</sup>|Yes|Yes|No|No|No|
 |Failover servers for high availability<sup>7</sup>|Yes|Yes|No|No|No|
@@ -424,4 +424,4 @@ For information about the Business Intelligence Client features supported by the
 
 [!INCLUDE[get-help-options](../includes/paragraph-content/get-help-options.md)]
 
-[!INCLUDE[contribute-to-content](../includes/paragraph-content/contribute-to-content.md)]
+[!INCLUDE[contribute-to-content](../includes/paragraph-content/contribute-to-content.md)]
diff --git a/docs/ssms/download-sql-server-management-studio-ssms.md b/docs/ssms/download-sql-server-management-studio-ssms.md
@@ -128,7 +128,7 @@ These components aren't uninstalled because they can be shared with other produc
 
 ## SSMS System Requirements
 
-This release of SSMS supports the following 64-bit platforms when used with the latest available service pack:
+The current release of SSMS supports the following 64-bit platforms when used with the latest available service pack:
 
 Supported Operating Systems:
 
@@ -147,7 +147,7 @@ Supported hardware:
 - Hard disk space: Minimum of 2 GB up to 10 GB of available space
 
 > [!NOTE]
-> SSMS runs on Windows only. If you need a tool that runs on operating systems other than Windows, we recommend Azure Data Studio. Azure Data Studio is a cross-platform tool that runs on macOS, Linux, as well as Windows. For details, see [Azure Data Studio](../azure-data-studio/what-is.md).
+> SSMS is available only as a 32-bit application for Windows. If you need a tool that runs on operating systems other than Windows, we recommend Azure Data Studio. Azure Data Studio is a cross-platform tool that runs on macOS, Linux, as well as Windows. For details, see [Azure Data Studio](../azure-data-studio/what-is.md).
 
 [!INCLUDE[get-help-sql-tools](../includes/paragraph-content/get-help-sql-tools.md)]
 
diff --git a/docs/t-sql/statements/merge-transact-sql.md b/docs/t-sql/statements/merge-transact-sql.md

Original file line number	Diff line number	Diff line change
`@@ -59049,6 +59049,11 @@`
`59049`	`59049`	`"source_path": "docs/ssms/tutorials/connect-query-sql-server.md",`
`59050`	`59050`	`"redirect_url": "/sql/ssms/quickstarts/connect-query-sql-server",`
`59051`	`59051`	`"redirect_document_id": false`
	`59052`	`+ },`
	`59053`	`+ {`
	`59054`	`+ "source_path": "docs/azure-data-studio/sanddance-extension.md",`
	`59055`	`+ "redirect_url": "/sql/azure-data-studio/extensions/sanddance-extension",`
	`59056`	`+ "redirect_document_id": true`
`59052`	`59057`	`}`
`59053`	`59058`	`]`
`59054`	`59059`	`}`