Merge pull request #194120 from MashaMSFT/202204_issues

April git issues

Author: LJSpiller

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

@@ -82,37 +82,39 @@ Your SQL Managed Instance needs permissions to read Azure AD to successfully acc
 
 To grant your SQL Managed Instance Azure AD read permission using the Azure portal, log in as Global Administrator in Azure AD and follow these steps:
 
-1. In the [Azure portal](https://portal.azure.com), in the upper-right corner, select your connection from a drop-down list of possible Active Directories.
+1. In the [Azure portal](https://portal.azure.com), in the upper-right corner select your account, and then choose **Switch directories** to confirm which Active Directory is currently your active directory. Switch directories, if necessary. 
+
+   :::image type="content" source="media/authentication-aad-configure/switch-directory.png" alt-text="Screenshot of the Azure portal showing where to switch your directory":::
 
 2. Choose the correct Active Directory as the default Azure AD.
 
    This step links the subscription associated with Active Directory to the SQL Managed Instance, making sure that the same subscription is used for both the Azure AD instance and the SQL Managed Instance.
 
 3. Navigate to the SQL Managed Instance you want to use for Azure AD integration.
 
-   ![Screenshot of the Azure portal showing the Active Directory admin page open for the selected SQL managed instance.](./media/authentication-aad-configure/aad.png)
+   :::image type="content" source="./media/authentication-aad-configure/aad.png" alt-text="Screenshot of the Azure portal showing the Active Directory admin page open for the selected SQL managed instance.":::
 
 4. Select the banner on top of the Active Directory admin page and grant permission to the current user.
 
-    ![Screenshot of the dialog for granting permissions to a SQL managed instance for accessing Active Directory. The Grant permissions button is selected.](./media/authentication-aad-configure/grant-permissions.png)
+    :::image type="content" source="./media/authentication-aad-configure/grant-permissions.png" alt-text="Screenshot of the dialog for granting permissions to a SQL managed instance for accessing Active Directory. The Grant permissions button is selected.":::
 
 5. After the operation succeeds, the following notification will show up in the top-right corner:
 
-    ![Screenshot of a notification confirming that active directory read permissions have been successfully updated for the managed instance.](./media/authentication-aad-configure/success.png)
+    :::image type="content" source="./media/authentication-aad-configure/success.png" alt-text="Screenshot of a notification confirming that active directory read permissions have been successfully updated for the managed instance.":::
 
 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.
 
-    ![Screenshot showing the Set admin command highlighted on the Active Directory admin page for the selected SQL managed instance.](./media/authentication-aad-configure/set-admin.png)
+    :::image type="content" source="./media/authentication-aad-configure/set-admin.png" alt-text="Screenshot showing the Set admin command highlighted on the Active Directory admin page for the selected SQL managed instance.":::
 
 7. On the Azure AD 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](authentication-aad-overview.md#azure-ad-features-and-limitations). Azure role-based access control (Azure 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/authentication-aad-configure/add-azure-active-directory-admin.png)
+    :::image type="content" source="./media/authentication-aad-configure/add-azure-active-directory-admin.png" alt-text="Add Azure Active Directory admin":::
 
 8. At the top of the Active Directory admin page, select **Save**.
 
-    ![Screenshot of the Active Directory admin page with the Save button in the top row next to the Set admin and Remove admin buttons.](./media/authentication-aad-configure/save.png)
+    :::image type="content" source="./media/authentication-aad-configure/save.png" alt-text="Screenshot of the Active Directory admin page with the Save button in the top row next to the Set admin and Remove admin buttons.":::
 
     The process of changing the administrator may take several minutes. Then the new administrator appears in the Active Directory admin box.
 
@@ -243,7 +245,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/authentication-aad-configure/search-for-and-select-sql-servers.png)
+    :::image type="content" source="./media/authentication-aad-configure/search-for-and-select-sql-servers.png" alt-text="Search for and select SQL servers":::
 
     >[!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.
@@ -252,15 +254,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/authentication-aad-configure/sql-servers-set-active-directory-admin.png)  
+    :::image type="content" source="./media/authentication-aad-configure/sql-servers-set-active-directory-admin.png" alt-text="SQL servers set Active Directory admin":::  
 
 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).) Azure role-based access control (Azure RBAC) applies only to the portal and is not propagated to SQL Server.
 
-    ![Select Azure Active Directory admin](./media/authentication-aad-configure/select-azure-active-directory-admin.png)  
+    :::image type="content" source="./media/authentication-aad-configure/select-azure-active-directory-admin.png" alt-text="Select Azure Active Directory admin":::  
 
 6. At the top of the **Active Directory admin** page, select **Save**.
 
