Merge branch 'master' into issue-6427

Author: markingmyname

.openpublishing.publish.config.json

@@ -1,123 +1,109 @@
-{
-  "build_entry_point": "docs",
-  "docsets_to_publish": [
-    {
-      "docset_name": "data-migration",
-      "build_source_folder": "data-migration",
-      "build_output_subfolder": "data-migration",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    },
-    {
-      "docset_name": "azure-data-studio",
-      "build_source_folder": "azure-data-studio",
-      "build_output_subfolder": "azure-data-studio",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    },
-    {
-      "docset_name": "sql-content",
-      "build_source_folder": "docs",
-      "build_output_subfolder": "sql",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "xref_query_tags": [
-        "/uwp/api",
-        "/dotnet"
-      ],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "ZonePivotGroups": "Toc",
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content",
-        "LandingData": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "version": 0
-    }
-  ],
-  "notification_subscribers": [],
-  "branches_to_filter": [],
-  "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/sql-docs",
-  "git_repository_branch_open_to_public_contributors": "live",
-  "skip_source_output_uploading": false,
-  "need_preview_pull_request": true,
-  "dependent_repositories": [
-    {
-      "path_to_root": "_themes",
-      "url": "https://github.com/Microsoft/templates.docs.msft",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "samples",
-      "url": "https://github.com/dotnet/samples",
-      "branch": "master",
-      "branch_mapping": {
-        "live": "live"
-      }
-    },
-    {
-      "path_to_root": "sqlclient",
-      "url": "https://github.com/dotnet/sqlclient",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "_themes.pdf",
-      "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
-      "branch": "master",
-      "branch_mapping": {}
-    },
-    {
-      "path_to_root": "sql-server-samples",
-      "url": "https://github.com/Microsoft/sql-server-samples",
-      "branch": "master",
-      "branch_mapping": {}
-    }
-  ],
-  "branch_target_mapping": {
-    "live": [
-      "Publish",
-      "PDF"
-    ],
-    "master": [
-      "Publish",
-      "PDF"
-    ],
-    "build-pdf": [
-      "Publish",
-      "PDF"
-    ]
-  },
-  "need_generate_pdf_url_template": true,
-  "targets": {
-    "Pdf": {
-      "template_folder": "_themes.pdf"
-    }
-  },
-  "docs_build_engine": {
-    "name": "docfx_v3"
-  },
-  "need_generate_pdf": false,
-  "need_generate_intellisense": false,
-  "enable_branch_build_custom_validation": true,
-  "enable_pull_request_custom_validation": true
+{
+  "build_entry_point": "docs",
+  "docsets_to_publish": [
+    {
+      "docset_name": "data-migration",
+      "build_source_folder": "data-migration",
+      "build_output_subfolder": "data-migration",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
+    {
+      "docset_name": "sql-content",
+      "build_source_folder": "docs",
+      "build_output_subfolder": "sql",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "xref_query_tags": [
+        "/uwp/api",
+        "/dotnet"
+      ],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "ZonePivotGroups": "Toc",
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content",
+        "LandingData": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes",
+      "version": 0
+    }
+  ],
+  "notification_subscribers": [],
+  "branches_to_filter": [],
+  "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/sql-docs",
+  "git_repository_branch_open_to_public_contributors": "live",
+  "skip_source_output_uploading": false,
+  "need_preview_pull_request": true,
+  "dependent_repositories": [
+    {
+      "path_to_root": "_themes",
+      "url": "https://github.com/Microsoft/templates.docs.msft",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "samples",
+      "url": "https://github.com/dotnet/samples",
+      "branch": "main",
+      "branch_mapping": {
+        "live": "live"
+      }
+    },
+    {
+      "path_to_root": "sqlclient",
+      "url": "https://github.com/dotnet/sqlclient",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "_themes.pdf",
+      "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "sql-server-samples",
+      "url": "https://github.com/Microsoft/sql-server-samples",
+      "branch": "master",
+      "branch_mapping": {}
+    }
+  ],
+  "branch_target_mapping": {
+    "live": [
+      "Publish",
+      "PDF"
+    ],
+    "master": [
+      "Publish",
+      "PDF"
+    ],
+    "build-pdf": [
+      "Publish",
+      "PDF"
+    ]
+  },
+  "need_generate_pdf_url_template": true,
+  "targets": {
+    "Pdf": {
+      "template_folder": "_themes.pdf"
+    }
+  },
+  "docs_build_engine": {
+    "name": "docfx_v3"
+  },
+  "need_generate_pdf": false,
+  "need_generate_intellisense": false,
+  "enable_branch_build_custom_validation": true,
+  "enable_pull_request_custom_validation": true
 }

.openpublishing.redirection.json

@@ -42945,6 +42945,21 @@
       "redirect_url": "/sql/machine-learning/tutorials/python-ski-rental-linear-regression-deploy-model",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/machine-learning/r/save-and-load-r-objects-from-sql-server-using-odbc.md",
+      "redirect_url": "/sql/machine-learning/data-exploration/save-and-load-r-objects-from-sql-server-using-odbc",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "docs/machine-learning/r/creating-multiple-models-using-rxexecby.md",
+      "redirect_url": "/sql/machine-learning/data-exploration/creating-multiple-models-using-rxexecby",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "docs/machine-learning/r/data-exploration-and-predictive-modeling-with-r.md",
+      "redirect_url": "/sql/machine-learning/tutorials/r-tutorials",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/linux/sql-server-linux-develop-use-ssms.md",
       "redirect_url": "/sql/linux/sql-server-linux-manage-ssms",
@@ -59125,6 +59140,11 @@
       "redirect_url": "/sql/azure-data-studio/notebooks/notebooks-sql-kernel",
       "redirect_document_id": true
     },
+    {
+      "source_path": "docs/azure-data-studio/notebooks/notebooks-parameterization.md",
+      "redirect_url": "/sql/azure-data-studio/notebooks/parameterize-papermill",
+      "redirect_document_id": true
+    },
     {
       "source_path": "docs/ssms/tutorials/connect-query-sql-server.md",
       "redirect_url": "/sql/ssms/quickstarts/ssms-connect-query-sql-server",

data-migration/index.yml

@@ -75,7 +75,7 @@ conceptualContent:
     - title: "MySQL to"
       links:
         - text: Azure Database for MySQL
-          url: /azure/mysql/concepts-migrate-import-export
+          url: /azure/mysql/migrate/mysql-on-premises-azure-db/01-mysql-migration-guide-intro
           itemType: how-to-guide
         - text: SQL Server
           url: /sql/sql-server/migrate/guides/mysql-to-sql-server

docs/ado/guide/data/hellodata-code.md

@@ -15,7 +15,7 @@ author: rothja
 ms.author: jroth
 ---
 # HelloData Code
-```  
+```vb
 'BeginHelloData  
 Option Explicit  
 

docs/analytics-platform-system/acquire-and-configure-backup-server.md

@@ -1,12 +1,12 @@
 ---
 title: Acquire & configure backup server
 description: This article describes how to configure a non-appliance Windows system as a backup server for use with the backup and restore features in Analytics Platform System (APS) and Parallel Data Warehouse (PDW). 
-author: mzaman1 
+author: charlesfeddersen 
 ms.prod: sql
 ms.technology: data-warehouse
 ms.topic: conceptual
 ms.date: 04/17/2018
-ms.author: murshedz
+ms.author: charlesf
 ms.reviewer: martinle
 ms.custom: seo-dt-2019
 ---

docs/analytics-platform-system/acquire-and-configure-loading-server.md

@@ -1,12 +1,12 @@
 ---
 title: Acquire & configure loading server
 description: This article describes how to acquire and configure a loading server as a non-appliance Windows system for submitting data loads to Parallel Data Warehouse (PDW). 
-author: mzaman1 
+author: charlesfeddersen 
 ms.prod: sql
 ms.technology: data-warehouse
 ms.topic: conceptual
 ms.date: 04/17/2018
-ms.author: murshedz
+ms.author: charlesf
 ms.reviewer: martinle
 ms.custom: seo-dt-2019
 ---

docs/analytics-platform-system/antivirus-software.md

@@ -1,12 +1,12 @@
 ---
 title: Antivirus software
 description: If your data center requires antivirus software, use these guidelines to install antivirus software on Analytics Platform System (APS). We recommend not installing antivirus software unless it is a firm requirement of your data center. 
-author: mzaman1 
+author: charlesfeddersen 
 ms.prod: sql
 ms.technology: data-warehouse
 ms.topic: conceptual
 ms.date: 04/24/2018
-ms.author: murshedz
+ms.author: charlesf
 ms.reviewer: martinle
 ms.custom: seo-dt-2019
 ---

docs/analytics-platform-system/appliance-configuration.md

@@ -1,12 +1,12 @@
 ---
 title: Configuration checklists
 description: Provides checklists for the tasks required to configure Analytics Platform System for your own environment. These configuration tasks are necessary before you can use the appliance.  
-author: mzaman1 
+author: charlesfeddersen 
 ms.prod: sql
 ms.technology: data-warehouse
 ms.topic: conceptual
 ms.date: 04/17/2018
-ms.author: murshedz
+ms.author: charlesf
 ms.reviewer: martinle
 ms.custom: seo-dt-2019
 ---

docs/analytics-platform-system/appliance-feature-switch.md

@@ -1,12 +1,12 @@
 ---
 title: "Feature Switch"
 description: "Displays information about the two feature switches that are introduced in Analytics Platform System AU7."
-author: "mzaman1"
+author: charlesfeddersen
 ms.prod: "sql"
 ms.technology: data-warehouse
 ms.topic: "conceptual"
 ms.date: "06/27/2018"
-ms.author: "murshedz"
+ms.author: charlesf
 ms.reviewer: "martinle"
 monikerRange: ">= aps-pdw-2016-au7"
 ---

docs/analytics-platform-system/appliance-installation-and-configuration-overview.md

@@ -1,12 +1,12 @@
 ---
 title: Appliance install and configure
 description: Walks Analytics Platform System (APS) appliance administrators through the initial steps to set up and get started using your new appliance. 
-author: mzaman1 
+author: charlesfeddersen 
 ms.prod: sql
 ms.technology: data-warehouse
 ms.topic: conceptual
 ms.date: 04/17/2018
-ms.author: murshedz
+ms.author: charlesf
 ms.reviewer: martinle
 ms.custom: seo-dt-2019
 ---