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

Author: duongau

.openpublishing.publish.config.json

@@ -833,6 +833,7 @@
     ".openpublishing.redirection.security-benchmark.json",
     ".openpublishing.redirection.synapse-analytics.json",
     "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
+    "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",   
     "articles/azure-relay/.openpublishing.redirection.relay.json",
     "articles/communication-services/.openpublishing.redirection.communication-services.json",
     "articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",

.openpublishing.redirection.active-directory.json

@@ -4240,6 +4240,26 @@
             "redirect_url": "/azure/active-directory/governance/review-your-access",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/azure/active-directory/governance/review-your-access.md",
+            "redirect_url": "/azure/active-directory/governance/self-access-review",
+            "redirect_document_id": false
+        },
+{
+            "source_path_from_root": "/azure/active-directory/governance/entitlement-management-access-reviews-self-review.md",
+            "redirect_url": "/azure/active-directory/governance/self-access-review",
+            "redirect_document_id": false
+        },
+{
+            "source_path_from_root": "/azure/active-directory/governance/manage-guest-access-with-access-reviews.md",
+            "redirect_url": "/azure/active-directory/governance/manage-access-review",
+            "redirect_document_id": false
+        },
+{
+            "source_path_from_root": "/azure/active-directory/governance/manage-user-access-with-access-reviews.md",
+            "redirect_url": "/azure/active-directory/governance/manage-access-review",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/cloud-provisioning/what-is-cloud-provisioning.md",
             "redirect_url": "/azure/active-directory/cloud-sync/what-is-cloud-sync",

.openpublishing.redirection.json

@@ -2,7 +2,7 @@
 
 Thank you for taking the time to contribute to the Microsoft Azure documentation.
 
-This guide covers some general topics related to contribution and refers to the [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
+This guide covers some general topics related to contribution and refers to the [contributors guide](/contribute) for more detailed explanations when required.
 
 ## Code of Conduct
 
@@ -21,8 +21,8 @@ Please use the Feedback tool at the bottom of any article to submit bugs and sug
 
 ### Editing in GitHub
 
-Follow the guidance for [Quick edits to existing documents](https://docs.microsoft.com/contribute/#quick-edits-to-existing-documents) in our contributors guide.
+Follow the guidance for [Quick edits to existing documents](/contribute/#quick-edits-to-existing-documents) in our contributors guide.
 
 ### Pull Request
 
-Review the guidance for [Pull Requests](https://docs.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.
+Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.

CONTRIBUTING.md

@@ -1,7 +1,6 @@
-
 # Microsoft Azure Documentation
 
-Welcome to the open-source [documentation](https://docs.microsoft.com/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
+Welcome to the open-source [documentation](/azure) of [Microsoft Azure](https://azure.microsoft.com). Please review this README file to understand how you can assist in contributing to the Microsoft Azure documentation.
 
 ## Getting Started
 
@@ -11,7 +10,7 @@ Contributing to open source is more than just providing updates, it's also about
 
 You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
 
-Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
+Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](/contribute/get-started-setup-github) from our contributor guide.
 
 #### Download
 
@@ -23,7 +22,7 @@ Install the following tools:
 
 #### Install
 
-Follow the instructions provided in the [Install content authoring tools](https://docs.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
+Follow the instructions provided in the [Install content authoring tools](/contribute/get-started-setup-tools) from our contributor guide.
 
 ## License
 
@@ -32,4 +31,4 @@ Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdParty
 ## Code of Conduct
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
+For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

README.md

@@ -309,6 +309,10 @@
           href: partner-bloksec.md
         - name: HYPR
           href: partner-hypr.md
+        - name: IDEMIA
+          href: partner-idemia.md
+        - name: itsme
+          href: partner-itsme.md
         - name: Keyless
           href: partner-keyless.md
         - name: Nevis

articles/active-directory-b2c/TOC.yml

@@ -23,7 +23,7 @@ Azure Active Directory B2C (Azure AD B2C) provides support for verifying an emai
 This technical profile:
 
 - Doesn't provide an interface to interact with the user. Instead, the user interface is called from a [self-asserted](self-asserted-technical-profile.md) technical profile, or a [display control](display-controls.md) as a [validation technical profile](validation-technical-profile.md).
-- Uses the Azure AD SSPR service to generate and send a code to an email address, and then verifies the code.  
+- Uses the Azure AD SSPR service to generate and send a code to an email address, and then verifies the code.
 - Validates an email address via a verification code.
 
 [!INCLUDE [b2c-public-preview-feature](../../includes/active-directory-b2c-public-preview.md)]
@@ -38,7 +38,7 @@ Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, C
 
 The following example shows an Azure AD SSPR technical profile:
 
-```XML
+```xml
 <TechnicalProfile Id="AadSspr-SendCode">
   <DisplayName>Send Code</DisplayName>
   <Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -57,7 +57,6 @@ The **InputClaims** element contains a list of claims to send to Azure AD SSPR.
 | --------- | -------- | ----------- |
 | emailAddress | Yes | The identifier for the user who owns the email address. The `PartnerClaimType` property of the input claim must be set to `emailAddress`. |
 
-
 The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones before sending to the Azure AD SSPR service.
 
 ### Output claims
@@ -81,12 +80,11 @@ The following metadata can be used to configure the error messages displayed upo
 | UserMessageIfInternalError | No | User error message if the server has encountered an internal error. |
 | UserMessageIfThrottled| No | User error message if a request has been throttled.|
 
-
 ### Example: send an email
 
 The following example shows an Azure AD SSPR technical profile that is used to send a code via email.
 
-```XML
+```xml
 <TechnicalProfile Id="AadSspr-SendCode">
   <DisplayName>Send Code</DisplayName>
   <Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -142,7 +140,7 @@ The following metadata can be used to configure the error messages displayed upo
 
 The following example shows an Azure AD SSPR technical profile used to verify the code.
 
-```XML
+```xml
 <TechnicalProfile Id="AadSspr-VerifyCode">
   <DisplayName>Verify Code</DisplayName>
   <Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
@@ -154,4 +152,4 @@ The following example shows an Azure AD SSPR technical profile used to verify th
     <InputClaim ClaimTypeReferenceId="email" PartnerClaimType="emailAddress"/>
   </InputClaims>
 </TechnicalProfile>
-```
+```

articles/active-directory-b2c/aad-sspr-technical-profile.md

@@ -62,7 +62,7 @@ If the **response_type** parameter in an `/authorize` request includes `token`,
 
 To request an access token, you need an authorization code. Below is an example of a request to the `/authorize` endpoint for an authorization code. Custom domains are not supported for use with access tokens. Use your tenant-name.onmicrosoft.com domain in the request URL.
 
-In the following example, you replace these values:
+In the following example, you replace these values in the query string:
 
 - `<tenant-name>` - The name of your Azure AD B2C tenant.
 - `<policy-name>` - The name of your custom policy or user flow.
@@ -86,7 +86,7 @@ The response with the authorization code should be similar to this example:
 https://jwt.ms/?code=eyJraWQiOiJjcGltY29yZV8wOTI1MjAxNSIsInZlciI6IjEuMC...
 ```
 
-After successfully receiving the authorization code, you can use it to request an access token:
+After successfully receiving the authorization code, you can use it to request an access token. Note that the parameters are in the body of the HTTP POST request:
 
 ```http
 POST <tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/token HTTP/1.1
@@ -100,7 +100,7 @@ grant_type=authorization_code
 &redirect_uri=https://jwt.ms
 &client_secret=2hMG2-_:y12n10vwH...
 ```
-
+ 
 You should see something similar to the following response:
 
 ```json

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

@@ -412,5 +412,3 @@ To learn how to secure your APIs, see the following articles:
 - [Reference: RESTful technical profile](restful-technical-profile.md)
 
 ::: zone-end
-
-

articles/active-directory-b2c/add-api-connector-token-enrichment.md

@@ -37,7 +37,7 @@ The following flows are not supported:
 
 When using the ROPC flow, consider the following:
 
-- ROPC doesn’t work when there is any interruption to the authentication flow that needs user interaction. For example, when a password has expired or needs to be changed, [multi-factor authentication](multi-factor-authentication.md) is required, or when more information needs to be collected during sign-in (for example, user consent).
+- ROPC doesn’t work when there is any interruption to the authentication flow that needs user interaction. For example, when a password has expired or needs to be changed, [multifactor authentication](multi-factor-authentication.md) is required, or when more information needs to be collected during sign-in (for example, user consent).
 - ROPC supports local accounts only. Users can’t sign in with [federated identity providers](add-identity-provider.md) like Microsoft, Google+, Twitter, AD-FS, or Facebook.
 - [Session Management](session-behavior.md), including [keep me signed-in (KMSI)](session-behavior.md#enable-keep-me-signed-in-kmsi), is not applicable.
 
@@ -67,6 +67,9 @@ When using the ROPC flow, consider the following:
 
 ::: zone pivot="b2c-custom-policy"
 
+## Pre-requisite 
+If you've not done so, learn about custom policy starter pack in [Get started with custom policies in Active Directory B2C](tutorial-create-user-flows.md).
+
 ##  Create a resource owner policy
 
 1. Open the *TrustFrameworkExtensions.xml* file.