fixing more broken things

Author: MashaMSFT

.openpublishing.redirection.json

@@ -32750,7 +32750,7 @@
         },
         {
             "source_path": "articles/sql-database/sql-database-security-attributes.md",
-            "redirect_url": "/azure/sql-database/sql-database-security-controls",
+            "redirect_url": "/azure/azure-sql/database/security-controls",
             "redirect_document_id": false
         },
         {

articles/analysis-services/tutorials/analysis-services-tutorial-roles.md

@@ -55,7 +55,7 @@ For the remaining tasks, you use SSMS to connect to and manage your server.
     ![Connect in SSMS](./media/analysis-services-tutorial-roles/aas-connect-ssms-auth.png)
 
     > [!TIP]
-    > Choosing Active Directory Universal with MFA Support is recommended. This type of authentication type supports [non-interactive and multi-factor authentication](../../azure-sql/). 
+    > Choosing Active Directory Universal with MFA Support is recommended. This type of authentication type supports [non-interactive and multi-factor authentication](../../azure-sql/mfa-authentication-ssms-overview.md). 
 
 3. In **Object Explorer**, expand to see server objects. Right-click to see server properties.
 

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

@@ -78,7 +78,7 @@ Azure SQL Database offers the following deployment options:
 
 ### Azure SQL Managed Instance
 
-[**Azure SQL Managed Instance**](managed-instance/sql-database-managed-instance.md) is a relational database-as-a-service (DBaaS) hosted in the Azure cloud that falls into the industry category of *Platform-as-a-Service (PaaS)*. Best for most migrations to the cloud. SQL Managed Instance is a collection of system and user databases with a shared set of resources that is lift-and-shift ready.  Best for new applications or existing on-premises applications that want to use the latest stable SQL Server features and that are migrated to the cloud with minimal changes. A SQL Managed Instance is similar to an instance of the [Microsoft SQL Server database engine](https://docs.microsoft.com/sql/database-engine/sql-server-database-engine-overview) offering shared resources for databases and additional instance-scoped features. SQL Managed Instance supports database migration from on-premises with minimal to no database change. This option provides all of the PaaS benefits of Azure SQL Database but adds capabilities that were previously only available in SQL Server VMs. This includes a native virtual network (VNet) and near 100% compatibility with on-premises SQL Server. SQL Managed Instances provide full SQL Server access and feature compatibility for migrating SQL Servers to Azure.
+[**Azure SQL Managed Instance**](managed-instance/sql-managed-instance-paas-overview.md) is a relational database-as-a-service (DBaaS) hosted in the Azure cloud that falls into the industry category of *Platform-as-a-Service (PaaS)*. Best for most migrations to the cloud. SQL Managed Instance is a collection of system and user databases with a shared set of resources that is lift-and-shift ready.  Best for new applications or existing on-premises applications that want to use the latest stable SQL Server features and that are migrated to the cloud with minimal changes. A SQL Managed Instance is similar to an instance of the [Microsoft SQL Server database engine](https://docs.microsoft.com/sql/database-engine/sql-server-database-engine-overview) offering shared resources for databases and additional instance-scoped features. SQL Managed Instance supports database migration from on-premises with minimal to no database change. This option provides all of the PaaS benefits of Azure SQL Database but adds capabilities that were previously only available in SQL Server VMs. This includes a native virtual network (VNet) and near 100% compatibility with on-premises SQL Server. SQL Managed Instances provide full SQL Server access and feature compatibility for migrating SQL Servers to Azure.
 
 ### SQL Server on Azure VM
 

articles/azure-sql/database/failover-group-add-single-database-tutorial.md

@@ -62,11 +62,11 @@ Create your failover group and add your database to it using the Azure portal.
 1. Select the database created in section 1, such as `mySampleDatabase`.
 1. Failover groups can be configured at the server level. Select the name of the server under **Server name** to open the settings for the server.
 
-   ![Open server for database](./media/failover-group--add-single-database-tutorial/open-sql-db-server.png)
+   ![Open server for database](./media/failover-group-add-single-database-tutorial/open-sql-db-server.png)
 
 1. Select **Failover groups** under the **Settings** pane, and then select **Add group** to create a new failover group.
 
-   ![Add new failover group](./media/failover-group--add-single-database-tutorial/sqldb-add-new-failover-group.png)
+   ![Add new failover group](./media/failover-group-add-single-database-tutorial/sqldb-add-new-failover-group.png)
 
 1. On the **Failover Group** page, enter or select the following values, and then select **Create**:
 
@@ -80,11 +80,11 @@ Create your failover group and add your database to it using the Azure portal.
      > [!NOTE]
      > The server login and firewall settings must match that of your primary server.
 
-     ![Create a secondary server for the failover group](./media/failover-group--add-single-database-tutorial/create-secondary-failover-server.png)
+     ![Create a secondary server for the failover group](./media/failover-group-add-single-database-tutorial/create-secondary-failover-server.png)
 
    - **Databases within the group**: Once a secondary server is selected, this option becomes unlocked. Select it to **Select databases to add** and then choose the database you created in section 1. Adding the database to the failover group will automatically start the geo-replication process.
 
-   ![Add SQL Database to failover group](./media/failover-group--add-single-database-tutorial/add-sqldb-to-failover-group.png)
+   ![Add SQL Database to failover group](./media/failover-group-add-single-database-tutorial/add-sqldb-to-failover-group.png)
 
 # [PowerShell](#tab/azure-powershell)
 
@@ -208,17 +208,17 @@ Test failover using the Azure portal.
 1. Select the database created in the section 2, such as `mySampleDatbase`.
 1. Select the name of the server under **Server name** to open the settings for the server.
 
-   ![Open server for database](./media/failover-group--add-single-database-tutorial/open-sql-db-server.png)
+   ![Open server for database](./media/failover-group-add-single-database-tutorial/open-sql-db-server.png)
 
 1. Select **Failover groups** under the **Settings** pane and then choose the failover group you created in section 2.
 
-   ![Select the failover group from the portal](./media/failover-group--add-single-database-tutorial/select-failover-group.png)
+   ![Select the failover group from the portal](./media/failover-group-add-single-database-tutorial/select-failover-group.png)
 
 1. Review which server is primary and which server is secondary.
 1. Select **Failover** from the task pane to failover your failover group containing your sample database.
 1. Select **Yes** on the warning that notifies you that TDS sessions will be disconnected.
 
-   ![Fail over your failover group containing your SQL database](./media/failover-group--add-single-database-tutorial/failover-sql-db.png)
+   ![Fail over your failover group containing your SQL database](./media/failover-group-add-single-database-tutorial/failover-sql-db.png)
 
 1. Review which server is now primary and which server is secondary. If fail over succeeded, the two servers should have swapped roles.
 1. Select **Failover** again to fail the servers back to their originally roles.

articles/azure-sql/database/move-resources-across-regions.md

@@ -55,7 +55,7 @@ This article provides a general workflow for moving resources to a different reg
 
 ### Prepare resources
 
-1. Create a [failover group](failover-group--add-single-database-tutorial.md#2---create-the-failover-group) between the server of the source to the server of the target.  
+1. Create a [failover group](failover-group-add-single-database-tutorial.md#2---create-the-failover-group) between the server of the source to the server of the target.  
 1. Add the databases you want to move to the failover group.
     - Replication of all added databases will be initiated automatically. For more information, see [Best practices for using failover groups with single databases](auto-failover-group-overview.md#best-practices-for-sql-database).
 

articles/azure-sql/mfa-authentication-ssms-configure.md

@@ -34,12 +34,12 @@ The following steps show how to connect using the latest SSMS.
 1. To connect using Universal Authentication, on the **Connect to Server** dialog box in SQL Server Management Studio (SSMS), select **Active Directory - Universal with MFA support**. (If you see **Active Directory Universal Authentication** you are not on the latest version of SSMS.)  
    ![1mfa-universal-connect][1]  
 2. Complete the **User name** box with the Azure Active Directory credentials, in the format `[email protected]`.  
-   ![1mfa-universal-connect-user](./media/ssms-mfa-authentication-configure/1mfa-universal-connect-user.png)
+   ![1mfa-universal-connect-user](./media/mfa-authentication-ssms-configure/1mfa-universal-connect-user.png)
 3. If you are connecting as a guest user, you no longer need to complete the AD domain name or tenant ID field for guest users because SSMS 18.x or later automatically recognizes it. For more information, see [Universal Authentication with SQL Database, SQL Managed Instance, and Azure Synapse (SSMS support for MFA)](mfa-authentication-ssms-overview.md).
-   ![mfa-no-tenant-ssms](./media/ssms-mfa-authentication-configure/mfa-no-tenant-ssms.png)
+   ![mfa-no-tenant-ssms](./media/mfa-authentication-ssms-configure/mfa-no-tenant-ssms.png)
 
    However, If you are connecting as a guest user using SSMS 17.x or older, you must click **Options**, and on the **Connection Property** dialog box, and complete the **AD domain name or tenant ID** box.
-   ![mfa-tenant-ssms](./media/ssms-mfa-authentication-configure/mfa-tenant-ssms.png)
+   ![mfa-tenant-ssms](./media/mfa-authentication-ssms-configure/mfa-tenant-ssms.png)
 
 4. Select **Options** and specify the database on the **Options** dialog box. (If the connected user is a guest user ( i.e. [email protected]), you must check the box and add the current AD domain name or tenant ID as part of Options. See [Universal Authentication with SQL Database and SQL Data Warehouse (SSMS support for MFA)](mfa-authentication-ssms-overview.md). Then click **Connect**.  
 5. When the **Sign in to your account** dialog box appears, provide the account and password of your Azure Active Directory identity. No password is required if a user is part of a domain federated with Azure AD.  

articles/azure-sql/toc.yml

@@ -107,35 +107,35 @@
         - name: Audit to storage account behind VNet or firewall
           href: database/audit-write-storage-account-behind-vnet-firewall.md
         - name: Audit log format
-          href: sql-database-audit-log-format.md
+          href: database/audit-log-format.md
 
       - name: Security management
         items:
         - name: Advanced data security
-          href: sql-database-advanced-data-security.md
+          href: database/advanced-data-security.md
         - name: Data discovery and classification
-          href: sql-database-data-discovery-and-classification.md
+          href: database/data-discovery-and-classification-overview.md
         - name: Vulnerability assessment
           items:
           - name: Vulnerability assessment  
-            href: sql-vulnerability-assessment.md
+            href: /database/sql-vulnerability-assessment.md
           - name: Storing VA scans behind firewalls and VNets
-            href: sql-database-vulnerability-assessment-storage.md
+            href: database/sql-database-vulnerability-assessment-storage.md
         - name: Advanced Threat Protection
-          href: sql-database-threat-detection-overview.md
+          href: database/threat-detection-overview.md
         - name: Security attributes
-          href: sql-database-security-attributes.md
+          href: database/security-controls.md
     - name: Connect and query
-      href: sql-database-connect-query.md
+      href: database/connect-query-content-reference-guide.md
       items:
       - name: Connect and run ad-hoc queries
         items:
         - name: Azure Data Studio
           href: https://docs.microsoft.com/sql/azure-data-studio/quickstart-sql-database?toc=/azure/sql-database/toc.json
         - name: SSMS
-          href: sql-database-connect-query-ssms.md
+          href: database/connect-query-ssms.md
         - name: Azure portal
-          href: sql-database-connect-query-portal.md
+          href: database/connect-query-portal.md
         - name: VS Code
           href: sql-database-connect-query-vscode.md
       - name: Connect and query from apps

articles/security/fundamentals/paas-applications-using-sql.md

@@ -46,7 +46,7 @@ Azure SQL Database can be configured to use one of two types of authentication:
 - Uses contained database users to authenticate identities at the database level.
 - Supports token-based authentication for applications connecting to SQL Database.
 - Supports domain federation with Active Directory Federation Services (ADFS) or native user/password authentication for a local Azure AD without domain synchronization.
-- Supports connections from SQL Server Management Studio that use Active Directory Universal Authentication, which includes [Multi-Factor Authentication (MFA)](/azure/active-directory/authentication/multi-factor-authentication). MFA includes strong authentication with a range of easy verification options — phone call, text message, smart cards with pin, or mobile app notification. For more information, see [Universal Authentication with SQL Database and SQL Data Warehouse](../../azure-sql/).
+- Supports connections from SQL Server Management Studio that use Active Directory Universal Authentication, which includes [Multi-Factor Authentication (MFA)](/azure/active-directory/authentication/multi-factor-authentication). MFA includes strong authentication with a range of easy verification options — phone call, text message, smart cards with pin, or mobile app notification. For more information, see [Universal Authentication with SQL Database and SQL Data Warehouse](../../azure-sql/mfa-authentication-ssms-overview.md).
 
 To learn more about Azure AD authentication, see:
 

articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-authentication.md

@@ -52,10 +52,10 @@ Azure Active Directory benefits include:
 * Helps stop the proliferation of user identities across servers.
 * Allows password rotation in a single place
 * Manage database permissions using external (Azure AD) groups.
-* Eliminates storing passwords by enabling integrated Windows authentication and other forms of authentication supported by Azure Active Directory.
+* Eliminates storing passwords by enabling integrated Windows authentication and o ther forms of authentication supported by Azure Active Directory.
 * Uses contained database users to authenticate identities at the database level.
 * Supports token-based authentication for applications connecting to SQL pool.
-* Supports Multi-Factor authentication through Active Directory Universal Authentication for various tools including [SQL Server Management Studio](../../azure-sql/?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json) and [SQL Server Data Tools](/sql/ssdt/azure-active-directory?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json&view=azure-sqldw-latest).
+* Supports Multi-Factor authentication through Active Directory Universal Authentication for various tools including [SQL Server Management Studio](../../azure-sql/mfa-authentication-ssms-overview.md?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json) and [SQL Server Data Tools](/sql/ssdt/azure-active-directory?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json&view=azure-sqldw-latest).
 
 > [!NOTE]
 > Azure Active Directory is still relatively new and has some limitations. To ensure that Azure Active Directory is a good fit for your environment, see [Azure AD features and limitations](../../azure-sql/database/aad-authentication-overview.md?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json#azure-ad-features-and-limitations), specifically the Additional considerations.