Merge branch 'main' of https://github.com/MicrosoftDocs/sql-docs-pr into 20221209-faq

Author: MikeRayMSFT

.openpublishing.redirection.json

@@ -42600,7 +42600,7 @@
       "redirect_url": "/sql/relational-databases/performance/performance-center-for-sql-server-database-engine-and-azure-sql-database",
       "redirect_document_id": false
     },
-        {
+    {
       "source_path": "docs/advanced-analytics/r/sql-server-r-services.md",
       "redirect_url": "/sql/machine-learning/r/sql-server-r-services",
       "redirect_document_id": true
@@ -43096,14 +43096,14 @@
       "redirect_document_id": true
     },
     {
-        "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-support-overview",
-        "redirect_document_id": false
+      "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-support-overview",
+      "redirect_document_id": false
     },
     {
-        "source_path": "docs/lp/sql-server/load-move-data.md",
-        "redirect_url": "/sql/sql-server/migrate/",
-        "redirect_document_id": true
+      "source_path": "docs/lp/sql-server/load-move-data.md",
+      "redirect_url": "/sql/sql-server/migrate/",
+      "redirect_document_id": true
     },
     {
       "source_path": "docs/2014/2014-toc/books-online-for-sql-server-2014.md",
@@ -43784,12 +43784,12 @@
       "source_path": "docs/linux/sql-server-linux-shared-disk-cluster-red-hat-7-troubleshoot.md",
       "redirect_url": "/sql/linux/sql-server-linux-shared-disk-cluster-red-hat-7-operate",
       "redirect_document_id": true
-    },    
+    },
     {
       "source_path": "docs/lp/sql-server/install-sql-and-services.md",
       "redirect_url": "/sql/sql-server/",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path": "docs/lp/sql-server/business-continuity.md",
       "redirect_url": "/sql/sql-server/",
@@ -59156,14 +59156,14 @@
       "redirect_document_id": false
     },
     {
-    "source_path": "docs/azure-data-studio/tutorial-create-extension.md",
-    "redirect_url": "/sql/azure-data-studio/extensions/keymap-extension",
-    "redirect_document_id": false
+      "source_path": "docs/azure-data-studio/tutorial-create-extension.md",
+      "redirect_url": "/sql/azure-data-studio/extensions/keymap-extension",
+      "redirect_document_id": false
     },
     {
-    "source_path": "docs/linux/sql-server-linux-configure-docker.md",
-    "redirect_url": "/sql/linux/sql-server-linux-docker-container-deployment",
-    "redirect_document_id": true
+      "source_path": "docs/linux/sql-server-linux-configure-docker.md",
+      "redirect_url": "/sql/linux/sql-server-linux-docker-container-deployment",
+      "redirect_document_id": true
     },
     {
       "source_path": "docs/azure-data-studio/azure-sql-managed-instance-extension.md",
@@ -59529,6 +59529,45 @@
       "source_path": "docs/relational-databases/system-tables/cdc-change-feed-settings.md",
       "redirect_url": "/sql/relational-databases/system-tables/changefeed-change-feed-settings",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/relational-databases/errors-events/mssqlserver-neg2-database-engine-error.md",
+      "redirect_url": "/troubleshoot/sql/connect/timeout-expired-error",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/relational-databases/errors-events/mssqlserver-1-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": "docs/relational-databases/errors-events/mssqlserver-2-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": "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",
+    },
+    {
+      "source_path": "azure-sql/database/sql-vulnerability-assessment.md",
+      "redirect_url": "/defender-for-cloud/sql-azure-vulnerability-assessment-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/database-engine/configure-windows/enable-encrypted-connections-to-the-database-engine.md",
+      "redirect_url": "/sql/database-engine/configure-windows/configure-sql-server-encryption",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/relational-databases/performance/parameter-sensitivity-plan-optimization.md",
+      "redirect_url": "/sql/relational-databases/performance/parameter-sensitive-plan-optimization",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/ssma/db2/working-with-ssma-for-oracle-console-db2tosql.md",
+      "redirect_url": "/sql/ssma/db2/working-with-ssma-for-db2-console-db2tosql",
+      "redirect_document_id": false
     }
   ]
 }

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

