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

Author: kraigb

.openpublishing.publish.config.json

@@ -10,6 +10,7 @@
       "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
+        "ZonePivotGroups": "Toc",
         "Conceptual": "Content",
         "ManagedReference": "Content",
         "LandingData": "Content",
@@ -89,6 +90,12 @@
       "url": "https://github.com/Azure/azure-docs-json-samples",
       "branch": "master"
     },
+    {
+      "path_to_root": "samples-key-vault-dotnet-quickstart",
+      "url": "https://github.com/Azure-Samples/key-vault-dotnet-core-quickstart",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-mediaservices-integration",
       "url": "https://github.com/Azure-Samples/media-services-dotnet-functions-integration",
@@ -143,7 +150,7 @@
       "path_to_root": "samples-personalizer",
       "url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
       "branch": "master"
-    },   
+    },
     {
       "path_to_root": "samples-luis",
       "url": "https://github.com/Azure-Samples/cognitive-services-language-understanding",

.openpublishing.redirection.json

@@ -62,9 +62,6 @@
         href: active-directory-b2c-reference-tokens.md
       - name: Request access token
         href: active-directory-b2c-access-tokens.md
-      - name: Support multiple token issuers
-        href: multiple-token-endpoints.md
-        displayName: migrate, b2clogin, owin, jwt
   - name: User flow and policy
     items:
     - name: User flows
@@ -127,8 +124,14 @@
         href: active-directory-b2c-setup-goog-app.md
       - name: LinkedIn
         href: active-directory-b2c-setup-li-app.md
+      - name: QQ
+        href: active-directory-b2c-setup-qq-app.md
       - name: Twitter
         href: active-directory-b2c-setup-twitter-app.md
+      - name: WeChat
+        href: active-directory-b2c-setup-wechat-app.md
+      - name: Weibo
+        href: active-directory-b2c-setup-weibo-app.md
       - name: Generic identity provider
         href: active-directory-b2c-setup-oidc-idp.md
     - name: Tokens and session management
@@ -221,6 +224,8 @@
       items:
       - name: Collect logs using Application Insights
         href: active-directory-b2c-troubleshoot-custom.md
+      - name: Policy validation
+        href: active-directory-b2c-guide-troubleshooting-custom.md
     - name: Usage analytics
       href: active-directory-b2c-custom-guide-eventlogger-appins.md
     - name: Reference
@@ -299,7 +304,12 @@
       - name: RelyingParty
         href: relyingparty.md
   - name: Use b2clogin.com
-    href: b2clogin.md
+    items:
+    - name: b2clogin.com overview
+      href: b2clogin.md
+    - name: Migrate web API to b2clogin.com
+      href: multiple-token-endpoints.md
+      displayName: migrate, b2clogin, owin, jwt
   - name: Automation
     items:
     - name: Export usage report

articles/active-directory-b2c/TOC.yml

@@ -15,7 +15,7 @@ ms.subservice: B2C
 ---
 # Request an access token in Azure Active Directory B2C
 
-An *access token* contains claims that you can use in Azure Active Directory (Azure AD) B2C to identify the granted permissions to your APIs. When calling a resource server, an access token must be present in the HTTP request. An access token is denoted as **access_token** in the responses from Azure AD B2C. 
+An *access token* contains claims that you can use in Azure Active Directory (Azure AD) B2C to identify the granted permissions to your APIs. When calling a resource server, an access token must be present in the HTTP request. An access token is denoted as **access_token** in the responses from Azure AD B2C.
 
 This article shows you how to request an access token for a web application and web API. For more information about tokens in Azure AD B2C, see the [overview of tokens in Azure Active Directory B2C](active-directory-b2c-reference-tokens.md).
 
@@ -63,13 +63,13 @@ In the following example, you replace these values:
 - `<application-ID>` - The application identifier of the web application that you registered to support the user flow.
 - `<redirect-uri>` - The **Redirect URI** that you entered when you registered the client application.
 
-```
+```HTTP
 GET https://<tenant-name>.b2clogin.com/tfp/<tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/authorize?
 client_id=<application-ID>
 &nonce=anyRandomValue
 &redirect_uri=https://jwt.ms
 &scope=https://tenant-name>.onmicrosoft.com/api/read
-&response_type=code 
+&response_type=code
 ```
 
 The response with the authorization code should be similar to this example:
@@ -80,9 +80,9 @@ 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
-Host: https://<tenant-name>.b2clogin.com
+Host: <tenant-name>.b2clogin.com
 Content-Type: application/x-www-form-urlencoded
 
 grant_type=authorization_code
@@ -95,7 +95,7 @@ grant_type=authorization_code
 
 You should see something similar to the following response:
 
-```
+```JSON
 {
     "access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ilg1ZVhrN...",
     "token_type": "Bearer",
@@ -109,7 +109,7 @@ You should see something similar to the following response:
 
 When using https://jwt.ms to examine the access token that was returned, you should see something similar to the following example:
 
-```
+```JSON
 {
   "typ": "JWT",
   "alg": "RS256",