Merge branch 'master' into RDPGuidance

Author: nicolehaugen

.openpublishing.publish.config.json

@@ -419,6 +419,11 @@
       "url": "https://github.com/Azure/azure-cosmos-dotnet-v2",
       "branch": "master"
     },
+    {
+      "path_to_root": "samples-cosmosdb-java-v4-web-app",
+      "url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",
+      "branch": "master"
+    },
     {
       "path_to_root": "samples-cosmosdb-dotnet-change-feed-processor",
       "url": "https://github.com/Azure-Samples/cosmos-dotnet-change-feed-processor",

.openpublishing.redirection.json

@@ -756,6 +756,11 @@
       "redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-python",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/QnAMaker/Tutorials/integrate-qnamaker-luis.md",
+      "redirect_url": "/azure/cognitive-services/luis/choose-natural-language-processing-service",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-publish-query-in-portal.md",
       "redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
@@ -811,16 +816,36 @@
       "redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
       "redirect_document_id": false
     },
+
+
+    {
+      "source_path": "articles/cognitive-services/LUIS/tutorial-publish-settings.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-machine-learned-entity#publish-the-app-to-access-it-from-the-http-endpoint"
+    },
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-tutorial-composite-entity.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
+    },
+    {
+      "source_path": "articles/cognitive-services/LUIS/tutorial-entity-roles.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
+    },
+    {
+      "source_path": "articles/cognitive-services/LUIS/tutorial-list-entity.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
+    },
+    {
+      "source_path": "articles/cognitive-services/LUIS/tutorial-regex-entity.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
+    },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-boundaries.md",
       "redirect_url": "/azure/cognitive-services/LUIS/luis-limits"
     },
-      {
-        "source_path": "articles/cognitive-services/LUIS/luis-migration-api-authoring.md",
-        "redirect_url": "/azure/cognitive-services/LUIS/luis-migration-authoring-entities",
-        "redirect_document_id": false
-      },
-
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-migration-api-authoring.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-migration-authoring-entities"
+    },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-resources-faq.md",
       "redirect_url": "/azure/cognitive-services/LUIS/troubleshooting",
@@ -853,23 +878,20 @@
     },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-list-entity.md",
-      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-list-entity",
-      "redirect_document_id": false
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
     },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intents-regex-entity.md",
-      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-regex-entity",
-      "redirect_document_id": false
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
     },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-sentiment-analysis.md",
-      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-publish-settings",
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-publish-app",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-how-to-add-example-utterances.md",
-      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities",
-      "redirect_document_id": false
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
     },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-tutorial-prebuilt-intents-entities.md",
@@ -2431,11 +2453,36 @@
       "redirect_url": "/azure/cosmos-db/autoscale-faq",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/cosmos-db/use-notebook-features-and-commands.md",
+      "redirect_url": "/azure/cosmos-db/use-python-notebook-features-and-commands",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/cosmos-db/how-to-custom-synchronization.md",
       "redirect_url": "/azure/cosmos-db/how-to-multi-master",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/cosmos-db/analytics-usecases.md",
+      "redirect_url": "/azure/cosmos-db/synapse-link",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/cosmos-db/analytics-solution-architectures.md",
+      "redirect_url": "/azure/cosmos-db/synapse-link",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cosmos-db/lambda-architecture.md",
+      "redirect_url": "/azure/cosmos-db/synapse-link",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cosmos-db/globally-distributed-transactional-analytical-storage.md",
+      "redirect_url": "/azure/cosmos-db/synapse-link",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cosmos-db/sql-api-java-get-started.md",
       "redirect_url": "/azure/cosmos-db/create-sql-api-java",
@@ -2781,6 +2828,11 @@
       "redirect_url": "/azure/cosmos-db/high-availability",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/cosmos-db/create-mongodb-golang.md",
+      "redirect_url": "/azure/cosmos-db/create-mongodb-go",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/cosmos-db/sql-api-dotnet-application-preview.md",
       "redirect_url": "/azure/cosmos-db/sql-api-dotnet-application",