@@ -167,7 +167,7 @@ To create a geo-secondary in a subscription different from the subscription of t
    alter role db_owner add member geodrsetup;
    ```
 
-7. In the master database on the **secondary** server, create the same login as on the primary server, using the same name, password, and SID. Replace the hexadecimal SID value in the sample command below with the one obtained in Step 4.
+7. In the `master` database on the **secondary** server, create the same login as on the primary server, using the same name, password, and SID. Replace the hexadecimal SID value in the sample command below with the one obtained in Step 4.
 
    ```sql
    create login geodrsetup with password = 'ComplexPassword01', sid=0x010600000000006400000000000000001C98F52B95D9C84BBBA8578FACE37C3E;
@@ -180,7 +180,7 @@ To create a geo-secondary in a subscription different from the subscription of t
    alter role dbmanager add member geodrsetup;
    ```
 
-9. Connect to the master database on the **primary** server using the new `geodrsetup` login, and initiate geo-secondary creation on the secondary server. Adjust database name and secondary server name as needed. Once the command is executed, you can monitor geo-secondary creation by querying the [sys.dm_geo_replication_link_status](/sql/relational-databases/system-dynamic-management-views/sys-dm-geo-replication-link-status-azure-sql-database) view in the **primary** database, and the [sys.dm_operation_status](/sql/relational-databases/system-dynamic-management-views/sys-dm-operation-status-azure-sql-database) view in the master database on the **primary** server. The time needed to create a geo-secondary depends on the primary database size.
+9. Connect to the `master` database on the **primary** server using the new `geodrsetup` login, and initiate geo-secondary creation on the secondary server. Adjust database name and secondary server name as needed. Once the command is executed, you can monitor geo-secondary creation by querying the [sys.dm_geo_replication_link_status](/sql/relational-databases/system-dynamic-management-views/sys-dm-geo-replication-link-status-azure-sql-database) view in the **primary** database, and the [sys.dm_operation_status](/sql/relational-databases/system-dynamic-management-views/sys-dm-operation-status-azure-sql-database) view in the `master` database on the **primary** server. The time needed to create a geo-secondary depends on the primary database size.
 
    ```sql
    alter database [dbrep] add secondary on server [servername];

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

@@ -17,20 +17,20 @@ This article describes the authentication requirements to configure and control
 
 ## Disaster recovery with contained users
 
-Unlike traditional users, which must be mapped to logins in the master database, a contained user is managed completely by the database itself. This has two benefits. In the disaster recovery scenario, the users can continue to connect to the new primary database or the database recovered using geo-restore without any additional configuration, because the database manages the users. There are also potential scalability and performance benefits from this configuration from a login perspective. For more information, see [Contained Database Users - Making Your Database Portable](/sql/relational-databases/security/contained-database-users-making-your-database-portable).
+Unlike traditional users, which must be mapped to logins in the `master` database, a contained user is managed completely by the database itself. This has two benefits. In the disaster recovery scenario, the users can continue to connect to the new primary database or the database recovered using geo-restore without any additional configuration, because the database manages the users. There are also potential scalability and performance benefits from this configuration from a login perspective. For more information, see [Contained Database Users - Making Your Database Portable](/sql/relational-databases/security/contained-database-users-making-your-database-portable).
 
-The main trade-off is that managing the disaster recovery process at scale is more challenging. When you have multiple databases that use the same login, maintaining the credentials using contained users in multiple databases may negate the benefits of contained users. For example, the password rotation policy requires that changes be made consistently in multiple databases rather than changing the password for the login once in the master database. For this reason, if you have multiple databases that use the same user name and password, using contained users is not recommended.
+The main trade-off is that managing the disaster recovery process at scale is more challenging. When you have multiple databases that use the same login, maintaining the credentials using contained users in multiple databases may negate the benefits of contained users. For example, the password rotation policy requires that changes be made consistently in multiple databases rather than changing the password for the login once in the `master` database. For this reason, if you have multiple databases that use the same user name and password, using contained users is not recommended.
 
 ## How to configure logins and users
 
-If you are using logins and users (rather than contained users), you must take extra steps to ensure that the same logins exist in the master database. The following sections outline the steps involved and additional considerations.
+If you are using logins and users (rather than contained users), you must take extra steps to ensure that the same logins exist in the `master` database. The following sections outline the steps involved and additional considerations.
 
   >[!NOTE]
   > It is also possible to use Azure Active Directory (AAD) logins to manage your databases. For more information, see [Azure SQL logins and users](./logins-create-manage.md).
 
 ### Set up user access to a secondary or recovered database
 
