Merge branch 'release-2022-cu6' of https://github.com/MicrosoftDocs/sql-docs-pr into 202305_replaad

Author: MashaMSFT

.openpublishing.redirection.azure-sql.json

@@ -624,6 +624,11 @@
       "source_path_from_root": "/azure-sql/database/sql-database-vulnerability-assessment-rules-changelog.md",
       "redirect_url": "/azure/defender-for-cloud/sql-azure-vulnerability-assessment-rules-changelog",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/azure-sql/database/authentication-mfa-ssms-configure.md",
+      "redirect_url": "/azure/azure-sql/database/authentication-mfa-ssms-overview",
+      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.json

@@ -59638,6 +59638,7 @@
     {
       "source_path": "docs/relational-databases/errors-events/mssqlserver-53-database-engine-error.md",
       "redirect_url": "/troubleshoot/sql/connect/network-related-or-instance-specific-error-occurred-while-establishing-connection",
+      "redirect_document_id": false
     },
     {
       "source_path": "azure-sql/database/sql-vulnerability-assessment.md",
@@ -59704,6 +59705,11 @@
       "redirect_url": "/sql/relational-databases/system-tables/msrepl-agent-jobs-transact-sql",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/relational-databases/security/networking/tds-8-and-tls-1-3.md",
+      "redirect_url": "/sql/relational-databases/security/networking/tds-8",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/ssms/object/filter-settings-object-explorer-and-utility-explorer.md",
       "redirect_url": "/sql/ssms/release-notes-ssms",
@@ -59806,7 +59812,7 @@
     },
     {
       "source_path": "docs/relational-databases/system-stored-procedures/sp-query-store-remove-plan-transct-sql.md",
-      "redirect_url": "/sql/relational-databases/sp-query-store-remove-plan-transact-sql",
+      "redirect_url": "/sql/relational-databases/system-stored-procedures/sp-query-store-remove-plan-transact-sql",
       "redirect_document_id": false
     },
     {

azure-sql/azure-hybrid-benefit.md

@@ -62,7 +62,7 @@ To set or update the license type using the Azure CLI:
 
 To set or update the license type using the REST API:
 
-- [Create or update](/rest/api/sql/databases/createorupdate) with the properties.licenseType parameter
+- [Create or update](/rest/api/sql/2022-08-01-preview/databases/create-or-update) with the properties.licenseType parameter
 - [Update](/rest/api/sql/databases/update) with the properties.licenseType parameter
 
 ---

azure-sql/azure-sql-iaas-vs-paas-what-is-overview.md

@@ -3,7 +3,7 @@ title: "What is Azure SQL?"
 description: "Learn about the different options within the Azure SQL family of services: Azure SQL Database, Azure SQL Managed Instance, and SQL Server on Azure VM."
 author: MashaMSFT
 ms.author: mathoma
-ms.reviewer: kendralittle
+ms.reviewer: wiassaf
 ms.date: 03/18/2022
 ms.service: sql-database
 ms.subservice: service-overview

azure-sql/capacity-errors-troubleshoot.md

@@ -3,7 +3,7 @@ title: Resolve capacity errors with Azure SQL resources
 description: Learn how to resolve possible capacity errors when attempting to deploy or scale Azure SQL Database or Azure SQL Managed Instance resources.
 author: sachinpMSFT
 ms.author: sachinp
-ms.reviewer: mathoma, kendralittle
+ms.reviewer: mathoma
 ms.date: 09/03/2021
 ms.service: sql-db-mi
 ms.subservice: deployment-configuration

azure-sql/database/active-directory-interactive-connect-azure-sql-db.md

@@ -18,7 +18,7 @@ ms.custom:
 
 This article provides a C# program that connects to Azure SQL Database. The program uses interactive mode authentication, which supports [Azure AD Multi-Factor Authentication](/azure/active-directory/authentication/concept-mfa-howitworks).
 
-For more information about Multi-Factor Authentication support for SQL tools, see [Using multi-factor Azure Active Directory authentication](./authentication-mfa-ssms-overview.md).
+For more information about Multi-Factor Authentication support for SQL tools, see [Using Azure Active Directory Multi-Factor Authentication](./authentication-mfa-ssms-overview.md).
 
 ## Multi-Factor Authentication for Azure SQL Database
 
@@ -36,7 +36,7 @@ For more information about Multi-Factor Authentication support for SQL tools, se
 
 For information about how to configure Azure AD to require Multi-Factor Authentication, see [Getting started with Azure AD Multi-Factor Authentication in the cloud](/azure/active-directory/authentication/howto-mfa-getstarted).
 
-For screenshots of these dialog boxes, see [Configure multi-factor authentication for SQL Server Management Studio and Azure AD](authentication-mfa-ssms-configure.md).
+For screenshots of these dialog boxes, see [Using Azure Active Directory Multi-Factor Authentication](./authentication-mfa-ssms-overview.md).
 
 > [!TIP]
 > You can search .NET Framework APIs with the [.NET API Browser tool page](/dotnet/api/).
@@ -72,9 +72,9 @@ Run SSMS from the same computer, in the same building, where you plan to run the
 
 ### Verify Azure Active Directory Multi-Factor Authentication
 
-Run SSMS again, this time with **Authentication** set to **Azure Active Directory - Universal with MFA**. This option requires SSMS version 17.5 or later.
+Run SSMS again, this time with **Authentication** set to **Azure Active Directory - Universal with MFA**. This option requires SSMS version 18.6 or later.
 
-For more information, see [Configure Multi-Factor Authentication for SSMS and Azure AD](authentication-mfa-ssms-configure.md).
+For more information, see [Using Azure Active Directory Multi-Factor Authentication](./authentication-mfa-ssms-overview.md).
 
 > [!NOTE]
 > If you are a guest user in the database, you also need to provide the Azure AD domain name for the database: Select **Options** > **AD domain name or tenant ID**. If you are running SSMS 18.x or later, the AD domain name or tenant ID is no longer needed for guest users because 18.x or later automatically recognizes it.
@@ -137,4 +137,4 @@ Microsoft SQL Azure (RTM) - 12.0.2000.8
 
 - [Azure Active Directory server principals](authentication-azure-ad-logins.md)
 - [Azure AD-only authentication with Azure SQL](authentication-azure-ad-only-authentication.md)
-- [Using multi-factor Azure Active Directory authentication](authentication-mfa-ssms-overview.md)
+- [Using Azure Active Directory Multi-Factor Authentication](./authentication-mfa-ssms-overview.md)

azure-sql/database/active-geo-replication-configure-portal.md

@@ -31,7 +31,7 @@ To configure active geo-replication by using the Azure portal, you need the foll
 * A database in Azure SQL Database: The primary database that you want to replicate to a different geographical region.
 
 > [!Note]
-> When using Azure portal, you can only create a secondary database within the same subscription as the primary. If a secondary database is required to be in a different subscription, use [Create Database REST API](/rest/api/sql/databases/createorupdate) or [ALTER DATABASE Transact-SQL API](/sql/t-sql/statements/alter-database-transact-sql).
+> When using Azure portal, you can only create a secondary database within the same subscription as the primary. If a secondary database is required to be in a different subscription, use [Create Database REST API](/rest/api/sql/2022-08-01-preview/databases/create-or-update) or [ALTER DATABASE Transact-SQL API](/sql/t-sql/statements/alter-database-transact-sql).
 
 # [Azure CLI](#tab/azure-cli)
 

azure-sql/database/active-geo-replication-overview.md

@@ -271,8 +271,8 @@ As discussed previously, active geo-replication can also be managed programmatic
 
 | API | Description |
 | --- | --- |
-| [Create or Update Database (createMode=Restore)](/rest/api/sql/databases/createorupdate) |Creates, updates, or restores a primary or a secondary database. |
-| [Get Create or Update Database Status](/rest/api/sql/databases/createorupdate) |Returns the status during a create operation. |
+| [Create or Update Database (createMode=Restore)](/rest/api/sql/2022-08-01-preview/databases/create-or-update) |Creates, updates, or restores a primary or a secondary database. |
+| [Get Create or Update Database Status](/rest/api/sql/2022-08-01-preview/databases/create-or-update) |Returns the status during a create operation. |
 | [Set Secondary Database as Primary (Planned Failover)](/rest/api/sql/replicationlinks/failover) |Sets which secondary database is primary by failing over from the current primary database. **This option is not supported for SQL Managed Instance.**|
 | [Set Secondary Database as Primary (Unplanned Failover)](/rest/api/sql/replicationlinks/failoverallowdataloss) |Sets which secondary database is primary by failing over from the current primary database. This operation might result in data loss. **This option is not supported for SQL Managed Instance.**|
 | [Get Replication Link](/rest/api/sql/replicationlinks/get) |Gets a specific replication link for a given database in a geo-replication partnership. It retrieves the information visible in the sys.geo_replication_links catalog view. **This option is not supported for SQL Managed Instance.**|

azure-sql/database/always-encrypted-landing.yml

@@ -13,7 +13,7 @@ metadata:
   ms.topic: landing-page
   author: VanMSFT
   ms.author: vanto
-  ms.reviewer: kendralittle, mathoma
+  ms.reviewer: mathoma
   ms.date: 01/15/2021
   monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"
 

azure-sql/database/always-encrypted-with-secure-enclaves-landing.yml

@@ -13,7 +13,7 @@ metadata:
   ms.topic: landing-page
   author: VanMSFT
   ms.author: vanto
-  ms.reviewer: kendralittle, mathoma
+  ms.reviewer: mathoma
   ms.date: 04/05/2023
   monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"