@@ -5350,12 +5402,12 @@
       "source_path": "articles/event-grid/premium-basic-tiers.md",
       "redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path": "articles/event-grid/update-tier.md",
       "redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path": "articles/azure-resource-manager/resource-manager-samples-powershell-deploy.md",
       "redirect_url": "/azure/azure-resource-manager/templates/deploy-powershell",
@@ -7997,7 +8049,7 @@
     },
     {
       "source_path": "articles/azure-functions/functions-create-first-java-maven.md",
-      "redirect_url": "/azure/azure-functions/functions-create-first-java-gradle",
+      "redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli?tabs=bash%2Cbrowser&pivots=programming-language-java",
       "redirect_document_id": false
     },
     {
@@ -16084,7 +16136,7 @@
       "source_path": "articles/machine-learning/concept-event-grid-integration.md",
       "redirect_url": "/azure/machine-learning/how-to-use-event-grid",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path": "articles/machine-learning/sample-designer-datasets.md",
       "redirect_url": "/azure/machine-learning/samples-designer",
@@ -17269,7 +17321,7 @@
       "source_path": "articles/service-bus-relay/network-security.md",
       "redirect_url": "/azure/azure-relay/network-security",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path": "articles/service-bus-relay/private-link-service.md",
       "redirect_url": "/azure/azure-relay/private-link-service",
@@ -17344,12 +17396,12 @@
       "source_path": "articles/service-bus-relay/relay-migrate-acs-sas.md",
       "redirect_url": "/azure/azure-relay/relay-migrate-acs-sas",
       "redirect_document_id": false
-    },            
+    },
     {
       "source_path": "articles/service-bus-relay/relay-port-settings.md",
       "redirect_url": "/azure/azure-relay/relay-port-settings",
       "redirect_document_id": false
-    },            
+    },
     {
       "source_path": "articles/service-bus-relay/relay-what-is-it.md",
       "redirect_url": "/azure/azure-relay/relay-what-is-it",
@@ -17359,7 +17411,7 @@
       "source_path": "articles/service-bus-relay/service-bus-dotnet-hybrid-app-using-service-bus-relay.md",
       "redirect_url": "/azure/azure-relay/service-bus-dotnet-hybrid-app-using-service-bus-relay",
       "redirect_document_id": false
-    },                
+    },
     {
       "source_path": "articles/service-bus-relay/service-bus-relay-rest-tutorial.md",
       "redirect_url": "/azure/azure-relay/service-bus-relay-rest-tutorial",
@@ -17374,7 +17426,7 @@
       "source_path": "articles/service-bus-relay/service-bus-relay-tutorial.md",
       "redirect_url": "/azure/azure-relay/service-bus-relay-tutorial",
       "redirect_document_id": false
-    },                            
+    },
     {
       "source_path": "articles/service-bus-relay/relay-wcf-dotnet-get-started.md",
       "redirect_url": "/azure/azure-relay/azure-relay-tutorial",
@@ -17730,6 +17782,16 @@
       "redirect_url": "/azure/synapse-analytics/quickstart-apache-spark-notebook",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/synapse-analytics/quickstart-create-apache-spark-pool.md",
+      "redirect_url": "/synapse-analytics/quickstart-create-apache-spark-pool-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/synapse-analytics/quickstart-create-sql-pool.md",
+      "redirect_url": "azure/synapse-analytics/quickstart-create-sql-pool-portal",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/sql-database/sql-database-auditing-get-started.md",
       "redirect_url": "/azure/sql-database/sql-database-auditing",
@@ -20209,7 +20271,7 @@
       "source_path": "articles/marketplace/cloud-partner-portal-orig/setup-your-application-in-the-publishing-portal.md",
       "redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
       "redirect_document_id": true
-    },    
+    },
     {
       "source_path": "articles/marketplace/enable-lead-sharing.md",
       "redirect_url": "/azure/marketplace/partner-center-portal/commercial-marketplace-get-customer-leads",
@@ -37627,8 +37689,7 @@
     },
     {
       "source_path": "articles/cognitive-services/LUIS/Add-entities.md",
-      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities",
-      "redirect_document_id": true
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
     },
     {
       "source_path": "articles/java-add-certificate-ca-store.md",
@@ -44892,8 +44953,7 @@
     },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-hier-entity.md",
