Merge branch 'master' into vcraic0515

Author: Craig Casey

.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

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/cosmos-db/sql-api-async-java-samples.md",
+      "redirect_url": "/azure/cosmos-db/sql-api-java-sdk-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cosmos-db/sql-api-java-samples.md",
+      "redirect_url": "/azure/cosmos-db/sql-api-java-sdk-samples",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/openshift/howto-azure-monitor-v4.md",
       "redirect_url": "articles/azure-monitor/insights/container-insights-azure-redhat4-setup.md",
@@ -741,6 +751,11 @@
       "redirect_url": "/azure/machine-learning/samples-notebooks",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/cognitive-services-gating-process.md",
+      "redirect_url": "/azure/cognitive-services/cognitive-services-container-support",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/Content-Moderator/dotnet-sdk-quickstart.md",
       "redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-csharp",
@@ -756,6 +771,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,6 +831,12 @@
       "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"
@@ -875,7 +901,7 @@
     },
     {
       "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
     },
     {
@@ -2077,6 +2103,16 @@
       "redirect_url": "/azure/virtual-machines/windows/publish-web-app-from-visual-studio",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/virtual-machine-scale-sets/cli-samples.md",
+      "redirect_url": "azure/virtual-machine-scale-sets/scripts/cli-sample-create-simple-scale-set",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-machine-scale-sets/powershell-samples.md",
+      "redirect_url": "azure/virtual-machine-scale-sets/scripts/powershell-sample-create-simple-scale-set",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/frontdoor/front-door-rest-api.md",
       "redirect_url": "/rest/api/frontdoor",
@@ -2442,6 +2478,11 @@
       "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",
@@ -2812,6 +2853,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",
@@ -5381,12 +5427,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",
@@ -8028,7 +8074,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
     },
     {
@@ -16115,7 +16161,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",
@@ -17300,7 +17346,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",
@@ -17375,12 +17421,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",
@@ -17390,7 +17436,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",
@@ -17405,7 +17451,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",
@@ -17761,6 +17807,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",
@@ -20240,7 +20296,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",
@@ -40250,6 +40306,16 @@
       "redirect_url": "/azure/governance/policy/samples/index",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/governance/policy/concepts/rego-for-aks.md",
+      "redirect_url": "/azure/governance/policy/concepts/policy-for-kubernetes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/governance/policy/concepts/aks-engine.md",
+      "redirect_url": "/azure/governance/policy/concepts/policy-for-kubernetes",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/azure-stack/azure-stack-tools-paas-services.md",
       "redirect_url": "/azure/azure-stack/azure-stack-offer-services-overview",
@@ -51555,7 +51621,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
     },
     {
@@ -51925,7 +51991,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
     },
     {
@@ -52152,6 +52218,11 @@
       "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
 

articles/active-directory-b2c/configure-ropc.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 02/27/2020
+ms.date: 05/12/2020
 ms.author: mimart
 ms.subservice: B2C
 ---
@@ -36,7 +36,7 @@ The resource owner password credentials (ROPC) flow is an OAuth standard authent
 
    You'll then see an endpoint such as this example:
 
-   `https://yourtenant.b2clogin.com/yourtenant.onmicrosoft.com/v2.0/.well-known/openid-configuration?p=B2C_1_ROPC_Auth`
+   `https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/B2C_1_ROPC_Auth/v2.0/.well-known/openid-configuration`
 
 
 ## Register an application
@@ -46,11 +46,11 @@ The resource owner password credentials (ROPC) flow is an OAuth standard authent
 ## Test the user flow
 
 Use your favorite API development application to generate an API call, and review the response to debug your user flow. Construct a call like this with the information in the following table as the body of the POST request:
-- Replace *\<yourtenant.onmicrosoft.com>* with the name of your B2C tenant.
+- Replace *\<tenant-name>.onmicrosoft.com* with the name of your B2C tenant.
 - Replace *\<B2C_1A_ROPC_Auth>* with the full name of your resource owner password credentials policy.
 - Replace *\<bef2222d56-552f-4a5b-b90a-1988a7d634c3>* with the Application ID from your registration.
 
-`https://yourtenant.b2clogin.com/<yourtenant.onmicrosoft.com>/oauth2/v2.0/token?p=B2C_1_ROPC_Auth`
+`https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/B2C_1_ROPC_Auth/oauth2/v2.0/token`
 
 | Key | Value |
 | --- | ----- |
@@ -66,8 +66,8 @@ Use your favorite API development application to generate an API call, and revie
 The actual POST request looks like the following:
 
 ```
-POST /yourtenant.onmicrosoft.com/oauth2/v2.0/token?p=B2C_1_ROPC_Auth HTTP/1.1
-Host: yourtenant.b2clogin.com
+POST /<tenant-name>.onmicrosoft.com/B2C_1_ROPC_Auth/oauth2/v2.0/token HTTP/1.1
+Host: <tenant-name>.b2clogin.com
 Content-Type: application/x-www-form-urlencoded
 
 username=leadiocl%40trashmail.ws&password=Passxword1&grant_type=password&scope=openid+bef22d56-552f-4a5b-b90a-1988a7d634ce+offline_access&client_id=bef22d56-552f-4a5b-b90a-1988a7d634ce&response_type=token+id_token
@@ -90,7 +90,7 @@ A successful response with offline-access looks like the following example:
 
 Construct a POST call like the one shown here with the information in the following table as the body of the request:
 
-`https://yourtenant.b2clogin.com/<yourtenant.onmicrosoft.com>/oauth2/v2.0/token?p=B2C_1_ROPC_Auth`
+`https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/B2C_1_ROPC_Auth/oauth2/v2.0/token`
 
 | Key | Value |
 | --- | ----- |

articles/active-directory-b2c/connect-with-saml-service-providers.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 03/20/2020
+ms.date: 05/18/2020
 ms.author: mimart
 ms.subservice: B2C
 ms.custom: fasttrack-edit
@@ -19,8 +19,6 @@ ms.custom: fasttrack-edit
 
 In this article, you learn how to configure Azure Active Directory B2C (Azure AD B2C) to act as a Security Assertion Markup Language (SAML) identity provider (IdP) to your applications.
 
-[!INCLUDE [active-directory-b2c-public-preview](../../includes/active-directory-b2c-public-preview.md)]
-
 ## Scenario overview
 
 Organizations that use Azure AD B2C as their customer identity and access management solution might require interaction with identity providers or applications that are configured to authenticate using the SAML protocol.
@@ -367,7 +365,6 @@ The following SAML relying party (RP) scenarios are supported via your own metad
 * Multiple logout URLs or POST binding for logout URL in application/service principal object.
 * Specify signing key to verify RP requests in application/service principal object.
 * Specify token encryption key in application/service principal object.
-* Identity provider-initiated logins are not currently supported in the preview release.
 
 ## Next steps
 

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 04/28/2020
+ms.date: 05/19/2020
 ms.author: mimart
 ms.subservice: B2C
 ---
@@ -65,7 +65,7 @@ Custom policy/Identity Experience Framework capabilities are under constant and
 | [OAuth2 implicit flow](implicit-flow-single-page-application.md) |  |  | X |  |
 | [OAuth2 resource owner password credentials](ropc-custom.md) |  | X |  |  |
 | [OIDC Connect](openid-connect.md) |  |  | X |  |
-| [SAML2](connect-with-saml-service-providers.md)  |  |X  |  | POST and Redirect bindings. |
+| [SAML2](connect-with-saml-service-providers.md)  |  |  |X  | POST and Redirect bindings. |
 | OAuth1 |  |  |  | Not supported. |
 | WSFED | X |  |  |  |