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

Author: tamram

.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

@@ -2812,6 +2812,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",
@@ -51925,7 +51930,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
     },
     {

articles/active-directory-b2c/custom-policy-rest-api-claims-exchange.md

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 03/26/2020
+ms.date: 05/18/2020
 ms.author: mimart
 ms.subservice: B2C
 ---
@@ -207,9 +207,6 @@ Save the files you changed: *TrustFrameworkBase.xml*, and *TrustFrameworkExtensi
 }
 ```
 
-## Next steps
-
-
 ## Next steps
 
 To learn how to secure your APIs, see the following articles:

articles/active-directory-b2c/custom-policy-rest-api-intro.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 03/23/2020
+ms.date: 05/18/2020
 ms.author: mimart
 ms.subservice: B2C
 ---
@@ -158,7 +158,7 @@ In a RESTful technical profile, you may want to send the current session's langu
 
 ## Handling error messages
 
-Your REST API may need to return an error message, such as "The user was not found in the CRM system." If an error occurs, the REST API should return an HTTP 409 error message (Conflict response status code). For more information, see the [RESTful technical profile](https://identitydivision.visualstudio.com/defaultcollection/Identity%20CXP/_git/GTP?path=%2Fyoelh%2Fdocs%2Frest-api%2Frestful-technical-profile.md&version=GBmaster&anchor=returning-error-message).
+Your REST API may need to return an error message, such as "The user was not found in the CRM system." If an error occurs, the REST API should return an HTTP 409 error message (Conflict response status code). For more information, see the [RESTful technical profile](restful-technical-profile.md#returning-error-message).
 
 This can only be achieved by calling a REST API technical profile from a validation technical profile. This allows the user to correct the data on the page and run the validation again upon page submission.
 
@@ -179,4 +179,4 @@ See the following articles for examples of using a RESTful technical profile:
 - [Walkthrough: Integrate REST API claims exchanges in your Azure AD B2C user journey as validation of user input](custom-policy-rest-api-claims-validation.md)
 - [Walkthrough: Add REST API claims exchanges to custom policies in Azure Active Directory B2C](custom-policy-rest-api-claims-validation.md)
 - [Secure your REST API services](secure-rest-api.md)
-- [Reference: RESTful technical profile](restful-technical-profile.md)
+- [Reference: RESTful technical profile](restful-technical-profile.md)

articles/active-directory/authentication/tutorial-enable-sspr-writeback.md

@@ -58,6 +58,10 @@ To correctly work with SSPR writeback, the account specified in Azure AD Connect
 
 If don't assign these permissions, writeback appears to be configured correctly, but users encounter errors when they manage their on-premises passwords from the cloud. Permissions must be applied to **This object and all descendant objects** for "Unexpire Password" to appear.  
 
+> [!TIP]
+>
+> If passwords for some user accounts aren't written back to the on-premises directory, make sure that inheritance isn't disabled for the account in the on-prem AD DS environment. Write permissions for passwords must be applied to descendant objects for the feature to work correctly.
+
 To set up the appropriate permissions for password writeback to occur, complete the following steps:
 
 1. In your on-premises AD DS environment, open **Active Directory Users and Computers** with an account that has the appropriate *domain administrator* permissions.

articles/active-directory/b2b/index.yml

@@ -24,6 +24,18 @@ landingContent:
             url: compare-with-b2c.md
           - text: What is B2B guest user access?
             url: what-is-b2b.md
+  - title: Self-service sign-up (Preview)
+    linkLists:
+      - linkListType: overview
+        links:
+          - text: What is self-service sign-up?
+            url: self-service-sign-up-overview.md
+      - linkListType: how-to-guide
+        links:
+          - text: Add a self-service sign-up user flow
+            url: self-service-sign-up-user-flow.md
+          - text: Define custom attributes for user flows
+            url: user-flow-add-custom-attributes.md
   - title: Invite B2B guest users
     linkLists:
       - linkListType: concept

articles/active-directory/conditional-access/block-legacy-authentication.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: conceptual
-ms.date: 03/31/2020
+ms.date: 05/13/2020
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
@@ -151,3 +151,4 @@ If you block legacy authentication using the **Other clients** condition, you ca
 - [Determine impact using Conditional Access report-only mode](howto-conditional-access-report-only.md)
 - If you are not familiar with configuring Conditional Access policies yet, see [require MFA for specific apps with Azure Active Directory Conditional Access](app-based-mfa.md) for an example.
 - For more information about modern authentication support, see [How modern authentication works for Office 2013 and Office 2016 client apps](/office365/enterprise/modern-auth-for-office-2013-and-2016) 
+- [How to set up a multifunction device or application to send email using Office 365 and Microsoft 365](/exchange/mail-flow-best-practices/how-to-set-up-a-multifunction-device-or-application-to-send-email-using-office-3)

articles/active-directory/conditional-access/howto-conditional-access-policy-block-legacy.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: conceptual
-ms.date: 03/25/2020
+ms.date: 05/13/2020
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
@@ -48,3 +48,5 @@ The following steps will help create a Conditional Access policy to block legacy
 [Determine impact using Conditional Access report-only mode](howto-conditional-access-report-only.md)
 
 [Simulate sign in behavior using the Conditional Access What If tool](troubleshoot-conditional-access-what-if.md)
+
+[How to set up a multifunction device or application to send email using Office 365 and Microsoft 365](/exchange/mail-flow-best-practices/how-to-set-up-a-multifunction-device-or-application-to-send-email-using-office-3)

articles/active-directory/develop/quickstart-v2-javascript-auth-code.md

@@ -77,13 +77,13 @@ In this quickstart, you use a code sample to learn how a JavaScript single-page
 #### Step 2: Download the project
 
 > [!div renderon="docs"]
-> To run the project with a web server by using Node.js, [download the core project files](https://github.com/Azure-Samples/ms-identity-javascript-v2/archive/quickstart.zip).
+> To run the project with a web server by using Node.js, [download the core project files](https://github.com/Azure-Samples/ms-identity-javascript-v2/archive/master.zip).
 
 > [!div renderon="portal" class="sxs-lookup"]
 > Run the project with a web server by using Node.js
 
 > [!div renderon="portal" id="autoupdate" class="nextstepaction" class="sxs-lookup"]
-> [Download the code sample](https://github.com/Azure-Samples/ms-identity-javascript-v2/archive/quickstart.zip)
+> [Download the code sample](https://github.com/Azure-Samples/ms-identity-javascript-v2/archive/master.zip)
 
 > [!div renderon="docs"]
 > #### Step 3: Configure your JavaScript app

articles/active-directory/develop/scenario-web-app-call-api-app-configuration.md

@@ -265,7 +265,7 @@ The use of client assertions is an advanced scenario, detailed in [Client assert
 
 # [ASP.NET Core](#tab/aspnetcore)
 
-The ASP.NET core tutorial uses dependency injection to let you decide the token cache implementation in the Startup.cs file for your application. Microsoft.Identity.Web comes with pre-built token-cache serializers described in [Token cache serialization](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/blob/master/Microsoft.Identity.Web/README.md#token-cache-serialization). An interesting possibility is to choose ASP.NET Core [distributed memory caches](https://docs.microsoft.com/aspnet/core/performance/caching/distributed#distributed-memory-cache):
+The ASP.NET core tutorial uses dependency injection to let you decide the token cache implementation in the Startup.cs file for your application. Microsoft.Identity.Web comes with pre-built token-cache serializers described in [Token cache serialization](msal-net-token-cache-serialization.md#token-cache-for-a-web-app-confidential-client-application). An interesting possibility is to choose ASP.NET Core [distributed memory caches](https://docs.microsoft.com/aspnet/core/performance/caching/distributed#distributed-memory-cache):
 
 ```csharp
 // Use a distributed token cache by adding: