Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into jedi1

Author: timlt

.openpublishing.redirection.json

@@ -525,7 +525,6 @@
       "redirect_url": "/azure/site-recovery/vmware-physical-mobility-service-overview#install-mobility-agent-through-ui",
       "redirect_document_id": false
     },
-
     {
       "source_path": "articles/machine-learning/service/quickstart-get-started.md",
       "redirect_url": "/azure/machine-learning/service/tutorial-1st-experiment-sdk-setup",
@@ -1721,6 +1720,26 @@
       "redirect_url": "/azure/cognitive-services/bing-image-search/quickstarts/client-libraries?pivots=programming-language-python",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Bing-Entities-Search/quickstarts/entity-sdk-csharp-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/bing-entity-search/quickstarts/client-libraries?pivots=programming-language-csharp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Bing-Entities-Search/quickstarts/entity-sdk-java-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/bing-entity-search/quickstarts/client-libraries?pivots=programming-language-java",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Bing-Entities-Search/quickstarts/entity-sdk-node-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/bing-entity-search/quickstarts/client-libraries?pivots=programming-language-javascript",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Bing-Entities-Search/quickstarts/entity-sdk-python-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/bing-entity-search/quickstarts/client-libraries?pivots=programming-language-python",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
       "redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -18680,17 +18699,17 @@
       "redirect_url": "/azure/backup/backup-azure-arm-vms-prepare",
       "redirect_document_id": false
     },
-	{
+    {
       "source_path": "articles/backup/backup-azure-configure-reports.md",
       "redirect_url": "/azure/backup/configure-reports.md",
       "redirect_document_id": false
     },
-	{
+    {
       "source_path": "articles/backup/backup-azure-log-analytics-data-model.md",
       "redirect_url": "/azure/backup/backup-azure-diagnostics-mode-data-model.md",
       "redirect_document_id": false
     },
-	{
+    {
       "source_path": "articles/backup/backup-azure-log-analytics-new-data-model.md",
       "redirect_url": "/azure/backup/backup-azure-reports-data-model.md",
       "redirect_document_id": false
@@ -25742,7 +25761,7 @@
     },
     {
       "source_path": "articles/active-directory/active-directory-reporting-power-bi-content-pack-how-to.md",
-      "redirect_url": "azure/active-directory/reports-monitoring/howto-use-azure-monitor-workbooks",
+      "redirect_url": "/azure/active-directory/reports-monitoring/howto-use-azure-monitor-workbooks",
       "redirect_document_id": false
     },
     {
@@ -36932,8 +36951,8 @@
     },
     {
       "source_path": "articles/active-directory/manage-apps/application-provisioning-config-problem-no-users-provisioned.md",
-      "redirect_url": "azure/active-directory/app-provisioning/application-provisioning-config-problem-no-users-provisioned",
-      "redirect_document_id": false
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-config-problem-no-users-provisioned",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/active-directory/application-provisioning-config-problem-storage-limit.md",
@@ -36952,7 +36971,7 @@
     },
     {
       "source_path": "articles/active-directory/manage-apps/application-provisioning-config-problem-wrong-users-provisioned.md",
-      "redirect_url": "azure/active-directory/app-provisioning/application-provisioning-config-problem-wrong-users-provisioned",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-config-problem-wrong-users-provisioned",
       "redirect_document_id": false
     },
     {
@@ -42710,7 +42729,7 @@
       "redirect_url": "/previous-versions/azure/virtual-machines/windows/classic/capture-image-classic",
       "redirect_document_id": false
     },
-	{
+    {
       "source_path": "articles/virtual-machines/virtual-machines-availability-set-supportability.md",
       "redirect_url": "/azure/virtual-machines/troubleshooting/virtual-machines-availability-set-supportability",
       "redirect_document_id": false
@@ -46110,7 +46129,6 @@
       "redirect_url": "/azure/iot-central/core/howto-use-app-templates/",
       "redirect_document_id": true
     },
-
     {
       "source_path": "articles/iot-central/preview/howto-customize-ui.md",
       "redirect_url": "/azure/iot-central/core/howto-customize-ui/",
@@ -46131,7 +46149,6 @@
       "redirect_url": "/azure/iot-central/core/howto-manage-iot-central-from-cli/",
       "redirect_document_id": true
     },
-
     {
       "source_path": "articles/iot-central/preview/tutorial-add-edge-as-leaf-device.md",
       "redirect_url": "/azure/iot-central/core/tutorial-add-edge-as-leaf-device/",
@@ -46216,7 +46233,8 @@
       "source_path": "articles/iot-central/preview/overview-iot-central-tour.md",
       "redirect_url": "/azure/iot-central/core/overview-iot-central-tour/",
       "redirect_document_id": true
-    },{
+    },
+    {
       "source_path": "articles/iot-central/preview/overview-iot-central-transform.md",
       "redirect_url": "/azure/iot-central/core/overview-iot-central/",
       "redirect_document_id": true
@@ -46239,7 +46257,7 @@
     {
       "source_path": "articles/iot-central/preview/index.yml",
       "redirect_url": "/azure/iot-central/core/",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/iot-pnp/quickstart-connect-pnp-device-linux.md",
@@ -48977,57 +48995,57 @@
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-cpp-linux.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-cpp-linux.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?tabs=linux&pivots=programming-language-cpp",
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-cpp-macos.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-cpp-macos.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?tabs=macos&pivots=programming-language-cpp",
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-cpp-windows.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-cpp-windows.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?tabs=windows&pivots=programming-language-cpp",
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-csharp-dotnet-windows.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-csharp-dotnet-windows.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?tabs=dotnet&pivots=programming-language-csharp",
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-csharp-dotnetcore-windows.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-csharp-dotnetcore-windows.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?tabs=dotnetcore&pivots=programming-language-csharp",
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-csharp-unity.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-csharp-unity.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?tabs=unity&pivots=programming-language-csharp",
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-csharp-uwp.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-csharp-uwp.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?tabs=uwp&pivots=programming-language-csharp",
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-csharp-xamarin.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-csharp-xamarin.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?tabs=xaml&pivots=programming-language-csharp",
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-java-android.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-java-android.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?tabs=android&pivots=programming-language-java",
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-java-jre.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-java-jre.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?tabs=jre&pivots=programming-language-java",
       "redirect_document_id": false
     },
     {
-      "source_path":  "articles/cognitive-services/speech-service/quickstart-platform-python.md",
+      "source_path": "articles/cognitive-services/speech-service/quickstart-platform-python.md",
       "redirect_url": "/azure/cognitive-services/speech-service/quickstarts/setup-platform?pivots=programming-language-python",
       "redirect_document_id": false
     },
@@ -49122,9 +49140,9 @@
       "redirect_document_id": false
     },
     {
-       "source_path": "articles/cognitive-services/Bing-News-Search/vs-bing-news-search-connected-service.md",
-       "redirect_url": "/azure/cognitive-services/bing-news-search/search-the-web",
-       "redirect_document_id": false
+      "source_path": "articles/cognitive-services/Bing-News-Search/vs-bing-news-search-connected-service.md",
+      "redirect_url": "/azure/cognitive-services/bing-news-search/search-the-web",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/cognitive-services/Computer-vision/vs-computer-vision-connected-service.md",
@@ -49244,7 +49262,7 @@
     {
       "source_path": "articles/virtual-machines/workloads/sap/sap-hana-backup-storage-snapshots.md",
       "redirect_url": "sap-hana-backup-guide",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/service-fabric/service-fabric-cicd-your-linux-applications-with-jenkins.md",

articles/active-directory-b2c/custom-policy-disable-email-verification.md

@@ -24,8 +24,11 @@ Complete the steps in [Get started with custom policies](custom-policy-get-start
 
 ## Add the metadata to the self-asserted technical profile
 
-The **LocalAccountSignUpWithLogonEmail** technical profile is a [self-asserted](self-asserted-technical-profile.md), which is invoked during the sign-up flow. To disable the email verification, set the `EnforceEmailVerification` metadata to false. Override the LocalAccountSignUpWithLogonEmail technical profiles in the extension file. Find the `ClaimsProviders` element. Add the following claims provider to the `ClaimsProviders` element:
+The **LocalAccountSignUpWithLogonEmail** technical profile is a [self-asserted](self-asserted-technical-profile.md), which is invoked during the sign-up flow. To disable the email verification, set the `EnforceEmailVerification` metadata to false. Override the LocalAccountSignUpWithLogonEmail technical profiles in the extension file. 
 
+1. Open the extensions file of your policy. For example, <em>`SocialAndLocalAccounts/`**`TrustFrameworkExtensions.xml`**</em>.
+1. Find the `ClaimsProviders` element. If the element doesn't exist, add it.
+1. Add the following claims provider to the `ClaimsProviders` element:
 
 ```XML
 <ClaimsProvider>

articles/active-directory/devices/troubleshoot-device-dsregcmd.md

@@ -208,8 +208,16 @@ This section performs various tests to help diagnose join failures. This section
 - **AD Configuration Test:** - Test reads and verifies whether the SCP object is configured properly in the on-premises AD forest. Errors in this test would likely result in Join errors in the discover phase with the error code 0x801c001d.
 - **DRS Discovery Test:** - Test gets the DRS endpoints from discovery metadata endpoint and performs a user realm request. Errors in this test would likely result in Join errors in the discover phase.
 - **DRS Connectivity Test:** - Test performs basic connectivity test to the DRS endpoint.
-- **Token acquisition Test:** - Test tries to get an Azure AD authentication token if the user tenant is federated. Errors in this test would likely result in Join errors in the auth phase. If auth fails sync join will be attempted as fallback, unless fallback is explicitly disabled with a registry key.
-- **Fallback to Sync-Join:** - Set to “Enabled” if the registry key, to prevent the fallback to sync join with auth failures, is NOT present. This option is available from Windows 10 1803 and later.
+- **Token acquisition Test:** - Test tries to get an Azure AD authentication token if the user tenant is federated. Errors in this test would likely result in Join errors in the auth phase. If auth fails sync join will be attempted as fallback, unless fallback is explicitly disabled with the below registry key settings.
+```
+    Keyname: Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\CDJ
+    Value: FallbackToSyncJoin
+    Type:  REG_DWORD
+    Value: 0x0 -> Disabled
+    Value: 0x1 -> Enabled
+    Default (No Key): Enabled
+ ```
+- **Fallback to Sync-Join:** - Set to “Enabled” if the above registry key, to prevent the fallback to sync join with auth failures, is NOT present. This option is available from Windows 10 1803 and later.
 - **Previous Registration:** - Time the previous Join attempt occurred. Only failed Join attempts are logged.
 - **Error Phase:** - The stage of the join in which it was aborted. Possible values are pre-check, discover, auth, join.
 - **Client ErrorCode:** - Client error code returned (HRESULT).

articles/api-management/howto-protect-backend-frontend-azure-ad-b2c.md

@@ -249,7 +249,7 @@ You'll need to add CIDR formatted blocks of addresses to the IP restrictions pan
 
    > [!NOTE]
    > The following section is optional and does not apply to the **Consumption** tier, which does not support the developer portal.
-   > If you do not intend to use the developer portal, or cannot use it since you are using the Consumption tier, please skip this step and jump straight to ["Build the JavaScript SPA to consume the API"](##build-the-javascript-spa-to-consume-the-api).
+   > If you do not intend to use the developer portal, or cannot use it since you are using the Consumption tier, please skip this step and jump straight to ["Build the JavaScript SPA to consume the API"](#build-the-javascript-spa-to-consume-the-api).
 
 ## [Optional] Configure the developer portal
 

articles/app-service/app-service-web-get-started-java.md

@@ -55,7 +55,7 @@ Then add the following plugin definition inside the `<build>` element of the `po
     <plugin>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-webapp-maven-plugin</artifactId>
-        <version>1.8.0</version>
+        <version>1.9.0</version>
         <configuration>
             <!-- Specify v2 schema -->
             <schemaVersion>v2</schemaVersion>

articles/app-service/containers/quickstart-java.md

@@ -48,19 +48,19 @@ az login
 
 Then you can configure the deployment, run the maven command in the Command Prompt and use the default configurations by pressing **ENTER** until you get the **Confirm (Y/N)** prompt, then press **'y'** and the configuration is done. 
 ```cmd
-mvn com.microsoft.azure:azure-webapp-maven-plugin:1.8.0:config
+mvn com.microsoft.azure:azure-webapp-maven-plugin:1.9.0:config
 ```
 A sample process looks like:
 
 ```cmd
-~@Azure:~/helloworld$ mvn com.microsoft.azure:azure-webapp-maven-plugin:1.8.0:config
+~@Azure:~/helloworld$ mvn com.microsoft.azure:azure-webapp-maven-plugin:1.9.0:config
 [INFO] Scanning for projects...
 [INFO]
 [INFO] ----------------------< example.demo:helloworld >-----------------------
 [INFO] Building helloworld Maven Webapp 1.0-SNAPSHOT
 [INFO] --------------------------------[ war ]---------------------------------
 [INFO]
-[INFO] --- azure-webapp-maven-plugin:1.8.0:config (default-cli) @ helloworld ---
+[INFO] --- azure-webapp-maven-plugin:1.9.0:config (default-cli) @ helloworld ---
 [WARNING] The plugin may not work if you change the os of an existing webapp.
 Define value for OS(Default: Linux):
 1. linux [*]

articles/app-service/containers/quickstart-multi-container.md

@@ -93,6 +93,9 @@ When the App Service plan has been created, the Azure CLI shows information simi
 
 ## Create a Docker Compose app
 
+> [!NOTE]
+> Docker Compose on Azure App Services currently has a limit of 4,000 characters at this time.
+
 In your Cloud Shell terminal, create a multi-container [web app](app-service-linux-intro.md) in the `myAppServicePlan` App Service plan with the [az webapp create](/cli/azure/webapp?view=azure-cli-latest#az-webapp-create) command. Don't forget to replace _\<app_name>_ with a unique app name (valid characters are `a-z`, `0-9`, and `-`).
 
 ```azurecli

articles/app-service/containers/tutorial-java-spring-cosmosdb.md

@@ -184,7 +184,7 @@ Open the `pom.xml` file in the `initial/spring-boot-todo` directory and add the
     <plugin>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-webapp-maven-plugin</artifactId>
-        <version>1.8.0</version>
+        <version>1.9.0</version>
         <configuration>
             <schemaVersion>v2</schemaVersion>
 
@@ -249,7 +249,7 @@ bash-3.2$ mvn azure-webapp:deploy
 [INFO] Building spring-todo-app 2.0-SNAPSHOT
 [INFO] ------------------------------------------------------------------------
 [INFO] 
-[INFO] --- azure-webapp-maven-plugin:1.8.0:deploy (default-cli) @ spring-todo-app ---
+[INFO] --- azure-webapp-maven-plugin:1.9.0:deploy (default-cli) @ spring-todo-app ---
 [INFO] Target Web App doesn't exist. Creating a new one...
 [INFO] Creating App Service Plan 'ServicePlanb6ba8178-5bbb-49e7'...
 [INFO] Successfully created App Service Plan.

articles/azure-functions/functions-create-first-java-maven.md

@@ -131,14 +131,14 @@ Application started. Press Ctrl+C to shut down.
 
 Http Functions:
 
-    HttpTrigger-Java: [GET,POST] http://localhost:7071/api/HttpTrigger-Java
+    HttpExample: [GET,POST] http://localhost:7071/api/HttpExample
 ...
 ```
 
 Trigger the function from the command line using cURL in a new terminal window:
 
 ```bash
-curl -w "\n" http://localhost:7071/api/HttpTrigger-Java --data AzureFunctions
+curl -w "\n" http://localhost:7071/api/HttpExample --data AzureFunctions
 ```
 
 ```output
@@ -210,7 +210,7 @@ You can now use the copied URL to access your function.
 To verify the function app running on Azure using `cURL`, replace the URL from the sample below with the URL that you copied from the portal.
 
 ```console
-curl -w "\n" https://fabrikam-functions-20190929094703749.azurewebsites.net/api/HttpTrigger-Java?code=zYRohsTwBlZ68YF.... --data AzureFunctions
+curl -w "\n" https://fabrikam-functions-20190929094703749.azurewebsites.net/api/HttpExample?code=zYRohsTwBlZ68YF.... --data AzureFunctions
 ```
 
 This sends a POST request to the function endpoint with `AzureFunctions` in the body of the request. You see the following response.