-      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-entity-roles",
-      "redirect_document_id": true
+      "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
     },
     {
       "source_path": "articles/azure-monitor/app/previews.md",
@@ -49435,6 +49495,11 @@
       "redirect_url": "/azure/cognitive-services/translator/translator-info-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/translator/translator-text-how-to-signup.md",
+      "redirect_url": "/azure/cognitive-services/translator/translator-how-to-signup",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/aks/virtual-kubelet.md",
       "redirect_url": "/azure/aks/concepts-scale#burst-to-azure-container-instances",
@@ -51521,7 +51586,7 @@
     },
     {
       "source_path": "articles/databox-online/data-box-edge-troubleshoot.md",
-      "redirect_url": "/azure/databox-online/azure-stack-edge-troubleshoot", 
+      "redirect_url": "/azure/databox-online/azure-stack-edge-troubleshoot",
       "redirect_document_id": false
     },
     {
@@ -51891,7 +51956,7 @@
     },
     {
       "source_path": "articles/terraform/terraform-create-complete-vm.md",
-      "redirect_url": "/azure/developer/terraform/create-linux-virtual machine-with-infrastructure",
+      "redirect_url": "/azure/developer/terraform/create-linux-virtual-machine-with-infrastructure",
       "redirect_document_id": false
     },
     {
@@ -52083,6 +52148,46 @@
       "source_path": "articles/visual-studio/vs-storage-cloud-services-what-happened.md",
       "redirect_url": "/azure/storage",
       "redirect_document_id": false
-    }
+    },
+    {
+      "source_path": "articles/sql-database-edge/index.yml",
+      "redirect_url": "/azure/azure-sql-edge/",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/sql-database-edge/deploy-onnx.md",
+      "redirect_url": "/azure/azure-sql-edge/deploy-onnx",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/sql-database-edge/deploy-portal.md",
+      "redirect_url": "/azure/azure-sql-edge/deploy-portal",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/sql-database-edge/onnx-overview.md",
+      "redirect_url": "/azure/azure-sql-edge/onnx-overview",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/sql-database-edge/overview.md",
+      "redirect_url": "/azure/azure-sql-edge/overview",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/sql-database-edge/stream-analytics.md",
+      "redirect_url": "/azure/azure-sql-edge/stream-analytics",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/sql-database-edge/tutorial-sync-data-factory.md",
+      "redirect_url": "/azure/azure-sql-edge/tutorial-sync-data-factory",
+      "redirect_document_id": true
+    },
+	{
+		"source_path":"articles/azure-monitor/app/alerts.md",
+		"redirect_url":"/articles/azure-monitor/platform/alerts-log",
+		"redirect_document_id": false 		
+	}
  ]
 }

.vscode/settings.json

@@ -59,7 +59,8 @@
         "YAML"
     ],
     "cSpell.words": [
-        "auditd"
+        "auditd",
+        "covid"
     ],
     "git.ignoreLimitWarning": true
 }

articles/active-directory-b2c/access-tokens.md

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 04/16/2019
+ms.date: 05/12/2020
 ms.author: mimart
 ms.subservice: B2C
 
@@ -81,7 +81,7 @@ https://jwt.ms/?code=eyJraWQiOiJjcGltY29yZV8wOTI1MjAxNSIsInZlciI6IjEuMC...
 After successfully receiving the authorization code, you can use it to request an access token:
 
 ```HTTP
-POST <tenant-name>.onmicrosoft.com/oauth2/v2.0/token?p=<policy-name> HTTP/1.1
+POST <tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/token HTTP/1.1
 Host: <tenant-name>.b2clogin.com
 Content-Type: application/x-www-form-urlencoded