Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into adstest

Author: markingmyname

.openpublishing.redirection.json

@@ -1380,6 +1380,16 @@
       "redirect_url": "/sql/machine-learning/what-s-new-in-sql-server-machine-learning-services",
       "redirect_document_id": true
     },
+    {
+      "source_path": "docs/machine-learning/tutorials/sql-server-python-tutorials.md",
+      "redirect_url": "/sql/machine-learning/tutorials/python-tutorials",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "docs/machine-learning/tutorials/sql-server-r-tutorials.md",
+      "redirect_url": "/sql/machine-learning/tutorials/r-tutorials",
+      "redirect_document_id": true
+    },
     {
       "source_path": "docs/linux/sql-server-linux-develop-use-ssms.md",
       "redirect_url": "/sql/linux/sql-server-linux-manage-ssms",

docs/2014/analysis-services/analysis-services-tutorials-ssas.md

@@ -20,11 +20,8 @@ manager: craigg
  [Multidimensional Modeling (Adventure Works Tutorial)](multidimensional-modeling-adventure-works-tutorial.md)  
  This tutorial teaches the fundamental skills and concepts behind multidimensional modeling in [!INCLUDE[ssBIDevStudioFull](../includes/ssbidevstudiofull-md.md)]. When you are finished, you will have a cube database based on Adventure Works data that you can access from Excel, Reporting Services, or any other client application that connects to Analysis Services.  
 
- [AdventureWorks Sample Databases on Codeplex](https://go.microsoft.com/fwlink/?linkID=335807)  
- This link takes you to the codeplex download page that has the AdventureWorks sample databases for [!INCLUDE[ssSQL14](../includes/sssql14-md.md)].  
-  
- [AMO Code Sample for Creating Tabular Models Programmatically](https://go.microsoft.com/fwlink/?linkID=221036)  
- This link takes you to a Codeplex download page that has the AMO sample for [!INCLUDE[ssSQL14](../includes/sssql14-md.md)].  
+ [AdventureWorks Sample Databases on GitHub](https://github.com/Microsoft/sql-server-samples/releases/tag/adventureworks)  
+ This link takes you to the GitHub download page that has the AdventureWorks sample databases for [!INCLUDE[ssSQL14](../includes/sssql14-md.md)].  
 
  [SQL Server 2008 R2 Tutorials](https://go.microsoft.com/fwlink/?linkID=220944)  
  Most of the SQL Server 2008 R2 tutorials work on a [!INCLUDE[ssSQL14](../includes/sssql14-md.md)] server. If you are new to Data Mining, use this link to find the SQL Server 2008 R2 Data Mining Tutorials that also work with a [!INCLUDE[ssSQL14](../includes/sssql14-md.md)] instance of Analysis Services.  

docs/2014/analysis-services/dev-guide/toc.yml

@@ -107,7 +107,7 @@
   - name: Developing with ADOMD.NET
     href: https://docs.microsoft.com/bi-reference/adomd/developing-with-adomd-net
   - name: ADOMD.NET Client Programming
-    href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/adomd-net-client-programming
+    href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/adomd-net-client-programming
     items:
     - name: ADOMD.NET Client Functionality
       href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/adomd-net-client-functionality
@@ -116,13 +116,13 @@
     - name: Establishing Connections in ADOMD.NET
       href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net
     - name: Establishing Secure Connections in ADOMD.NET
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-establishing-secure-connections
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-establishing-secure-connections
     - name: Working with Connections and Sessions in ADOMD.NET
       href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-working-with-connections-and-sessions
     - name: Performing Transactions in ADOMD.NET
       href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-performing-transactions
     - name: Retrieving Metadata from an Analytical Data Source
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-from-an-analytical-data-source
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-from-an-analytical-data-source
     - name: Working with the ADOMD.NET Object Model
       href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-working-with-adomd-net-object-model
     - name: Working with Schema Rowsets in ADOMD.NET
@@ -145,9 +145,9 @@
     - name: ADOMD.NET Server Object Architecture
       href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-server/adomd-net-server-object-architecture
     - name: User Defined Functions and Stored Procedures
-      href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-server/user-defined-functions-and-stored-procedures
+      href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-server/user-defined-functions-and-stored-procedures
   - name: Redistributing ADOMD.NET
-    href: https://docs.microsoft.com/bi-reference/adomd/redistributing-adomd-net
+    href: https://docs.microsoft.com/analysis-services/adomd/redistributing-adomd-net
   - name: Developing with Analysis Management Objects (AMO)
     href: https://docs.microsoft.com/bi-reference/amo/developing-with-analysis-management-objects-amo
   - name: AMO Concepts and Object Model

docs/2014/analysis-services/tabular-model-programming-compatibility-levels-1050-1103/toc.yml

@@ -33,43 +33,6 @@
   - name: Querying a Tabular Model
     href: representation/querying-a-tabular-model.md
 - name: CSDLBI Technical Reference
-  href: https://docs.microsoft.com/bi-reference/csdl/technical-reference-for-bi-annotations-to-csdl
-  items:
-  - name: AssociationSet Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/associationset-element-csdlbi
-  - name: BaseProperty Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/baseproperty-element-csdlbi
-  - name: DefaultDetails Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/defaultdetails-element-csdlbi
-  - name: DisplayKey Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/displaykey-element-csdlbi
-  - name: EntityContainer Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/entitycontainer-element-csdlbi
-  - name: EntitySet Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/entityset-element-csdlbi
-  - name: EntityType Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/entitytype-element-csdlbi
-  - name: Hierarchy Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/hierarchy-element-csdlbi
-  - name: KPI Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/kpi-element-csdlbi
-  - name: KpiGoal Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/kpigoal-element-csdlbi
-  - name: KpiStatus Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/kpistatus-element-csdlbi
-  - name: Level Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/level-element-csdlbi
-  - name: Measure Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/measure-element-csdlbi
-  - name: Member Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/member-element-csdlbi
-  - name: MemberRef Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/memberref-element-csdlbi
-  - name: NavigationProperty Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/navigationproperty-element-csdlbi
-  - name: Property Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/property-element-csdlbi
-  - name: PropertyRef Element (CSDLBI)
-    href: https://docs.microsoft.com/bi-reference/csdl/propertyref-element-csdlbi
+  href: https://docs.microsoft.com/analysis-services/csdlbi/csdlbi-overview
 - name: IMDEmbedded Interface
   href: imdembeddeddata-interface.md

docs/ado/guide/appendixes/internet-explorer-error-codes.md

@@ -23,5 +23,5 @@ The following table lists Microsoft® Internet Explorer error codes related to R
 |**IDS_WinInet_ ConnectionReset**|12031 -2146816257 0x800A2EFF|Internet Client Error: Connection Reset.|
 |**IDS_WinInet_Error**|8193 -2146820095 0x800A2001|Internet Client Error.|
 |**IDS_WinInet_ InvalidServerResponse**|8430 -2146819858 0x800A20EE|Internet Client Error: Invalid Server Response.|
-|**IDS_WinInet_ SSLPostLimitation**|8196 -2146820092 0x800A2004|Internet Client Error: SSL Error (possibly 32K data upload limitation).|
+|**IDS_WinInet_ SSLPostLimitation**|8196 -2146820092 0x800A2004|Internet Client Error: TLS/SSL Error (possibly 32K data upload limitation).|
 |**IDS_WinInet_Timeout**|8194 -2146820094 0x800A2002|Internet Client Error: Request Timeout.|

docs/big-data-cluster/data-ingestion-restore-database.md

@@ -24,7 +24,7 @@ First, backup your existing SQL Server database from either SQL Server on Window
 This article shows how to restore the AdventureWorks database, but you can use any database backup. 
 
 > [!TIP]
-> You can download the AdventureWorks backup [here](https://www.microsoft.com/download/details.aspx?id=49502).
+> Download the [AdventureWorks backup](../samples/adventureworks-install-configure.md).
 
 ## Copy the backup file
 

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

@@ -29,7 +29,7 @@ The following table lists common big data cluster tools and how to install them:
 | **Azure Data Studio** | Yes | Cross-platform graphical tool for querying SQL Server. | [Install](https://aka.ms/getazuredatastudio) |
 | **Data Virtualization extension** | Yes | Extension for Azure Data Studio that provides a Data Virtualization wizard. | [Install](../azure-data-studio/data-virtualization-extension.md) |
 | **Azure CLI**<sup>2</sup> | For AKS | Modern command-line interface for managing Azure services. Used with AKS big data cluster deployments ([More info](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest)). | [Install](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) |
-| **mssql-cli** | Optional | Modern command-line interface for querying SQL Server ([More info](https://github.com/dbcli/mssql-cli/blob/master/README.rst)). | [Windows](https://github.com/dbcli/mssql-cli/blob/master/doc/installation/windows.md) \| [Linux](https://github.com/dbcli/mssql-cli/blob/master/doc/installation/linux.md) |
+| **mssql-cli** | Optional | Modern command-line interface for querying SQL Server ([More info](../tools/mssql-cli.md)). | [Windows](https://github.com/dbcli/mssql-cli/blob/master/doc/installation/windows.md) \| [Linux](https://github.com/dbcli/mssql-cli/blob/master/doc/installation/linux.md) |
 | **sqlcmd** | For some scripts | Legacy command-line tool for querying SQL Server ([More info](https://docs.microsoft.com/sql/tools/sqlcmd-utility?view=sql-server-ver15)). You might need to install the Microsoft ODBC Driver 11 for SQL Server before installing the SQLCMD package. | [Windows](https://www.microsoft.com/download/details.aspx?id=36433) \| [Linux](../linux/sql-server-linux-setup-tools.md) |
 | `curl` <sup>3</sup> | For some scripts | Command-line tool for transferring data with URLs. | [Windows](https://curl.haxx.se/windows/) \| Linux: install curl package |
 

docs/connect/jdbc/application-security.md

@@ -53,9 +53,9 @@ permission java.net.SocketPermission "*", "listen, connect, accept";
 >  The code "file:/install_dir/lib/-" refers to the installation directory of the JDBC driver.  
   
 ## Protecting server communication  
- When you use the JDBC driver to communicate with a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] database, you can secure the communication channel by using either Internet Protocol Security (IPSEC) or Secure Sockets Layer (SSL); or you can use both.  
+ When you use the JDBC driver to communicate with a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] database, you can secure the communication channel by using either Internet Protocol Security (IPSEC) or Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL); or you can use both.  
 
- SSL support can be used to provide an additional level of protection besides IPSEC. For more information about using SSL, see [Using SSL encryption](../../connect/jdbc/using-ssl-encryption.md).  
+ TLS support can be used to provide an additional level of protection besides IPSEC. For more information about using TLS, see [Using encryption](../../connect/jdbc/using-ssl-encryption.md).  
 
 ## See also  
  [Securing JDBC driver applications](../../connect/jdbc/securing-jdbc-driver-applications.md)  

docs/connect/jdbc/fips-mode.md

@@ -19,7 +19,7 @@ The Microsoft JDBC Driver for SQL Server supports running in JVMs configured to
 #### Prerequisites
 
 - FIPS configured JVM
-- Appropriate SSL Certificate
+- Appropriate TLS/SSL Certificate
 - Appropriate policy files
 - Appropriate Configuration parameters
 
@@ -32,11 +32,11 @@ To see the approved modules for FIPS Configuration, refer to [Validated Modules
 Vendors may have some additional steps to configure a JVM with FIPS.
 
 ## Appropriate SSL certificate
-In order to connect to SQL Server in FIPS mode, a valid SSL Certificate is required. Install or import it into the Java Key Store on the client machine (JVM) where FIPS is enabled.
+In order to connect to SQL Server in FIPS mode, a valid TLS/SSL Certificate is required. Install or import it into the Java Key Store on the client machine (JVM) where FIPS is enabled.
 
 ### Importing SSL certificate in Java keyStore
 For FIPS, most likely you need to import the certificate (.cert) in either PKCS or a provider-specific format.
-Use the following snippet to import the SSL certificate and store it in a working directory with the appropriate KeyStore format. _TRUST\_STORE\_PASSWORD_ is your password for Java KeyStore.
+Use the following snippet to import the TLS/SSL certificate and store it in a working directory with the appropriate KeyStore format. _TRUST\_STORE\_PASSWORD_ is your password for Java KeyStore.
 
 ```java
 public void saveGenericKeyStore(
@@ -66,7 +66,7 @@ private Certificate getCertificate(String pathName)
 }
 ```
 
-The following example is importing an Azure SSL Certificate in PKCS12 format with the BouncyCastle Provider. The certificate is imported in the working directory named _MyTrustStore\_PKCS12_ by using the following snippet:
+The following example is importing an Azure TLS/SSL Certificate in PKCS12 format with the BouncyCastle Provider. The certificate is imported in the working directory named _MyTrustStore\_PKCS12_ by using the following snippet:
 
 `saveGenericKeyStore(BCFIPS, PKCS12, "SQLAzure SSL Certificate Name", "SQLAzure.cer");`
 

docs/connect/jdbc/frequently-asked-questions-faq-for-jdbc-driver.md

@@ -107,8 +107,8 @@ The JDBC Drivers 6.0, 6.2, 6.4, and 7.0 are redistributable. Review the "Distrib
 **Can I use the driver to access Microsoft SQL Server from a Linux computer?**  
 Yes! You can use the driver to access SQL Server from Linux, Unix, and other non-Windows platforms. For more information, see [Microsoft JDBC Driver for SQL Server Support Matrix](../../connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix.md).
 
-**Does the driver support Secure Sockets Layer (SSL) encryption?**  
-Starting with version 1.2, the driver supports Secure Sockets Layer (SSL) encryption. For more information, see [Using SSL Encryption](../../connect/jdbc/using-ssl-encryption.md).
+**Does the driver support TLS encryption?**  
+Starting with version 1.2, the driver supports Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL), encryption. For more information, see [Using encryption](../../connect/jdbc/using-ssl-encryption.md).
 
 **Which authentication types are supported by the Microsoft JDBC Driver for SQL Server?**  
 The table below lists available authentication options. A pure Java Kerberos authentication is available starting with the 4.0 release of the driver.