pull from master

Author: Yi Zhong

.gitignore

@@ -164,7 +164,7 @@
     {
       "path_to_root": "samples-cognitive-services-speech-sdk",
       "url": "https://github.com/Azure-Samples/cognitive-services-speech-sdk",
-      "branch": "docs",
+      "branch": "docs-201807",
       "branch_mapping": {}
     },
     {

.openpublishing.publish.config.json

@@ -8,7 +8,7 @@ manager: mtillman
 ms.service: active-directory
 ms.workload: identity
 ms.topic: quickstart
-ms.date: 2/13/2018
+ms.date: 7/13/2018
 ms.author: davidmu
 ms.component: B2C
 ---
@@ -25,7 +25,7 @@ In this quickstart, you use an Azure AD B2C enabled sample single-page app to si
 
 * [Visual Studio 2017](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload.
 * Install [Node.js](https://nodejs.org/en/download/)
-* A social account from either Facebook, Google, Microsoft, or Twitter.
+* A Facebook account.
 
 ## Download the sample
 
@@ -59,21 +59,17 @@ Browse to the app's URL `http://localhost:6420` in a web browser.
 
 Click the **Login** button to start the Azure AD B2C **Sign Up or Sign In** workflow based on an Azure AD B2C policy. 
 
-The sample supports several sign-up options including using a social identity provider or creating a local account using an email address. For this quickstart, use a social identity provider account from either Facebook, Google, Microsoft, or Twitter. 
+The sample is intended to support several sign-up options including creating a local account using an email address. For this quickstart, use a Facebook account. 
 
 ### Sign up using a social identity provider
 
 Azure AD B2C presents a custom login page for a fictitious brand called Wingtip Toys for the sample web app. 
 
-1. To sign up using a social identity provider, click the button of the identity provider you want to use.
-
-    ![Sign In or Sign Up provider](media/active-directory-b2c-quickstarts-spa/sign-in-or-sign-up-spa.png)
+1. To sign up using a social identity provider, click the button of the Facebook identity provider.
 
     You authenticate (sign-in) using your social account credentials and authorize the application to read information from your social account. By granting access, the application can retrieve profile information from the social account such as your name and city. 
 
-2. Finish the sign-in process for the identity provider. For example, if you chose Twitter, enter your Twitter credentials and click **Sign in**.
-
-    ![Authenticate and authorize using a social account](media/active-directory-b2c-quickstarts-spa/twitter-authenticate-authorize-spa.png)
+2. Finish the sign-in process for the identity provider by entering your credentials.
 
     Your new account profile details are pre-populated with information from your social account. 
 

.openpublishing.redirection.json

@@ -60,7 +60,7 @@ You will see a list of activities logged over the last seven days.
 - Click on **Download** to download the activities as a csv file
 
 ##Accessing audit logs through the Azure AD reporting API
-Audit logs are published to the same pipeline as other activities for Azure Active Directory, so they can be accessed through the [Azure Active Directory reporting API](https://docs.microsoft.com/en-us/azure/active-directory/active-directory-reporting-api-audit-reference). 
+Audit logs are published to the same pipeline as other activities for Azure Active Directory, so they can be accessed through the [Azure Active Directory reporting API](https://docs.microsoft.com/azure/active-directory/active-directory-reporting-api-audit-reference). 
 
 ###Prerequisites
 To authenticate to the Azure AD reporting API you first need to register an application. Make sure to follow the steps in [Prerequisites to access the Azure AD reporting APIs](https://azure.microsoft.com/documentation/articles/active-directory-reporting-api-getting-started/).

articles/active-directory-b2c/active-directory-b2c-apps.md

@@ -1,50 +1,52 @@
 ---
-title: Azure Active Directory B2C custom attributes | Microsoft Docs
-description: How to use custom attributes in Azure Active Directory B2C to collect information about your consumers.
+title: Define custom attributes in Azure Active Directory B2C | Microsoft Docs
+description: Define custom attributes for your application in Azure Active Directory B2C to collect information about your customers.
 services: active-directory-b2c
 author: davidmu1
 manager: mtillman
 
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 12/06/2016
+ms.date: 07/10/2018
 ms.author: davidmu
 ms.component: B2C
 ---
 
-# Azure Active Directory B2C: Use custom attributes to collect information about your consumers
-Your Azure Active Directory (Azure AD) B2C directory comes with a built-in set of information (attributes): Given Name, Surname, City, Postal Code, and other attributes. However, every consumer-facing application has unique requirements on what attributes to gather from consumers. With Azure AD B2C, you can extend the set of attributes stored on each consumer account. You can create custom attributes on the [Azure portal](https://portal.azure.com/) and use it in your sign-up policies, as shown below. You can also read and write these attributes by using the [Azure AD Graph API](active-directory-b2c-devquickstarts-graph-dotnet.md).
+# Define custom attributes in Azure Active Directory B2C
 
-> [!NOTE]
-> Custom attributes use [Azure AD Graph API Directory Schema Extensions](https://msdn.microsoft.com/library/azure/ad/graph/howto/azure-ad-graph-api-directory-schema-extensions).
-> 
-> 
+ Every customer-facing application has unique requirements for the information that needs to be collected. Your Azure Active Directory (Azure AD) B2C tenant comes with a built-in set of information stored in attributes, such as Given Name, Surname, City, and Postal Code. With Azure AD B2C, you can extend the set of attributes stored on each customer account. 
+ 
+ You can create custom attributes in the [Azure portal](https://portal.azure.com/) and use them in your sign-up policies, sign-up or sign-in policies, or profile editing policies. You can also read and write these attributes by using the [Azure AD Graph API](active-directory-b2c-devquickstarts-graph-dotnet.md). Custom attributes in Azure AD B2C use [Azure AD Graph API Directory Schema Extensions](https://msdn.microsoft.com/library/azure/ad/graph/howto/azure-ad-graph-api-directory-schema-extensions).
 
 ## Create a custom attribute
-1. [Follow these steps to navigate to the B2C features blade on the Azure portal](active-directory-b2c-app-registration.md#navigate-to-b2c-settings).
-2. Click **User attributes**.
-3. Click **+Add** at the top of the blade.
-4. Provide a **Name** for the custom attribute (for example, "ShoeSize") and optionally, a **Description**. Click **Create**.
-   
-   > [!NOTE]
-   > Only the "String", "Boolean" and "Int" **Data Types** are currently available.
-   > 
-   > 
-
-The custom attribute is now available in the list of **User attributes**, and for use in your sign-up policies.
-
-## Use a custom attribute in your sign-up policy
-1. [Follow these steps to navigate to the B2C features blade on the Azure portal](active-directory-b2c-app-registration.md#navigate-to-b2c-settings).
-2. Click **Sign-up policies**.
-3. Click your sign-up policy (for example, "B2C_1_SiUp") to open it. Click **Edit** at the top of the blade.
-4. Click **Sign-up attributes** and select the custom attribute (for example, "ShoeSize"). Click **OK**.
-5. Click **Application claims** and select the custom attribute. Click **OK**.
-6. Click **Save** at the top of the blade.
-
-You can use the "Run now" feature on the policy to verify the consumer experience. You should now see "ShoeSize" in the list of attributes collected during consumer sign-up, and see it in the token sent back to your application.
-
-## Notes
-* Along with sign-up policies, custom attributes can also be used in sign-up or sign-in policies and profile editing policies.
-* There is a known limitation of custom attributes. It is only created the first time it is used in any policy, and not when you add it to the list of **User attributes**.
+
+1. Sign in to the [Azure portal](https://portal.azure.com/) as the global administrator of your Azure AD B2C tenant.
+2. Make sure you're using the directory that contains your Azure AD B2C tenant by switching to it in the top-right corner of the Azure portal. Select your subscription information, and then select **Switch Directory**. 
+
+    ![Switch to your Azure AD B2C tenant](./media/active-directory-b2c-reference-custom-attr/switch-directories.png)
+
+    Choose the directory that contains your tenant.
+
+    ![Select directory](./media/active-directory-b2c-reference-custom-attr/select-directory.png)
+
+3. Choose **All services** in the top-left corner of the Azure portal, search for and select **Azure AD B2C**.
+4. Select **User attributes**, and then select **Add**.
+5. Provide a **Name** for the custom attribute (for example, "ShoeSize")
+6. Choose a **Data Type**. Only **String**, **Boolean**, and **Int** are available.
+7. Optionally, enter a **Description** for informational purposes. 
+8. Click **Create**.
+
+The custom attribute is now available in the list of **User attributes** and for use in your policies. A custom attribute is only created the first time it is used in any policy, and not when you add it to the list of **User attributes**.
+
+## Use a custom attribute in your policy
+
+1. In your Azure AD B2C tenant, select **Sign-up or sign-in policies**.
+2. Select your policy (for example, "B2C_1_SignupSignin") to open it. 
+3. Click **Edit**.
+4. Select **Sign-up attributes** and then select the custom attribute (for example, "ShoeSize"). Click **OK**.
+5. Select **Application claims** and then select the custom attribute. Click **OK**.
+6. Click **Save**.
+
+You can use the **Run now** feature on the policy to verify the customer experience. You should now see **ShoeSize** in the list of attributes collected during the sign-up journey, and see it in the token sent back to your application.
 

articles/active-directory-b2c/active-directory-b2c-create-custom-attributes-profile-edit-custom.md

@@ -19,14 +19,14 @@ and other identity management tasks to your mobile and desktop apps. This articl
 
 <!-- TODO: Need link to libraries -->
 
-The OAuth 2.0 authorization code flow is described in [section 4.1 of the OAuth 2.0 specification](http://tools.ietf.org/html/rfc6749). You can use it for authentication and authorization in most app types, including [web apps](active-directory-b2c-apps.md#web-apps) and [natively installed apps](active-directory-b2c-apps.md#mobile-and-native-apps). You can use the OAuth 2.0 authorization code flow to securely acquire *access tokens* for your apps, which can be used to access resources that are secured by an [authorization server](active-directory-b2c-reference-protocols.md#the-basics).
+The OAuth 2.0 authorization code flow is described in [section 4.1 of the OAuth 2.0 specification](http://tools.ietf.org/html/rfc6749). You can use it for authentication and authorization in most [application types](active-directory-b2c-apps.md), including web applications and natively installed applications. You can use the OAuth 2.0 authorization code flow to securely acquire access tokens for your applicationss, which can be used to access resources that are secured by an [authorization server](active-directory-b2c-reference-protocols.md).
 
-This article focuses on the **public clients** OAuth 2.0 authorization code flow. A public client is any client application that cannot be trusted to securely maintain the integrity of a secret password. This includes mobile apps, desktop apps, and essentially any application that runs on a device and needs to get access tokens. 
+This article focuses on the **public clients** OAuth 2.0 authorization code flow. A public client is any client application that cannot be trusted to securely maintain the integrity of a secret password. This includes mobile apps, desktop applications, and essentially any application that runs on a device and needs to get access tokens. 
 
 > [!NOTE]
 > To add identity management to a web app by using Azure AD B2C, use [OpenID Connect](active-directory-b2c-reference-oidc.md) instead of OAuth 2.0.
 
-Azure AD B2C extends the standard OAuth 2.0 flows to do more than simple authentication and authorization. It introduces the [policy parameter](active-directory-b2c-reference-policies.md). With built-in policies, you can use OAuth 2.0 to add user experiences to your app, such as sign-up, sign-in, and profile management. In this article, we show you how to use OAuth 2.0 and policies to implement each of these experiences in your native applications. We also show you how to get access tokens for accessing web APIs.
+Azure AD B2C extends the standard OAuth 2.0 flows to do more than simple authentication and authorization. It introduces the [policy parameter](active-directory-b2c-reference-policies.md). With built-in policies, you can use OAuth 2.0 to add user experiences to your application, such as sign-up, sign-in, and profile management. In this article, we show you how to use OAuth 2.0 and policies to implement each of these experiences in your native applications. We also show you how to get access tokens for accessing web APIs.
 
 In the example HTTP requests in this article, we use our sample Azure AD B2C directory, **fabrikamb2c.onmicrosoft.com**. We also use our sample application and policies. You can try the requests yourself by using these values, or you can replace them with your own values.
 Learn how to [get your own Azure AD B2C directory, application, and policies](#use-your-own-azure-ad-b2c-directory).
@@ -186,7 +186,7 @@ POST fabrikamb2c.onmicrosoft.com/oauth2/v2.0/token?p=b2c_1_sign_in HTTP/1.1
 Host: https://login.microsoftonline.com
 Content-Type: application/x-www-form-urlencoded
 
-grant_type=refresh_token&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access&refresh_token=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...&redirect_uri=urn:ietf:wg:oauth:2.0:oob
+grant_type=refresh_token&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&client_secret=JqQX2PNo9bpM0uEihUPzyrh&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access&refresh_token=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...&redirect_uri=urn:ietf:wg:oauth:2.0:oob
 ```
 
 | Parameter | Required? | Description |

articles/active-directory-b2c/active-directory-b2c-quickstarts-spa.md

@@ -1,4 +1,4 @@
----
+---
 title: Set up sign-up and sign-in with a Weibo account using Azure Active Directory B2C | Microsoft Docs
 description: Provide sign-up and sign-in to customers with Weibo accounts in your applications using Azure Active Directory B2C.
 services: active-directory-b2c