-    ![save admin](./media/authentication-aad-configure/save-admin.png)
+    :::image type="content" source="./media/authentication-aad-configure/save-admin.png" alt-text="save admin":::
 
 The process of changing the administrator may take several minutes. Then the new administrator appears in the **Active Directory admin** box.
 

articles/azure-sql/database/media/authentication-aad-configure/aad.png

@@ -20,25 +20,25 @@ To create a resource group, server, and single database in the Azure portal:
 1. From the Search bar, search for and select **Azure SQL**.
 1. On the **Azure SQL** page, select **Add**.
 
-   ![Add to Azure SQL](./media/sql-database-create-single-database/sqldbportal.png)
+   :::image type="content" source="./media/sql-database-create-single-database/sqldbportal.png" alt-text="Add to Azure SQL":::
 
 1. On the **Select SQL deployment option** page, select the **SQL databases** tile, with **Single database** under **Resource type**. You can view more information about the different databases by selecting **Show details**.
 1. Select **Create**.
 
-   ![Create single database](./media/sql-database-create-single-database/create-single-database.png)
+   :::image type="content" source="./media/sql-database-create-single-database/create-single-database.png" alt-text="Create single database":::
 
 1. On the **Basics** tab of the **Create SQL database** form, under **Project details**, select the correct Azure **Subscription** if it isn't already selected.
 1. Under **Resource group**, select **Create new**, enter *myResourceGroup*, and select **OK**.
 1. Under **Database details**, for **Database name** enter *mySampleDatabase*.
 1. For **Server**, select **Create new**, and fill out the **New server** form as follows:
    - **Server name**: Enter *mysqlserver*, and some characters for uniqueness.
-   - **Server admin login**: Enter *azureuser*.
+   - **Server admin login**: Enter *AzureAdmin*.
    - **Password**: Enter a password that meets requirements, and enter it again in the **Confirm password** field.
-   - **Location**: Drop down and choose a location, such as **(US) East US**.
+   - **Location**: Drop down and choose a location, such as **(US) West US**.
 
    Select **OK**.
 
-   ![New server](./media/sql-database-create-single-database/new-server.png)
+   :::image type="content" source="./media/sql-database-create-single-database/new-server.png" alt-text="New server":::
 
    Record the server admin login and password so you can log in to the server and its databases. If you forget your login or password, you can get the login name or reset the password on the **SQL server** page after database creation. To open the **SQL server** page, select the server name on the database **Overview** page.
 
@@ -53,13 +53,13 @@ To create a resource group, server, and single database in the Azure portal:
 
 1. Select **Next: Networking** at the bottom of the page.
 
-   ![New SQL database - Basic tab](./media/sql-database-create-single-database/new-sql-database-basics.png)
+   :::image type="content" source="./media/sql-database-create-single-database/new-sql-database-basics.png" alt-text="New SQL database - Basic tab":::
 
 1. On the **Networking** tab, under **Connectivity method**, select **Public endpoint**.
 1. Under **Firewall rules**, set **Add current client IP address** to **Yes**.
 1. Select **Next: Additional settings** at the bottom of the page.
 
-   ![Networking tab](./media/sql-database-create-single-database/networking.png)
+   :::image type="content" source="./media/sql-database-create-single-database/networking.png" alt-text="Networking tab":::
 
    For more information about firewall settings, see [Allow Azure services and resources to access this server](../database/network-access-controls-overview.md) and [Add a private endpoint](../database/private-endpoint-overview.md).
 
@@ -68,7 +68,7 @@ To create a resource group, server, and single database in the Azure portal:
 1. Optionally, set the [maintenance window](../database/maintenance-window.md) so planned maintenance is performed at the best time for your database.
 1. Select **Review + create** at the bottom of the page.
 
-   ![Additional settings tab](./media/sql-database-create-single-database/additional-settings.png)
+   :::image type="content" source="./media/sql-database-create-single-database/additional-settings.png" alt-text="Additional settings tab":::
 
 1. After reviewing settings, select **Create**.
 
@@ -84,7 +84,7 @@ Follow the onscreen prompts to sign in to Azure and run the code.
 
 You can also use Azure Cloud Shell from the Azure portal, by selecting the Cloud Shell icon on the top bar.
 
-   ![Azure Cloud Shell](./media/sql-database-create-single-database/cloudshell.png)
+   :::image type="content" source="./media/sql-database-create-single-database/cloudshell.png" alt-text="Azure Cloud Shell":::
 
 The first time you use Cloud Shell from the portal, select **PowerShell** on the **Welcome** dialog. Subsequent sessions will use PowerShell, or you can select it from the Cloud Shell control bar.