Merge https://github.com/MicrosoftDocs/azure-docs-pr

Author: Yi Zhong

.acrolinx-config.edn

@@ -1,4 +1,4 @@
-{:allowed-branchname-matches ["master" "release-.*" "sandbox-.*"]
+{:allowed-branchname-matches ["^master$" "^release..*"]
  :allowed-filename-matches ["articles" "includes"]
 
  :template-header

.openpublishing.redirection.json

@@ -16,8 +16,8 @@
     href: active-directory-b2c-quickstarts-spa.md
 - name: Tutorials
   items:
-  - name: 1 - Register applications
-    href: tutorial-register-applications.md
+  - name: 1 - Create B2C tenant
+    href: tutorial-create-tenant.md
   - name: 2 - Authenticate accounts
     items:
     - name: ASP.NET
@@ -157,6 +157,8 @@
         href: b2clogin.md
       - name: Using age gating
         href: basic-age-gating.md
+      - name: Direct sign-in
+        href: direct-signin.md
   - name: Identity Experience Framework
     items:
     - name: Custom policies
@@ -187,7 +189,7 @@
           href: active-directory-b2c-setup-sf-app-custom.md
       - name: Integrate RESTful APIs
         items:
-        - name: Vaildate user input
+        - name: Validate user input
           href: active-directory-b2c-rest-api-validation-custom.md
         - name: Obtain additional claims
           href: active-directory-b2c-rest-api-step-custom.md

articles/.vscode/settings.json

@@ -7,7 +7,7 @@ manager: mtillman
 
 ms.service: active-directory
 ms.workload: identity
-ms.topic: article
+ms.topic: conceptual
 ms.date: 08/09/2017
 ms.author: davidmu
 ms.component: B2C
@@ -75,7 +75,7 @@ When requesting an access token, the client application needs to specify the des
 > Currently, custom domains are not supported along with access tokens. You must use your tenantName.onmicrosoft.com domain in the request URL.
 
 ```
-https://login.microsoftonline.com/<tenantName>.onmicrosoft.com/<yourPolicyId>/oauth2/v2.0/authorize?client_id=<appID_of_your_client_application>&nonce=anyRandomValue&redirect_uri=<redirect_uri_of_your_client_application>&scope=https%3A%2F%2Fcontoso.onmicrosoft.com%2Fnotes%2Fread&response_type=code 
+https://login.microsoftonline.com/tfp/<tenantName>.onmicrosoft.com/<yourPolicyId>/oauth2/v2.0/authorize?client_id=<appID_of_your_client_application>&nonce=anyRandomValue&redirect_uri=<redirect_uri_of_your_client_application>&scope=https%3A%2F%2Fcontoso.onmicrosoft.com%2Fnotes%2Fread&response_type=code 
 ```
 
 To acquire multiple permissions in the same request, you can add multiple entries in the single **scope** parameter, separated by spaces. For example:

articles/active-directory-b2c/TOC.yml

@@ -7,7 +7,7 @@ manager: mtillman
 
 ms.service: active-directory
 ms.workload: identity
-ms.topic: get-started-article
+ms.topic: conceptual
 ms.date: 6/13/2017
 ms.author: davidmu
 ms.component: B2C

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

@@ -7,7 +7,7 @@ manager: mtillman
 
 ms.service: active-directory
 ms.workload: identity
-ms.topic: hero-article
+ms.topic: conceptual
 ms.date: 12/06/2016
 ms.author: davidmu1
 ms.component: B2C

articles/active-directory-b2c/active-directory-b2c-app-registration.md

@@ -7,7 +7,7 @@ manager: mtillman
 
 ms.service: active-directory
 ms.workload: identity
-ms.topic: article
+ms.topic: conceptual
 ms.date: 04/29/2017
 ms.author: davidmu
 ms.component: B2C

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

@@ -6,7 +6,7 @@ author: davidmu1
 manager: mtillman
 
 ms.service: active-directory
-ms.topic: article
+ms.topic: conceptual
 ms.workload: identity
 ms.date: 04/16/2018
 ms.author: davidmu
@@ -282,7 +282,6 @@ Referenced using {OIDC:One of the property names below}
 |  MaxAge | max_age | N/A |
 | ClientId | client_id | N/A |
 | Username | login_hint | N/A |
-| Password | domain_hint | N/A |
 |  Resource | resource| N/A |
 | AuthenticationContextReferences | acr_values | N/A |
 
@@ -300,11 +299,11 @@ Here's a sample request from the application:
 https://login.microsoftonline.com/sampletenant.onmicrosoft.com/oauth2/v2.0/authorize?p=B2C_1A_signup_signin&client_id=e1d2612f-c2bc-4599-8e7b-d874eaca1ae1&nonce=defaultNonce&redirect_uri=https%3A%2F%2Fjwt.ms&scope=openid&response_type=id_token&prompt=login&app_session=0a2b45c&loyalty_number=1234567
 
 ```
-You can then add the claims by adding an `Input Claim` element to the Application Insights event:
+You can then add the claims by adding an `Input Claim` element to the Application Insights event. Properties of an event are added through the syntax {property:NAME}, where NAME is property being added to the event. For example:
 
 ```
-<InputClaim ClaimTypeReferenceId="app_session" PartnerClaimType="app_session" DefaultValue="{OAUTH-KV:app_session}" />
-<InputClaim ClaimTypeReferenceId="loyalty_number" PartnerClaimType="loyalty_number" DefaultValue="{OAUTH-KV:loyalty_number}" />
+<InputClaim ClaimTypeReferenceId="app_session" PartnerClaimType="{property:app_session}" DefaultValue="{OAUTH-KV:app_session}" />
+<InputClaim ClaimTypeReferenceId="loyalty_number" PartnerClaimType="{property:loyalty_number}" DefaultValue="{OAUTH-KV:loyalty_number}" />
 ```
 
 ### Other system claims