Merge branch 'main' into correct-v11-references

Author: LitKnd

.openpublishing.publish.config.json

@@ -1,6 +1,20 @@
 {
   "build_entry_point": "docs",
   "docsets_to_publish": [
+    {
+      "docset_name": "azure-sql",
+      "build_source_folder": "azure-sql",
+      "build_output_subfolder": "azure-sql",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
     {
       "docset_name": "data-migration",
       "build_source_folder": "data-migration",
@@ -40,13 +54,11 @@
     }
   ],
   "notification_subscribers": [],
-  "sync_notification_subscribers": null,
   "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,
-  "contribution_branch_mappings": null,
   "dependent_repositories": [
     {
       "path_to_root": "_themes",
@@ -101,9 +113,8 @@
       "template_folder": "_themes.pdf"
     }
   },
-  "docs_build_engine": {
-    "name": "docfx_v3"
-  },
+  "docs_build_engine": {},
+  "contribution_branch_mappings": null,
   "need_generate_pdf": false,
   "need_generate_intellisense": false,
   "enable_branch_build_custom_validation": true,

.openpublishing.redirection.json

@@ -43087,8 +43087,8 @@
     },
     {
         "source_path": "docs/database-engine/install-windows/are-you-upgrading-from-sql-server-2005.md",
-        "redirect_url": "/sql/sql-server/end-of-support/sql-server-end-of-life-overview",
-        "redirect_document_id": true
+        "redirect_url": "/sql/sql-server/end-of-support/sql-server-end-of-support-overview",
+        "redirect_document_id": false
     },
     {
         "source_path": "docs/lp/sql-server/load-move-data.md",
@@ -59022,9 +59022,14 @@
     },
     {
       "source_path": "docs/kb-support/end-support-sql-server-2008.md",
-      "redirect_url": "/sql/sql-server/end-of-support/sql-server-end-of-life-overview",
+      "redirect_url": "/sql/sql-server/end-of-support/sql-server-end-of-support-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/sql-server/end-of-support/sql-server-end-of-life-overview.md",
+      "redirect_url": "/sql/sql-server/end-of-support/sql-server-end-of-support-overview",
+      "redirect_document_id": true
+    },
     {
       "source_path": "docs/kb-support/resource-monitor-nonyielding-condition.md",
       "redirect_url": "https://support.microsoft.com/help/2216485/resource-monitor-non-yielding-condition-server-sql-server-2008",
@@ -59354,6 +59359,11 @@
       "source_path": "docs/database-engine/breaking-changes-to-database-engine-features-in-sql-server-version-15.md",
       "redirect_url": "/sql/database-engine/breaking-changes-to-database-engine-features-in-sql-server-2019",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/database-engine/availability-groups/windows/use-the-add-azure-replica-wizard-sql-server.md",
+      "redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-manually-configure-multiple-regions",
+      "redirect_document_id": false
     }
   ]
 }

azure-sql/TOC.yml

@@ -0,0 +1,2 @@
+- name: Index
+  href: index.md

azure-sql/breadcrumb/toc.yml

@@ -0,0 +1,3 @@
+- name: Docs
+  tocHref: /
+  topicHref: /

azure-sql/docfx.json

@@ -0,0 +1,50 @@
+{
+  "build": {
+    "content": [
+      {
+        "files": [
+          "**/*.md",
+          "**/*.yml"
+        ],
+        "exclude": [
+          "**/obj/**",
+          "**/includes/**",
+          "_themes/**",
+          "_themes.pdf/**",
+          "**/docfx.json",
+          "_repo.en-us/**",
+          "README.md",
+          "LICENSE",
+          "LICENSE-CODE",
+          "ThirdPartyNotices.md"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "**/*.png",
+          "**/*.jpg"
+        ],
+        "exclude": [
+          "**/obj/**",
+          "**/includes/**",
+          "_themes/**",
+          "_themes.pdf/**",
+          "**/docfx.json",
+          "_repo.en-us/**"
+        ]
+      }
+    ],
+    "overwrite": [],
+    "externalReference": [],
+    "globalMetadata": {
+      "breadcrumb_path": "/azure/azure-sql/breadcrumb/toc.json",
+      "extendBreadcrumb": true,
+      "feedback_system": "None"
+    },
+    "fileMetadata": {},
+    "template": [],
+    "dest": "azure-sql"
+  }
+}

azure-sql/index.md

@@ -0,0 +1,15 @@
+---
+title: Azure SQL documentation
+description: "Azure SQL is a family of SQL Server database engine products in the cloud, from a fully managed database in Azure SQL Database, a fully managed instance in Azure SQL Managed Instance, or SQL Server installed to virtual machine in Azure."
+services: sql-database
+ms.service: sql-db-mi
+ms.topic: landing-page
+author: MashaMSFT
+ms.author: mathoma
+ms.reviewer: kendralittle
+ms.date: 04/01/2021
+---
+
+# Azure SQL documentation
+
+See [Azure SQL](/azure/azure-sql/index).

docs/azdata/reference/reference-azdata-sql.md

@@ -98,7 +98,7 @@ Time in seconds to wait for a connection to the server before terminating reques
 #### `--application-intent -k`
 Declares the application workload type when connecting to a database in a SQL Server Availability Group.
 #### `--multi-subnet-failover -m`
-If application is connecting to AlwaysOn AG on different subnets, setting this provides faster detection and connection to currently active server.
+If application is connecting to Always On AG on different subnets, setting this provides faster detection and connection to currently active server.
 #### `--packet-size`
 Size in bytes of the network packets used to communicate with SQL Server.
 #### `--dac-connection -a`

docs/azure-data-studio/extensions/azure-sql-migration-extension.md

@@ -11,7 +11,7 @@ ms.custom:
 ms.date: 09/01/2021
 ---
 
-# Azure SQL Migration extension for Azure Data Studio (preview)
+# Azure SQL Migration extension for Azure Data Studio
 
 The Azure SQL Migration extension for [Azure Data Studio](../what-is-azure-data-studio.md) enables you to use the SQL Server assessment and migration capability in Azure Data Studio.
 

docs/azure-data-studio/extensions/machine-learning-extension-import-view-models.md

@@ -4,8 +4,8 @@ description: Learn how to use Machine Learning extension for Azure Data Studio t
 ms.prod: azure-data-studio
 ms.technology: machine-learning
 ms.topic: conceptual
-author: dphansen
-ms.author: davidph
+author: rothja
+ms.author: jroth
 ms.reviewer:
 ms.custom: 
 ms.date: 06/09/2020

docs/azure-data-studio/extensions/machine-learning-extension-manage-packages.md

@@ -4,8 +4,8 @@ description: Learn how to manage Python or R packages in your database with the
 ms.prod: azure-data-studio
 ms.technology: machine-learning
 ms.topic: conceptual
-author: dphansen
-ms.author: davidph
+author: rothja
+ms.author: jroth
 ms.reviewer:
 ms.custom: 
 ms.date: 05/19/2020