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

Author: linda33wj

.openpublishing.redirection.json

@@ -40989,6 +40989,11 @@
       "source_path": "articles/lab-services/devtest-lab-integrate-ci-cd-vsts.md",
       "redirect_url": "/azure/lab-services/devtest-lab-integrate-ci-cd",
       "redirect_document_id": true
-    }
+    },
+	  {
+      "source_path": "articles/azure-monitor/learn/java-quick-start.md",
+      "redirect_url": "/azure/azure-monitor/app/java-get-started",
+      "redirect_document_id": false
+	  }
   ]
 }

articles/active-directory-b2c/TOC.yml

@@ -127,8 +127,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 +227,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

articles/active-directory-b2c/active-directory-b2c-guide-troubleshooting-custom.md

@@ -1,5 +1,5 @@
 ---
-title: Troubleshoot custom policies in Azure Active Directory B2C | Microsoft Docs
+title: Troubleshoot custom policies in Azure Active Directory B2C
 description: Learn about approaches to solving errors when working with custom policies in Azure Active Directory B2C.
 services: active-directory-b2c
 author: mmacy
@@ -8,66 +8,74 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 05/07/2017
+ms.date: 08/13/2019
 ms.author: marsma
 ms.subservice: B2C
 ---
 
 # Troubleshoot Azure AD B2C custom policies and Identity Experience Framework
 
-If you use Azure Active Directory B2C (Azure AD B2C) custom policies, you might experience challenges setting up the Identity Experience Framework in its policy language XML format.  Learning to write custom policies can be like learning a new language. In this article, we describe tools and tips that can help you quickly discover and resolve issues. 
+If you use Azure Active Directory B2C (Azure AD B2C) custom policies, you might experience challenges setting up the Identity Experience Framework in its policy language XML format. Learning to write custom policies can be like learning a new language. In this article, we describe some tools and tips that can help you discover and resolve issues.
 
-> [!NOTE]
-> This article focuses on troubleshooting your Azure AD B2C custom policy configuration. It doesn't address the relying party application or its identity library.
+This article focuses on troubleshooting your Azure AD B2C custom policy configuration. It doesn't address the relying party application or its identity library.
 
 ## XML editing
 
-The most common error in setting up custom policies is improperly formatted XML. A good XML editor is nearly essential. A good XML editor displays XML natively, color-codes content, prefills common terms, keeps XML elements indexed, and can validate with schema. Here are two of our favorite XML editors:
+The most common error in setting up custom policies is improperly formatted XML. A good XML editor is nearly essential. It displays XML natively, color-codes content, pre-fills common terms, keeps XML elements indexed, and can validate against an XML schema.
 
