fixing things

Author: MashaMSFT

.openpublishing.redirection.json

@@ -52805,12 +52805,12 @@
     },
     {
         "source_path": "articles/sql-database/sql-database-aad-authentication-configure.md",
-        "redirect_url": "/azure/azure-sql/database/aad-authentication-configure",
+        "redirect_url": "/azure/azure-sql/database/authentication-aad-configure",
         "redirect_document_id": true
     },
     {
         "source_path": "articles/sql-database/sql-database-aad-authentication.md",
-        "redirect_url": "/azure/azure-sql/database/aad-authentication-overview",
+        "redirect_url": "/azure/azure-sql/database/authentication-aad-overview",
         "redirect_document_id": true
     },
     {
@@ -53455,12 +53455,12 @@
     },
     {
         "source_path": "articles/sql-database/sql-database-ssms-mfa-authentication-configure.md",
-        "redirect_url": "/azure/azure-sql/mfa-authentication-ssms-configure",
+        "redirect_url": "/azure/azure-sql/database/authentication-mfa-ssms-configure",
         "redirect_document_id": true
     },
     {
         "source_path": "articles/sql-database/sql-database-ssms-mfa-authentication.md",
-        "redirect_url": "/azure/azure-sql/mfa-authentication-ssms-overview",
+        "redirect_url": "/azure/azure-sql/database/authentication-mfa-ssms-overview",
         "redirect_document_id": true
     },
     {

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

@@ -80,15 +80,15 @@ For your C# program to run, a [logical SQL server](logical-servers.md) admin nee
 
 On the **SQL server** page, select **Active Directory admin** > **Set admin**.
 
-For more information about Azure AD admins and users for Azure SQL Database, see the screenshots in [Configure and manage Azure Active Directory authentication with SQL Database](aad-authentication-configure.md#provision-azure-ad-admin-sql-database).
+For more information about Azure AD admins and users for Azure SQL Database, see the screenshots in [Configure and manage Azure Active Directory authentication with SQL Database](authentication-aad-configure.md#provision-azure-ad-admin-sql-database).
 
 ### Add a non-admin user to a specific database (optional)
 
 An Azure AD admin for a [logical SQL server](logical-servers.md) can run the C# example program. An Azure AD user can run the program if they are in the database. An Azure AD SQL admin or an Azure AD user who exists already in the database and has the `ALTER ANY USER` permission on the database can add a user.
 
 You can add a user to the database with the SQL [`Create User`](https://docs.microsoft.com/sql/t-sql/statements/create-user-transact-sql) command. An example is `CREATE USER [<username>] FROM EXTERNAL PROVIDER`.
 
-For more information, see [Use Azure Active Directory Authentication for authentication with SQL Database, Managed Instance, or Azure Synapse Analytics](aad-authentication-overview.md).
+For more information, see [Use Azure Active Directory Authentication for authentication with SQL Database, Managed Instance, or Azure Synapse Analytics](authentication-aad-overview.md).
 
 ## New authentication enum value
 

articles/azure-sql/database/application-authentication-get-client-id-keys.md

@@ -97,4 +97,4 @@ Write-Output "_applicationSecret:" $secret
 ## See also
 
 [Create an Azure SQL Database with C#](design-first-database-csharp-tutorial.md)  
-[Connecting to Azure SQL Database By Using Azure Active Directory Authentication](aad-authentication-overview.md)
+[Connecting to Azure SQL Database By Using Azure Active Directory Authentication](authentication-aad-overview.md)

articles/azure-sql/database/aad-authentication-configure.md renamed to articles/azure-sql/database/authentication-aad-configure.md

@@ -16,7 +16,7 @@ ms.date: 03/27/2020
 # Configure and manage Azure Active Directory authentication with SQL
 [!INCLUDE[appliesto-sqldb-sqlmi-asa](../includes/appliesto-sqldb-sqlmi-asa.md)]
 
-This article shows you how to create and populate Azure AD, and then use Azure AD with [Azure SQL Database](sql-database-paas-overview.md), [Azure SQL Managed Instance](../managed-instance/sql-managed-instance-paas-overview.md), and [Azure Synapse Analytics (formerly Azure SQL Data Warehouse)](../../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md). For an overview, see [Azure Active Directory Authentication](aad-authentication-overview.md).
+This article shows you how to create and populate Azure AD, and then use Azure AD with [Azure SQL Database](sql-database-paas-overview.md), [Azure SQL Managed Instance](../managed-instance/sql-managed-instance-paas-overview.md), and [Azure Synapse Analytics (formerly Azure SQL Data Warehouse)](../../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md). For an overview, see [Azure Active Directory Authentication](authentication-aad-overview.md).
 
 ## Azure AD authentication methods
 
@@ -82,29 +82,29 @@ To grant your SQL Managed Instance Azure AD read permission using the Azure port
 
 3. Navigate to the SQL Managed Instance you want to use for Azure AD integration.
 
-   ![aad](./media/aad-authentication-configure/aad.png)
+   ![aad](./media/authentication-aad-configure/aad.png)
 
 4. Select the banner on top of the Active Directory admin page and grant permission to the current user.
 
-    ![grant permissions-portal](./media/aad-authentication-configure/grant-permissions.png)
+    ![grant permissions-portal](./media/authentication-aad-configure/grant-permissions.png)
 
 5. After the operation succeeds, the following notification will show up in the top-right corner:
 
-    ![success](./media/aad-authentication-configure/success.png)
+    ![success](./media/authentication-aad-configure/success.png)
 
 6. Now you can choose your Azure AD admin for your SQL Managed Instance. For that, on the Active Directory admin page, select **Set admin** command.
 
-    ![set-admin](./media/aad-authentication-configure/set-admin.png)
+    ![set-admin](./media/authentication-aad-configure/set-admin.png)
 
 7. In the AAD admin page, search for a user, select the user or group to be an administrator, and then select **Select**.
 
-   The Active Directory admin page shows all members and groups of your Active Directory. Users or groups that are grayed out can't be selected because they aren't supported as Azure AD administrators. See the list of supported admins in [Azure AD Features and Limitations](aad-authentication-overview.md#azure-ad-features-and-limitations). Role-based access control (RBAC) applies only to the Azure portal and isn't propagated to SQL Database, SQL Managed Instance, or Azure Synapse.
+   The Active Directory admin page shows all members and groups of your Active Directory. Users or groups that are grayed out can't be selected because they aren't supported as Azure AD administrators. See the list of supported admins in [Azure AD Features and Limitations](authentication-aad-overview.md#azure-ad-features-and-limitations). Role-based access control (RBAC) applies only to the Azure portal and isn't propagated to SQL Database, SQL Managed Instance, or Azure Synapse.
 
-    ![Add Azure Active Directory admin](./media/aad-authentication-configure/add-azure-active-directory-admin.png)
+    ![Add Azure Active Directory admin](./media/authentication-aad-configure/add-azure-active-directory-admin.png)
 
 8. At the top of the Active Directory admin page, select **Save**.
 
-    ![save](./media/aad-authentication-configure/save.png)
+    ![save](./media/authentication-aad-configure/save.png)
 
     The process of changing the administrator may take several minutes. Then the new administrator appears in the Active Directory admin box.
 
@@ -237,7 +237,7 @@ The following two procedures show you how to provision an Azure Active Directory
 
 2. Search for and select **SQL server**.
 
-    ![Search for and select SQL servers](./media/aad-authentication-configure/search-for-and-select-sql-servers.png)
+    ![Search for and select SQL servers](./media/authentication-aad-configure/search-for-and-select-sql-servers.png)
 
     >[!NOTE]
     > On this page, before you select **SQL servers**, you can select the **star** next to the name to *favorite* the category and add **SQL servers** to the left navigation bar.
@@ -246,15 +246,15 @@ The following two procedures show you how to provision an Azure Active Directory
 
 4. In the **Active Directory admin** page, select **Set admin**.
 
-    ![SQL servers set Active Directory admin](./media/aad-authentication-configure/sql-servers-set-active-directory-admin.png)  
+    ![SQL servers set Active Directory admin](./media/authentication-aad-configure/sql-servers-set-active-directory-admin.png)  
 
-5. In the **Add admin** page, search for a user, select the user or group to be an administrator, and then select **Select**. (The Active Directory admin page shows all members and groups of your Active Directory. Users or groups that are grayed out cannot be selected because they are not supported as Azure AD administrators. (See the list of supported admins in the **Azure AD Features and Limitations** section of [Use Azure Active Directory Authentication for authentication with SQL Database or Azure Synapse](aad-authentication-overview.md).) Role-based access control (RBAC) applies only to the portal and is not propagated to SQL Server.
+5. In the **Add admin** page, search for a user, select the user or group to be an administrator, and then select **Select**. (The Active Directory admin page shows all members and groups of your Active Directory. Users or groups that are grayed out cannot be selected because they are not supported as Azure AD administrators. (See the list of supported admins in the **Azure AD Features and Limitations** section of [Use Azure Active Directory Authentication for authentication with SQL Database or Azure Synapse](authentication-aad-overview.md).) Role-based access control (RBAC) applies only to the portal and is not propagated to SQL Server.
 
-    ![Select Azure Active Directory admin](./media/aad-authentication-configure/select-azure-active-directory-admin.png)  
+    ![Select Azure Active Directory admin](./media/authentication-aad-configure/select-azure-active-directory-admin.png)  
 
 6. At the top of the **Active Directory admin** page, select **SAVE**.
 
-    ![save admin](./media/aad-authentication-configure/save-admin.png)
+    ![save admin](./media/authentication-aad-configure/save-admin.png)
 
 The process of changing the administrator may take several minutes. Then the new administrator appears in the **Active Directory admin** box.
 
@@ -537,7 +537,7 @@ Guidance on troubleshooting issues with Azure AD Authentication can be found in
 - For more information about firewall rules in SQL Database, see [SQL Database firewall rules](firewall-configure.md).
 
 <!--Image references-->
-[11]: ./media/aad-authentication-configure/active-directory-integrated.png
-[12]: ./media/aad-authentication-configure/12connect-using-pw-auth2.png
-[13]: ./media/aad-authentication-configure/13connect-to-db2.png
+[11]: ./media/authentication-aad-configure/active-directory-integrated.png
+[12]: ./media/authentication-aad-configure/12connect-using-pw-auth2.png
+[13]: ./media/authentication-aad-configure/13connect-to-db2.png
 

articles/azure-sql/database/aad-authentication-overview.md renamed to articles/azure-sql/database/authentication-aad-overview.md

@@ -52,7 +52,7 @@ The configuration steps include the following procedures to configure and use Az
 6. Connect to your database by using Azure AD identities.
 
 > [!NOTE]
-> To learn how to create and populate Azure AD, and then configure Azure AD with Azure SQL Database, SQL Managed Instance, and Azure Synapse, see [Configure Azure AD with Azure SQL Database](aad-authentication-configure.md).
+> To learn how to create and populate Azure AD, and then configure Azure AD with Azure SQL Database, SQL Managed Instance, and Azure Synapse, see [Configure Azure AD with Azure SQL Database](authentication-aad-configure.md).
 
 ## Trust architecture
 
@@ -84,7 +84,7 @@ When using Azure AD authentication, there are two Administrator accounts; the or
 
 To create new users, you must have the `ALTER ANY USER` permission in the database. The `ALTER ANY USER` permission can be granted to any database user. The `ALTER ANY USER` permission is also held by the server administrator accounts, and database users with the `CONTROL ON DATABASE` or `ALTER ON DATABASE` permission for that database, and by members of the `db_owner` database role.
 
-To create a contained database user in Azure SQL Database, SQL Managed Instance, or Azure Synapse, you must connect to the database or instance using an Azure AD identity. To create the first contained database user, you must connect to the database by using an Azure AD administrator (who is the owner of the database). This is demonstrated in [Configure and manage Azure Active Directory authentication with SQL Database or Azure Synapse](aad-authentication-configure.md). Azure AD authentication is only possible if the Azure AD admin was created for Azure SQL Database, SQL Managed Instance, or Azure Synapse. If the Azure Active Directory admin was removed from the server, existing Azure Active Directory users created previously inside SQL Server can no longer connect to the database using their Azure Active Directory credentials.
+To create a contained database user in Azure SQL Database, SQL Managed Instance, or Azure Synapse, you must connect to the database or instance using an Azure AD identity. To create the first contained database user, you must connect to the database by using an Azure AD administrator (who is the owner of the database). This is demonstrated in [Configure and manage Azure Active Directory authentication with SQL Database or Azure Synapse](authentication-aad-configure.md). Azure AD authentication is only possible if the Azure AD admin was created for Azure SQL Database, SQL Managed Instance, or Azure Synapse. If the Azure Active Directory admin was removed from the server, existing Azure Active Directory users created previously inside SQL Server can no longer connect to the database using their Azure Active Directory credentials.
 
 ## Azure AD features and limitations
 
@@ -150,11 +150,11 @@ The following authentication methods are supported for Azure AD server principal
 - [Microsoft JDBC Driver 6.0 for SQL Server](https://www.microsoft.com/download/details.aspx?id=11774) supports Azure AD authentication. Also, see [Setting the Connection Properties](/sql/connect/jdbc/setting-the-connection-properties).
 - PolyBase cannot authenticate by using Azure AD authentication.
 - Azure AD authentication is supported for Azure SQL Database and Azure Synapse by using the Azure portal **Import Database** and **Export Database** blades. Import and export using Azure AD authentication is also supported from a PowerShell command.
-- Azure AD authentication is supported for SQL Database, SQL Managed Instance, and Azure Synapse with using CLI. For more information, see [Configure and manage Azure Active Directory authentication with SQL Database or Azure Synapse](aad-authentication-configure.md) and [SQL Server - az sql server](https://docs.microsoft.com/cli/azure/sql/server).
+- Azure AD authentication is supported for SQL Database, SQL Managed Instance, and Azure Synapse with using CLI. For more information, see [Configure and manage Azure Active Directory authentication with SQL Database or Azure Synapse](authentication-aad-configure.md) and [SQL Server - az sql server](https://docs.microsoft.com/cli/azure/sql/server).
 
 ## Next steps
 
-- To learn how to create and populate Azure AD, and then configure Azure AD with Azure SQL Database, SQL Managed Instance or Azure Synapse, see [Configure and manage Azure Active Directory authentication with SQL Database, SQL Managed Instance, or Azure Synapse](aad-authentication-configure.md).
+- To learn how to create and populate Azure AD, and then configure Azure AD with Azure SQL Database, SQL Managed Instance or Azure Synapse, see [Configure and manage Azure Active Directory authentication with SQL Database, SQL Managed Instance, or Azure Synapse](authentication-aad-configure.md).
 - For a tutorial of using Azure AD server principals (logins) with SQL Managed Instances, see [Azure AD server principals (logins) with SQL Managed Instances](../managed-instance/aad-security-configure-tutorial.md)
 - For an overview of logins, users, database roles, and permissions in SQL Database, see [Logins, users, database roles, and permissions](logins-create-manage.md).
 - For more information about database principals, see [Principals](https://msdn.microsoft.com/library/ms181127.aspx).
@@ -163,6 +163,6 @@ The following authentication methods are supported for Azure AD server principal
 - For more information about firewall rules in SQL Database, see [SQL Database firewall rules](firewall-configure.md).
 
 <!--Image references-->
-[1]: ./media/aad-authentication-overview/1aad-auth-diagram.png
-[2]: ./media/aad-authentication-overview/2subscription-relationship.png
-[3]: ./media/aad-authentication-overview/3admin-structure.png
+[1]: ./media/authentication-aad-overview/1aad-auth-diagram.png
+[2]: ./media/authentication-aad-overview/2subscription-relationship.png
+[3]: ./media/authentication-aad-overview/3admin-structure.png

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

@@ -14,7 +14,7 @@ ms.reviewer: vanto
 ms.date: 08/27/2019
 ---
 # Configure multi-factor authentication for SQL Server Management Studio and Azure AD
-[!INCLUDE[appliesto-sqldb-sqlmi-asa](includes/appliesto-sqldb-sqlmi-asa.md)]
+[!INCLUDE[appliesto-sqldb-sqlmi-asa](..includes/appliesto-sqldb-sqlmi-asa.md)]
 
 This article shows you how to use Azure Active Directory multi-factor authentication (MFA) with SQL Server Management Studio. Azure AD MFA can be used when connecting SSMS or SqlPackage.exe to [Azure SQL Database](database/sql-database-paas-overview.md), [Azure SQL Managed Instance](managed-instance/sql-managed-instance-paas-overview.md) and [Azure Synapse Analytics (formerly SQL DW)](../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md). For an overview of multi-factor authentication, see [Universal Authentication with SQL Database, SQL Managed Instance, and Azure Synapse (SSMS support for MFA)](../database/authentication-mfa-ssms-overview.md).
 
@@ -25,7 +25,7 @@ This article shows you how to use Azure Active Directory multi-factor authentica
 
 1. **Configure an Azure Active Directory** - For more information, see [Administering your Azure AD directory](https://msdn.microsoft.com/library/azure/hh967611.aspx), [Integrating your on-premises identities with Azure Active Directory](../active-directory/hybrid/whatis-hybrid-identity.md), [Add your own domain name to Azure AD](https://azure.microsoft.com/blog/20../../windows-azure-now-supports-federation-with-windows-server-active-directory/), [Microsoft Azure now supports federation with Windows Server Active Directory](https://azure.microsoft.com/blog/20../../windows-azure-now-supports-federation-with-windows-server-active-directory/), and [Manage Azure AD using Windows PowerShell](https://msdn.microsoft.com/library/azure/jj151815.aspx).
 2. **Configure MFA** - For step-by-step instructions, see [What is Azure Multi-Factor Authentication?](../active-directory/authentication/multi-factor-authentication.md), [Conditional Access (MFA) with Azure SQL Database and Data Warehouse](database/conditional-access-configure.md). (Full Conditional Access requires a Premium Azure Active Directory (Azure AD). Limited MFA is available with a standard Azure AD.)
-3. **Configure Azure AD Authentication** - For step-by-step instructions, see [Connecting to SQL Database, SQL Managed Instance, or Azure Synapse using Azure Active Directory Authentication](database/aad-authentication-overview.md).
+3. **Configure Azure AD Authentication** - For step-by-step instructions, see [Connecting to SQL Database, SQL Managed Instance, or Azure Synapse using Azure Active Directory Authentication](database/authentication-aad-overview.md).
 4. **Download SSMS** - On the client computer, download the latest SSMS, from [Download SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/mt238290.aspx).
 
 ## Connecting by using universal authentication with SSMS