fix non/blocking issues

cephalin · cephalin · commit ac26f2e50ad4 · 2021-10-26T09:48:36.000+02:00
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -4360,7 +4360,7 @@
     },
     {
       "source_path_from_root": "/articles/app-service/app-service-web-tutorial-connect-msi.md",
-      "redirect_url": "/azure/app-service/tutorial-connect-msi-sqldatabase",
+      "redirect_url": "/azure/app-service/tutorial-connect-msi-sql-database",
       "redirect_document_id": false
     },
     {
diff --git a/articles/app-service/app-service-key-vault-references.md b/articles/app-service/app-service-key-vault-references.md
@@ -85,7 +85,7 @@ Alternatively:
 
 ## Rotation
 
-If a version is not specified in the reference, then the app will use the latest version that exists in the key vault. When newer versions become available, such as with a rotation event, the app will automatically update and begin using the latest version within 24 hours. The delay is because App Service caches the values of the key vault references and re-fetches it every 24 hours. Any configuration changes to the app causes an immediate re-fetch of all referenced secrets.
+If a version is not specified in the reference, then the app will use the latest version that exists in the key vault. When newer versions become available, such as with a rotation event, the app will automatically update and begin using the latest version within 24 hours. The delay is because App Service caches the values of the key vault references and refetches it every 24 hours. Any configuration changes to the app causes an immediate refetch of all referenced secrets.
 
 ## Source Application Settings from Key Vault
 
diff --git a/articles/app-service/app-service-web-tutorial-dotnet-sqldatabase.md b/articles/app-service/app-service-web-tutorial-dotnet-sqldatabase.md
@@ -428,7 +428,7 @@ In this tutorial, you learned how to:
 Advance to the next tutorial to learn how to easily improve the security of your connection Azure SQL Database.
 
 > [!div class="nextstepaction"]
-> [Access SQL Database securely using managed identities for Azure resources](tutorial-connect-msi-sqldatabase.md)
+> [Access SQL Database securely using managed identities for Azure resources](tutorial-connect-msi-sql-database.md)
 
 More resources:
 
diff --git a/articles/app-service/index.yml b/articles/app-service/index.yml
@@ -110,11 +110,11 @@ landingContent:
       - linkListType: tutorial
         links:
           - text: Secretless SQL Database access with managed identities
-            url: tutorial-connect-msi-sqldatabase.md
+            url: tutorial-connect-msi-sql-database.md
           - text: Secretless access of storage and Microsoft Graph with managed identities
             url: scenario-secure-app-overview.md
           - text: Connect securely to services with Key Vault secrets
-            url: tutorial-connect-msi-keyvault.md
+            url: tutorial-connect-msi-key-vault.md
           - text: Isolate network traffic for back-end connectivity
             url: tutorial-networking-isolate-vnet.md
           - text: Authenticate users
diff --git a/articles/app-service/media/tutorial-connect-msi-key-vault/architecture.png b/articles/app-service/media/tutorial-connect-msi-key-vault/architecture.png
diff --git a/articles/app-service/media/tutorial-connect-msi-key-vault/deployed-app.png b/articles/app-service/media/tutorial-connect-msi-key-vault/deployed-app.png
diff --git a/articles/app-service/media/tutorial-connect-msi-keyvault/architecture.png b/articles/app-service/media/tutorial-connect-msi-keyvault/architecture.png
diff --git a/articles/app-service/media/tutorial-connect-msi-sql-database/architecture.png b/articles/app-service/media/tutorial-connect-msi-sql-database/architecture.png
diff --git a/articles/app-service/overview-managed-identity.md b/articles/app-service/overview-managed-identity.md
@@ -522,9 +522,9 @@ Update-AzFunctionApp -Name $functionAppName -ResourceGroupName $resourceGroupNam
 
 ## Next steps
 
-- [Access SQL Database securely using a managed identity](tutorial-connect-msi-sqldatabase.md)
+- [Access SQL Database securely using a managed identity](tutorial-connect-msi-sql-database.md)
 - [Access Azure Storage securely using a managed identity](scenario-secure-app-access-storage.md)
 - [Call Microsoft Graph securely using a managed identity](scenario-secure-app-access-microsoft-graph-as-app.md)
-- [Connect securely to services with Key Vault secrets](tutorial-connect-msi-keyvault.md)
+- [Connect securely to services with Key Vault secrets](tutorial-connect-msi-key-vault.md)
 
 [Microsoft.Azure.Services.AppAuthentication reference]: /dotnet/api/overview/azure/service-to-service-authentication
diff --git a/articles/app-service/overview-security.md b/articles/app-service/overview-security.md
@@ -50,7 +50,7 @@ App Service authentication and authorization support multiple authentication pro
 
 When authenticating against a back-end service, App Service provides two different mechanisms depending on your need:
 
-- **Service identity** - Sign in to the remote resource using the identity of the app itself. App Service lets you easily create a [managed identity](overview-managed-identity.md), which you can use to authenticate with other services, such as [Azure SQL Database](/azure/sql-database/) or [Azure Key Vault](../key-vault/index.yml). For an end-to-end tutorial of this approach, see [Secure Azure SQL Database connection from App Service using a managed identity](tutorial-connect-msi-sqldatabase.md).
+- **Service identity** - Sign in to the remote resource using the identity of the app itself. App Service lets you easily create a [managed identity](overview-managed-identity.md), which you can use to authenticate with other services, such as [Azure SQL Database](/azure/sql-database/) or [Azure Key Vault](../key-vault/index.yml). For an end-to-end tutorial of this approach, see [Secure Azure SQL Database connection from App Service using a managed identity](tutorial-connect-msi-sql-database.md).
 - **On-behalf-of (OBO)** - Make delegated access to remote resources on behalf of the user. With Azure Active Directory as the authentication provider, your App Service app can perform delegated sign-in to a remote service, such as [Microsoft Graph API](../active-directory/develop/microsoft-graph-intro.md) or a remote API app in App Service. For an end-to-end tutorial of this approach, see [Authenticate and authorize users end-to-end in Azure App Service](tutorial-auth-aad.md).
 
 ## Connectivity to remote resources
diff --git a/articles/app-service/toc.yml b/articles/app-service/toc.yml
@@ -65,9 +65,9 @@
     - name: Secretless back end connectivity
       items:
         - name: Access SQL DB with managed identity
-          href: tutorial-connect-msi-sqldatabase.md
+          href: tutorial-connect-msi-sql-database.md
         - name: Access services without managed identity support
-          href: tutorial-connect-msi-keyvault.md
+          href: tutorial-connect-msi-key-vault.md
     - name: Authenticate users
       href: tutorial-auth-aad.md
     - name: Secure app accesses storage, and Microsoft Graph
diff --git a/articles/app-service/tutorial-connect-msi-key-vault.md b/articles/app-service/tutorial-connect-msi-key-vault.md
@@ -15,7 +15,7 @@ ms.reviewer: madsd
 > [!TIP]
 > Azure Cognitive Services do [support authentication through managed identities](../cognitive-services/authentication.md#authorize-access-to-managed-identities), but this tutorial uses the [subscription key authentication](../cognitive-services/authentication.md#authenticate-with-a-single-service-subscription-key) to demonstrate how you could connect to an Azure service that doesn't support managed identities from App Services.
 
-![scenario architecture](./media/tutorial-connect-msi-keyvault/architecture.png)
+![Architecture diagram for tutorial scenario.](./media/tutorial-connect-msi-key-vault/architecture.png)
 
 With this architecture: 
 
@@ -106,7 +106,7 @@ Prepare your environment for the Azure CLI.
 
 1. In the browser, navigate to your deploy app at `<app-name>.azurewebsites.net` and try out the language detector with strings in various languages.
 
-    ![Deployed language detector app in App Service](./media/tutorial-connect-msi-keyvault/deployed-app.png)
+    ![Screenshot that shows deployed language detector app in App Service.](./media/tutorial-connect-msi-key-vault/deployed-app.png)
 
     If you look at the application code, you may notice the debug output for the detection results in the same font color as the background. You can see it by trying to highlight the white space directly below the result.
 
@@ -154,7 +154,7 @@ At the moment, connection secrets are stored as app settings in your App Service
 
 1. In the browser, navigate to `<app-name>.azurewebsites.net` again. If you get detection results back, then you're connecting to the Cognitive Services endpoint with key vault references.
 
-Congratulations, your app is now connecting to Cognitive Services using secrets kept in your key vault, and you've done this without any changes to your application code.
+Congratulations, your app is now connecting to Cognitive Services using secrets kept in your key vault, without any changes to your application code.
 
 ## Clean up resources
 
diff --git a/articles/app-service/tutorial-connect-msi-sql-database.md b/articles/app-service/tutorial-connect-msi-sql-database.md
@@ -16,7 +16,7 @@ ms.custom: "devx-track-csharp, mvc, cli-validate, devx-track-azurecli"
 
 When you're finished, your sample app will connect to SQL Database securely without the need of username and passwords.
 
-![scenario architecture](./media/tutorial-connect-msi-sqldatabase/architecture.png)
+![Architecture diagram for tutorial scenario.](./media/tutorial-connect-msi-sql-database/architecture.png)
 
 > [!NOTE]
 > The steps covered in this tutorial support the following versions:
@@ -329,7 +329,7 @@ What you learned:
 > [Map an existing custom DNS name to Azure App Service](app-service-web-tutorial-custom-domain.md)
 
 > [!div class="nextstepaction"]
-> [Tutorial: Connect to Azure services that don't support managed identities (using Key Vault)](tutorial-connect-msi-keyvault.md)
+> [Tutorial: Connect to Azure services that don't support managed identities (using Key Vault)](tutorial-connect-msi-key-vault.md)
 
 > [!div class="nextstepaction"]
 > [Tutorial: Isolate back-end communication with Virtual Network integration](tutorial-networking-isolate-vnet.md)
diff --git a/articles/app-service/tutorial-networking-isolate-vnet.md b/articles/app-service/tutorial-networking-isolate-vnet.md
@@ -1,6 +1,6 @@
 ---
 title: 'Tutorial: Isolate back-end communication with Virtual Network integration'
-description: Connections from App Service to back end services are routed through shared network infrastructure with other apps and subscriptions. Learn how to isolate traffic by using Virtula Network integration.
+description: Connections from App Service to back-end services are routed through shared network infrastructure with other apps and subscriptions. Learn how to isolate traffic by using Virtual Network integration.
 ms.devlang: dotnet
 ms.topic: tutorial
 ms.date: 10/26/2021
@@ -10,15 +10,15 @@ ms.reviewer: madsd
 
 # Tutorial: Isolate back-end communication in Azure App Service with Virtual Network integration
 
-In this article you will configure an App Service app with secure, network-isolated communication to backend services. The example scenario used is in [Tutorial: Secure Cognitive Service connection from App Service using Key Vault](tutorial-connect-msi-keyvault.md). When you're finished, you have an App Service app that accesses both Key Vault and Cognitive Services through an [Azure virtual network](../virtual-network/virtual-networks-overview.md) (VNet), and no other traffic is allowed to access those back-end resources. All traffic will be isolated within your VNet using [VNet integration](web-sites-integrate-with-vnet.md) and [private endpoints](../private-link/private-endpoint-overview.md).
+In this article you will configure an App Service app with secure, network-isolated communication to backend services. The example scenario used is in [Tutorial: Secure Cognitive Service connection from App Service using Key Vault](tutorial-connect-msi-key-vault.md). When you're finished, you have an App Service app that accesses both Key Vault and Cognitive Services through an [Azure virtual network](../virtual-network/virtual-networks-overview.md) (VNet), and no other traffic is allowed to access those back-end resources. All traffic will be isolated within your VNet using [VNet integration](web-sites-integrate-with-vnet.md) and [private endpoints](../private-link/private-endpoint-overview.md).
 
 As a multi-tenanted service, outbound network traffic from your App Service app to other Azure services shares the same environment with other apps or even other subscriptions. While the traffic itself can be encrypted, certain scenarios may require an extra level of security by isolating back-end communication from other network traffic. These scenarios are typically accessible to large enterprises with a high level of expertise, but App Service puts it within reach with VNet integration.  
 
 ![scenario architecture](./media/tutorial-networking-isolate-vnet/architecture.png)
 
 With this architecture: 
 
-- Public traffic to the back-end services are blocked.
+- Public traffic to the back-end services is blocked.
 - Outbound traffic from App Service is routed to the VNet and can reach the back-end services.
 - App Service is able to perform DNS resolution to the back-end services through the private DNS zones.
 
@@ -32,7 +32,7 @@ What you will learn:
 
 ## Prerequisites
 
-The tutorial assumes that you have followed the [Tutorial: Secure Cognitive Service connection from App Service using Key Vault](tutorial-connect-msi-keyvault.md) and created the language detector app. 
+The tutorial assumes that you have followed the [Tutorial: Secure Cognitive Service connection from App Service using Key Vault](tutorial-connect-msi-key-vault.md) and created the language detector app. 
 
 The tutorial continues to use the following environment variables from the previous tutorial. Make sure you set them properly.
 
@@ -75,7 +75,7 @@ The tutorial continues to use the following environment variables from the previ
 
 Because your Key Vault and Cognitive Services resources will sit behind [private endpoints](../private-link/private-endpoint-overview.md), you need to define [private DNS zones](../dns/private-dns-privatednszone.md) for them. These zones are used to host the DNS records for private endpoints and allow the clients to find the back-end services by name. 
 
-1. Create two private DNS zones, one one for your Cognitive Services resource and one for your key vault.
+1. Create two private DNS zones, one for your Cognitive Services resource and one for your key vault.
 
     ```azurecli-interactive
     az network private-dns zone create --resource-group $groupName --name privatelink.cognitiveservices.azure.com
@@ -132,7 +132,7 @@ Because your Key Vault and Cognitive Services resources will sit behind [private
     az keyvault update --name $vaultName --default-action Deny
     ```
 
-1. Force an immediate re-fetch of the [key vault references](app-service-key-vault-references.md) in your app by resetting the app settings (for more information, see [Rotation](app-service-key-vault-references.md#rotation)).
+1. Force an immediate refetch of the [key vault references](app-service-key-vault-references.md) in your app by resetting the app settings (for more information, see [Rotation](app-service-key-vault-references.md#rotation)).
 
     ```azurecli-interactive
     az webapp config appsettings set --resource-group $groupName --name $appName --settings CS_ACCOUNT_NAME="@Microsoft.KeyVault(SecretUri=$csResourceKVUri)" CS_ACCOUNT_KEY="@Microsoft.KeyVault(SecretUri=$csKeyKVUri)"
@@ -153,7 +153,7 @@ The two private endpoints are only accessible to clients inside the VNet you cre
     az appservice plan update --name $appName --resource-group $groupName --sku S1
     ```
 
-1. Unrelated to our scenario but also very important, enforce HTTPS for inbound requests.
+1. Unrelated to our scenario but also important, enforce HTTPS for inbound requests.
 
     ```azurecli-interactive
     az webapp update --resource-group $groupName --name $appName --https-only
@@ -165,12 +165,12 @@ The two private endpoints are only accessible to clients inside the VNet you cre
     az webapp vnet-integration add --resource-group $groupName --name $appName --vnet $vnetName --subnet vnet-integration-subnet
     ```
     
-    VNet integration allows outbound traffic to flow directly into the VNet. By default, only local IP traffic defined in [RFC-1918](https://tools.ietf.org/html/rfc1918#section-3) is routed to the VNet, which is what you need for the private endpoints. To route all your traffic to the VNet, see [Manage virtual network integration routing](configure-vnet-integration-routing.md). Routing all traffic can also be used if you want to route internet traffic through your VNet e.g. through an [Azure VNet NAT](../virtual-network/nat-gateway/nat-overview.md) or an [Azure Firewall](../firewall/overview.md).
+    VNet integration allows outbound traffic to flow directly into the VNet. By default, only local IP traffic defined in [RFC-1918](https://tools.ietf.org/html/rfc1918#section-3) is routed to the VNet, which is what you need for the private endpoints. To route all your traffic to the VNet, see [Manage virtual network integration routing](configure-vnet-integration-routing.md). Routing all traffic can also be used if you want to route internet traffic through your VNet, such as through an [Azure VNet NAT](../virtual-network/nat-gateway/nat-overview.md) or an [Azure Firewall](../firewall/overview.md).
 
 1. In the browser, navigate to `<app-name>.azurewebsites.net` again and wait for the integration to take effect. If you get an HTTP 500 error, wait a few minutes and try again. If you can load the page and get detection results, then you're connecting to the Cognitive Services endpoint with key vault references.
 
     >[!NOTE]
-    > If keep getting HTTP 500 errors after a long time, it may help to force a re-fetch of the [key vault references](app-service-key-vault-references.md) again, like so:
+    > If keep getting HTTP 500 errors after a long time, it may help to force a refetch of the [key vault references](app-service-key-vault-references.md) again, like so:
     >
     > ```azurecli-interactive
     > az webapp config appsettings set --resource-group $groupName --name $appName --settings CS_ACCOUNT_NAME="@Microsoft.KeyVault(SecretUri=$csResourceKVUri)" CS_ACCOUNT_KEY="@Microsoft.KeyVault(SecretUri=$csKeyKVUri)"
diff --git a/articles/azure-sql/database/connect-query-nodejs.md b/articles/azure-sql/database/connect-query-nodejs.md
@@ -180,7 +180,7 @@ Open a command prompt and create a folder named *sqltest*. Open the folder you c
     ```
 
 > [!NOTE]
-> For more information about using managed identity for authentication, complete the tutorial to [access data via managed identity](../../app-service/tutorial-connect-msi-sqldatabase.md).
+> For more information about using managed identity for authentication, complete the tutorial to [access data via managed identity](../../app-service/tutorial-connect-msi-sql-database.md).
 
 > [!NOTE]
 > The code example uses the **AdventureWorksLT** sample database in Azure SQL Database.

Original file line number	Diff line number	Diff line change
`@@ -4360,7 +4360,7 @@`
`4360`	`4360`	`},`
`4361`	`4361`	`{`
`4362`	`4362`	`"source_path_from_root": "/articles/app-service/app-service-web-tutorial-connect-msi.md",`
`4363`		`- "redirect_url": "/azure/app-service/tutorial-connect-msi-sqldatabase",`
	`4363`	`+ "redirect_url": "/azure/app-service/tutorial-connect-msi-sql-database",`
`4364`	`4364`	`"redirect_document_id": false`
`4365`	`4365`	`},`
`4366`	`4366`	`{`