-In order for the secondary database to be usable as a read-only secondary database, and to ensure proper access to the new primary database or the database recovered using geo-restore, the master database of the target server must have the appropriate security configuration in place before the recovery.
+In order for the secondary database to be usable as a read-only secondary database, and to ensure proper access to the new primary database or the database recovered using geo-restore, the `master` database of the target server must have the appropriate security configuration in place before the recovery.
 
 The specific permissions for each step are described later in this topic.
 
@@ -43,7 +43,7 @@ Setting up logins on the target server involves three steps outlined below:
 
 #### 1. Determine logins with access to the primary database
 
-The first step of the process is to determine which logins must be duplicated on the target server. This is accomplished with a pair of SELECT statements, one in the logical master database on the source server and one in the primary database itself.
+The first step of the process is to determine which logins must be duplicated on the target server. This is accomplished with a pair of SELECT statements, one in the logical `master` database on the source server and one in the primary database itself.
 
 Only the server admin or a member of the **LoginManager** server role can determine the logins on the source server with the following SELECT statement.
 

azure-sql/database/always-encrypted-enclaves-getting-started.md

@@ -361,7 +361,7 @@ In this step, you'll encrypt the data stored in the **SSN** and **Salary** colum
 1. Open a new SSMS instance and connect to your database **with** Always Encrypted enabled for the database connection.
     1. Start a new instance of SSMS.
     2. In the **Connect to Server** dialog, specify the fully qualified name of your server (for example, *myserver135.database.windows.net*), and enter the administrator user name and the password you specified when you created the server.
-    3. Select **Options >>** and select the **Connection Properties** tab. Make sure to select the **ContosoHR** database (not the default, master database). 
+    3. Select **Options >>** and select the **Connection Properties** tab. Make sure to select the **ContosoHR** database (not the default, `master` database). 
     4. Select the **Always Encrypted** tab.
     5. Select the **Enable Always Encrypted (column encryption)** checkbox.
     6. Select **Enable secure enclaves**. (This step applies to SSMS 19 or later.)

azure-sql/database/arm-templates-content-guide.md

@@ -26,7 +26,6 @@ The following table includes links to Azure Resource Manager templates for Azure
 | [Server](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-logical-server) | This Azure Resource Manager template creates a server for Azure SQL Database. |
 | [Elastic pool](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-elastic-pool-create) | This template allows you to deploy an elastic pool and to assign databases to it. |
 | [Failover groups](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-with-failover-group) | This template creates two servers, a single database, and a failover group in Azure SQL Database.|
-| [Threat Detection](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-threat-detection-db-policy-multiple-databases) | This template allows you to deploy a server and a set of databases with Threat Detection enabled, with an email address for alerts for each database. Threat Detection is part of the SQL Advanced Threat Protection (ATP) offering and provides a layer of security that responds to potential threats over servers and databases.|
 | [Auditing to Azure Blob storage](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-auditing-server-policy-to-blob-storage) | This template allows you to deploy a server with auditing enabled to write audit logs to a Blob storage. Auditing for Azure SQL Database tracks database events and writes them to an audit log that can be placed in your Azure storage account, OMS workspace, or Event Hubs.|
 | [Auditing to Azure Event Hub](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.sql/sql-auditing-server-policy-to-eventhub) | This template allows you to deploy a server with auditing enabled to write audit logs to an existing event hub. In order to send audit events to Event Hubs, set auditing settings with `Enabled` `State`, and set `IsAzureMonitorTargetEnabled` as `true`. Also, configure Diagnostic Settings with the `SQLSecurityAuditEvents` log category on the `master` database (for server-level auditing). Auditing tracks database events and writes them to an audit log that can be placed in your Azure storage account, OMS workspace, or Event Hubs.|
 | [Azure Web App with SQL Database](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-sql-database) | This sample creates a free Azure web app and a database in Azure SQL Database at the "Basic" service level.|

azure-sql/database/auditing-overview.md

@@ -84,7 +84,7 @@ An auditing policy can be defined for a specific database or as a default [serve
 
 ## <a id="setup-auditing"></a>Set up auditing for your server
 
-The default auditing policy includes all actions and the following set of action groups, which will audit all the queries and stored procedures executed against the database, as well as successful and failed logins:
+The default auditing policy includes the following set of action groups, which will audit all the queries and stored procedures executed against the database, as well as successful and failed logins:
 
 - BATCH_COMPLETED_GROUP
 - SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP