fixing things

MashaMSFT · MashaMSFT · commit c469b91e38c3 · 2020-05-21T15:26:17.000-07:00
diff --git a/articles/azure-sql/database/authentication-aad-configure.md b/articles/azure-sql/database/authentication-aad-configure.md
@@ -455,7 +455,7 @@ Use this method to authenticate to SQL Database or SQL Managed Instance with Azu
 
 Use this method for interactive authentication with or without multi-factor authentication (MFA), with password being requested interactively. This method can be used to authenticate to SQL Database, SQL Managed Instance, and Azure Synapse for Azure AD cloud-only identity users, or those who use Azure AD hybrid identities.
 
-For more information, see [Using Multi-factor AAD authentication with SQL Database and Azure Synapse (SSMS support for MFA)](../mfa-authentication-ssms-overview.md).
+For more information, see [Using Multi-factor AAD authentication with SQL Database and Azure Synapse (SSMS support for MFA)](authentication-mfa-ssms-overview.md).
 
 ## Using an Azure AD identity to connect from a client application
 
diff --git a/articles/azure-sql/database/authentication-aad-overview.md b/articles/azure-sql/database/authentication-aad-overview.md
@@ -36,7 +36,7 @@ With Azure AD authentication, you can centrally manage the identities of databas
     - Federated authentication
   - For more information on Azure AD authentication methods and which one to choose, see the following article:
     - [Choose the right authentication method for your Azure Active Directory hybrid identity solution](../../active-directory/hybrid/choose-ad-authn.md)
-- Azure AD supports connections from SQL Server Management Studio that use Active Directory Universal Authentication, which includes Multi-Factor Authentication (MFA). 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 [SSMS support for Azure AD MFA with Azure SQL Database, SQL Managed Instance, and Azure Synapse](../authentication-mfa-ssms-overview.md)
+- Azure AD supports connections from SQL Server Management Studio that use Active Directory Universal Authentication, which includes Multi-Factor Authentication (MFA). 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 [SSMS support for Azure AD MFA with Azure SQL Database, SQL Managed Instance, and Azure Synapse](authentication-mfa-ssms-overview.md)
 - Azure AD supports similar connections from SQL Server Data Tools (SSDT) that use Active Directory Interactive Authentication. For more information, see [Azure Active Directory support in SQL Server Data Tools (SSDT)](/sql/ssdt/azure-active-directory)
 
 > [!NOTE]  
diff --git a/articles/azure-sql/managed-instance/aad-security-configure-tutorial.md b/articles/azure-sql/managed-instance/aad-security-configure-tutorial.md
@@ -149,7 +149,7 @@ Once the Azure AD server principal (login) has been created, and provided with `
 
      ![ssms-login-prompt.png](./media/aad-security-configure-tutorial/ssms-login-prompt.png)
 
-     For more information, see the following article: [Universal Authentication (SSMS support for MFA)](authentication-mfa-ssms-overview.md)
+     For more information, see the following article: [Universal Authentication (SSMS support for MFA)](../database/authentication-mfa-ssms-overview.md)
 
 1. Select **Active Directory - Universal with MFA support**. This brings up a Multi-Factor Authentication (MFA) login window. Sign in with your Azure AD password.
 
diff --git a/articles/azure-sql/managed-instance/how-to-content-reference-guide.md b/articles/azure-sql/managed-instance/how-to-content-reference-guide.md
@@ -50,8 +50,8 @@ In this article you can find a content reference to various guides, scripts, and
 
 - [Configure Azure AD auth](../database/authentication-aad-configure.md)
 - [Configure Conditional Access](../database/conditional-access-configure.md)
-- [Multi-factor AAD auth](authentication-mfa-ssms-overview.md)
-- [Configure multi-factor auth](authentication-mfa-ssms-configure.md)
+- [Multi-factor AAD auth](../database/authentication-mfa-ssms-overview.md)
+- [Configure multi-factor auth](../database/authentication-mfa-ssms-configure.md)
 - [Configure temporal retention policy](../database/temporal-tables-retention-policy.md)
 - [Configure TDE with BYOK](../database/transparent-data-encryption-byok-configure.md)
 - [Rotate TDE BYOK keys](../database/transparent-data-encryption-byok-key-rotation.md)
diff --git a/articles/azure-sql/managed-instance/sql-managed-instance-paas-overview.md b/articles/azure-sql/managed-instance/sql-managed-instance-paas-overview.md
@@ -253,7 +253,7 @@ A new syntax is introduced to create Azure AD server principals (logins), **FROM
 
 ### Azure Active Directory integration and multi-factor authentication
 
-SQL Managed Instance enables you to centrally manage identities of database user and other Microsoft services with [Azure Active Directory integration](../database/authentication-aad-overview.md). This capability simplified permission management and enhances security. Azure Active Directory supports [multi-factor authentication](authentication-mfa-ssms-configure.md) (MFA) to increase data and application security while supporting a single sign-on process.
+SQL Managed Instance enables you to centrally manage identities of database user and other Microsoft services with [Azure Active Directory integration](../database/authentication-aad-overview.md). This capability simplified permission management and enhances security. Azure Active Directory supports [multi-factor authentication](../database/authentication-mfa-ssms-configure.md) (MFA) to increase data and application security while supporting a single sign-on process.
 
 ### Authentication
 
diff --git a/articles/azure-sql/toc.yml b/articles/azure-sql/toc.yml
@@ -17,14 +17,14 @@
     - name: Reserved capacity
       href: database/reserved-capacity-overview.md
   - name: Compute & storage
-      items:
-      - name: Overview
-        href: database/service-tiers-general-purpose-business-critical.md
-        displayName: provisioned compute tier
-      - name: General purpose / Standard
-        href: database/service-tier-general-purpose.md
-      - name: Business critical / Premium
-        href: database/service-tier-business-critical.md        
+    items:
+    - name: Overview
+      href: database/service-tiers-general-purpose-business-critical.md
+      displayName: provisioned compute tier
+    - name: General purpose / Standard
+      href: database/service-tier-general-purpose.md
+    - name: Business critical / Premium
+      href: database/service-tier-business-critical.md        
 
   - name: Shared concepts 
     itemS: 
@@ -67,9 +67,9 @@
         - name: Configure Azure AD auth
           href: database/authentication-aad-configure.md
         - name: Multi-factor AAD auth
-          href: mfa-authentication-ssms-overview.md
+          href: database/authentication-mfa-ssms-overview.md
         - name: Configure multi-factor auth
-          href: mfa-authentication-ssms-configure.md
+          href: database/authentication-mfa-ssms-configure.md
         - name: Conditional Access
           href: database/conditional-access-configure.md
       - name: Transparent Data Encryption (TDE)
@@ -222,6 +222,18 @@
       href: database/logical-servers.md
     - name: Release notes
       href: database/doc-changes-updates-release-notes.md?&tabs=single-database
+    - name: Service Tiers
+      items: 
+      - name: Serverless
+        href: database/serverless-tier-overview.md
+      - name: DTU model overview
+        href: database/service-tiers-dtu.md
+      - name: Hyperscale
+        href: database/service-tier-hyperscale.md
+      - name: Hyperscale FAQ
+        href: database/service-tier-hyperscale-frequently-asked-questions-faq.md
+      - name: Migrate from Premium RS
+        href: database/service-tiers-prs.md     
 
   - name: Quickstarts
     items:
@@ -290,20 +302,6 @@
       href: database/elastic-query-overview.md
     - name: Elastic transactions
       href: database/elastic-transactions-overview.md
-              
-
-    - name: Service Tiers
-      items: 
-      - name: Serverless
-        href: database/serverless-tier-overview.md
-      - name: DTU model overview
-        href: database/service-tiers-dtu.md
-      - name: Hyperscale
-        href: database/service-tier-hyperscale.md
-      - name: Hyperscale FAQ
-        href: database/service-tier-hyperscale-frequently-asked-questions-faq.md
-      - name: Migrate from Premium RS
-        href: database/service-tiers-prs.md
 
     - name: Resource management 
       items: 
diff --git a/articles/data-factory/connector-azure-sql-managed-instance.md b/articles/data-factory/connector-azure-sql-managed-instance.md
@@ -185,7 +185,7 @@ To use managed identity authentication, follow these steps.
     CREATE LOGIN [your Data Factory name] FROM EXTERNAL PROVIDER
     ```
 
-3. [Create contained database users](../azure-sql/database/aad-authentication-configure.md#create-contained-users-mapped-to-azure-ad-identities) for the Azure Data Factory managed identity. Connect to the database from or to which you want to copy data, run the following T-SQL: 
+3. [Create contained database users](../azure-sql/database/authentication-aad-configure.md#create-contained-users-mapped-to-azure-ad-identities) for the Azure Data Factory managed identity. Connect to the database from or to which you want to copy data, run the following T-SQL: 
   
     ```sql
     CREATE USER [your Data Factory name] FROM EXTERNAL PROVIDER
diff --git a/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-authentication.md b/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-authentication.md
@@ -75,7 +75,7 @@ Currently Azure Active Directory users are not shown in SSDT Object Explorer. As
 
 ### Find the details
 
-* The steps to configure and use Azure Active Directory authentication are nearly identical for Azure SQL Database and SQL Analytics in Azure Synapse. Follow the detailed steps in the topic [Connecting to SQL Database or SQL Pool By Using Azure Active Directory Authentication](../../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).
+* The steps to configure and use Azure Active Directory authentication are nearly identical for Azure SQL Database and SQL Analytics in Azure Synapse. Follow the detailed steps in the topic [Connecting to SQL Database or SQL Pool By Using Azure Active Directory Authentication](../../azure-sql/database/authentication-aad-overview.md?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json).
 * Create custom database roles and add users to the roles. Then grant granular permissions to the roles. For more information, see [Getting Started with Database Engine Permissions](/sql/relational-databases/security/authentication-access/getting-started-with-database-engine-permissions?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json&view=azure-sqldw-latest).
 
 ## Next steps
diff --git a/articles/synapse-analytics/sql/on-demand-workspace-overview.md b/articles/synapse-analytics/sql/on-demand-workspace-overview.md
@@ -104,7 +104,7 @@ SQL on-demand offers mechanisms to secure access to your data.
 
 ### Azure Active Directory integration and multi-factor authentication
 
-SQL on-demand enables you to centrally manage identities of database user and other Microsoft services with [Azure Active Directory integration](../../sql-database/sql-database-Azure AD-authentication.md?toc=/azure/synapse-analytics/toc.json&bc=/azure/synapse-analytics/breadcrumb/toc.json). This capability simplifies permission management and enhances security. Azure Active Directory (Azure AD) supports [multi-factor authentication](../../azure-sql/mfa-authentication-ssms-configure.md?toc=/azure/synapse-analytics/toc.json&bc=/azure/synapse-analytics/breadcrumb/toc.json) (MFA) to increase data and application security while supporting a single sign-on process.
+SQL on-demand enables you to centrally manage identities of database user and other Microsoft services with [Azure Active Directory integration](../../sql-database/sql-database-Azure AD-authentication.md?toc=/azure/synapse-analytics/toc.json&bc=/azure/synapse-analytics/breadcrumb/toc.json). This capability simplifies permission management and enhances security. Azure Active Directory (Azure AD) supports [multi-factor authentication](../../azure-sql/database/authentication-mfa-ssms-configure.md?toc=/azure/synapse-analytics/toc.json&bc=/azure/synapse-analytics/breadcrumb/toc.json) (MFA) to increase data and application security while supporting a single sign-on process.
 
 #### Authentication
 