-* [Visual Studio Code](https://code.visualstudio.com/)
-* [Notepad++](https://notepad-plus-plus.org/)
+Two of our favorite editors are [Visual Studio Code](https://code.visualstudio.com/) and [Notepad++](https://notepad-plus-plus.org/).
 
-XML schema validation identifies errors before you upload your XML file. In the root folder of the starter pack, get the XML schema definition TrustFrameworkPolicy_0.3.0.0.xsd. For more information, in the documentation of your XML editor, look for *XML tools* and *XML validation*.
+XML schema validation identifies errors before you upload your XML file. In the root folder of the [starter pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack), get the XML schema definition file *TrustFrameworkPolicy_0.3.0.0.xsd*. To find out how to use the XSD schema file for validation in your editor, look for *XML tools* and *XML validation* or similar in the editor's documentation.
 
 You might find a review of XML rules helpful. Azure AD B2C rejects any XML formatting errors that it detects. Occasionally, incorrectly formatted XML might cause error messages that are misleading.
 
 ## Upload policies and policy validation
 
- XML file upload validation is automatic. Most errors cause the upload to fail. Validation includes the policy file that you are uploading. It also includes the chain of files the upload file refers to (the relying party policy file, the extensions file, and the base file). 
- 
- Common validation errors include the following.
+Validation of the XML policy file is performed automatically on upload. Most errors cause the upload to fail. Validation includes the policy file that you are uploading. It also includes the chain of files the upload file refers to (the relying party policy file, the extensions file, and the base file).
+
+Common validation errors include the following:
+
+> Error snippet: `...makes a reference to ClaimType with id "displayName" but neither the policy nor any of its base policies contain such an element`
 
-Error snippet: `... makes a reference to ClaimType with id "displaName" but neither the policy nor any of its base policies contain such an element`
 * The ClaimType value might be misspelled, or does not exist in the schema.
-* ClaimType values must be defined in at least one of the files in the policy. 
-    For example: `<ClaimType Id="socialIdpUserId">`
+* ClaimType values must be defined in at least one of the files in the policy.
+    For example: `<ClaimType Id="issuerUserId">`
 * If ClaimType is defined in the extensions file, but it's also used in a TechnicalProfile value in the base file, uploading the base file results in an error.
 
-Error snippet: `...makes a reference to a ClaimsTransformation with id...`
-* The causes for the error might be the same as for the ClaimType error.
+> Error snippet: `...makes a reference to a ClaimsTransformation with id...`
+
+* The causes for this error can be the same as for the ClaimType error.
+
+> Error snippet: `Reason: User is currently logged as a user of 'yourtenant.onmicrosoft.com' tenant. In order to manage 'yourtenant.onmicrosoft.com', please login as a user of 'yourtenant.onmicrosoft.com' tenant`
 
-Error snippet: `Reason: User is currently logged as a user of 'yourtenant.onmicrosoft.com' tenant. In order to manage 'yourtenant.onmicrosoft.com', please login as a user of 'yourtenant.onmicrosoft.com' tenant`
-* Check that the TenantId value in the **\<TrustFrameworkPolicy\>** and **\<BasePolicy\>** elements match your target Azure AD B2C tenant.  
+* Check that the TenantId value in the `<TrustFrameworkPolicy\>` and `<BasePolicy\>` elements match your target Azure AD B2C tenant.
 
 ## Troubleshoot the runtime
 
-* Use `Run Now` and `https://jwt.io` to test your policies independently of your web or mobile application. This website acts like a relying party application. It displays the contents of the JSON Web Token (JWT) that is generated by your Azure AD B2C policy. To create a test application in Identity Experience Framework, use the following values:
-    * Name: TestApp
-    * Web App/Web API: No
-    * Native client: No
+* Use **Run now** and `https://jwt.ms` to test your policies independently of your web or mobile application. This website acts like a relying party application. It displays the contents of the JSON Web Token (JWT) that is generated by your Azure AD B2C policy. To create a test application, navigate to **Azure AD B2C** \> **Applications** in the Azure portal and add an application with the following values:
+
+  * **Name**: TestApp
+  * **Web App/Web API**: No
+  * **Native client**: No
+
+  Then, add `https://jwt.ms` as a **Reply URL**.
 
 * To trace the exchange of messages between your client browser and Azure AD B2C, use [Fiddler](https://www.telerik.com/fiddler). It can help you get an indication of where your user journey is failing in your orchestration steps.
 
-* In **Development mode**, use **Application Insights** to trace the activity of your Identity Experience Framework user journey. In **Development mode**, you can observe the exchange of claims between the Identity Experience Framework and the various claims providers that are defined by technical profiles, such as identity providers, API-based services, the Azure AD B2C user directory, and other services, like Azure Multi-Factor-Authentication.  
+* In **Development mode**, use [Application Insights](active-directory-b2c-troubleshoot-custom.md) to trace the activity of your Identity Experience Framework user journey. In **Development mode**, you can observe the exchange of claims between the Identity Experience Framework and the various claims providers that are defined by technical profiles, such as identity providers, API-based services, the Azure AD B2C user directory, and other services, like Azure Multi-Factor Authentication.
 
 ## Recommended practices
 
-**Keep multiple versions of your scenarios. Group them in a project with your application.** The base, extensions, and relying party files are directly dependent on each other. Save them as a group. As new features are added to your policies, keep separate working versions. Stage working versions in your own file system with the application code they interact with.  Your applications might invoke many different relying party policies in a tenant. They might become dependent on the claims that they expect from your Azure AD B2C policies.
+**Keep multiple versions of your scenarios. Group them in a project with your application.** The base, extensions, and relying party files are directly dependent on each other. Save them as a group. As new features are added to your policies, keep separate working versions. Stage working versions in your own file system with the application code they interact with. Your applications might invoke many different relying party policies in a tenant. They might become dependent on the claims that they expect from your Azure AD B2C policies.
 
 **Develop and test technical profiles with known user journeys.** Use tested starter pack policies to set up your technical profiles. Test them separately before you incorporate them into your own user journeys.
 
 **Develop and test user journeys with tested technical profiles.** Change the orchestration steps of a user journey incrementally. Progressively build your intended scenarios.
 
 ## Next steps
 
-* In GitHub, download the [active-directory-b2c-custom-policy-starterpack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/archive/master.zip) .zip file.
+Available on GitHub, download the [active-directory-b2c-custom-policy-starterpack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/archive/master.zip) .zip archive. You can also clone the repository:
+
+```
+git clone https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack
+```