Fix merge conflict

Author: dominicbetts

.github/CODEOWNERS

@@ -6,8 +6,19 @@
 # articles/application-insights/  @SergeyKanzhelev
 # articles/cosmos-db/ @mimig1
 
+# All Articles
 articles/ @apex-docs-pr-reviewers
+
+# Cognitive Services
 articles/cognitive-services/ @nitinme @tchristiani @cjgronlund
+articles/cognitive-services/LUIS/ @cjgronlund @nitinme @diberry
+articles/cognitive-services/Speaker-recognition/ @cjgronlund @nitinme @erhopf
+articles/cognitive-services/Speech-Service/ @cjgronlund @nitinme @erhopf
+articles/cognitive-services/Translator/ @cjgronlund @nitinme @erhopf
+articles/cognitive-services/QnAMaker/ @cjgronlund @nitinme @diberry
+
+# DevOps
+
 articles/ansible/ @TomArcher
 articles/chef/ @TomArcher
 articles/jenkins/ @TomArcher

.github/CONTRIBUTING.md

@@ -7,7 +7,7 @@ This guide covers some general topics around contribution and refers out to our
 ## 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.
 
 ## How can I contribute?
 

.openpublishing.publish.config.json

@@ -212,11 +212,41 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "remote-monitoring-webui",
+      "url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-qnamaker-nodejs",
       "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-nodejs",
       "branch": "master",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "samples-qnamaker-go",
+      "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-go",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "samples-qnamaker-csharp",
+      "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-csharp",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "samples-qnamaker-java",
+      "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-java",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "samples-qnamaker-python",
+      "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-python",
+      "branch": "master",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.json

@@ -8,9 +8,9 @@ Contributing to open source is more than just providing updates, it's also letti
 
 ### Prerequisites
 
-You've decided to provide a contribution, that's great! There are a few tools which are needed to contribute to the documentation.
+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 [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 [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
 
 #### Download
 
@@ -31,4 +31,4 @@ Please refer to [LICENSE](.github/LICENSE), [LICENSE-CODE](.github/LICENSE-CODE)
 ## 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

@@ -34,6 +34,8 @@
       href: active-directory-b2c-tutorials-desktop-app-webapi.md
     - name: Single page
       href: active-directory-b2c-tutorials-spa-webapi.md
+  - name: Customize the UI
+    href: tutorial-customize-ui.md
 - name: Samples
   href: code-samples.md
 - name: Concepts
@@ -62,6 +64,8 @@
     href: active-directory-b2c-reference-tokens.md
   - name: User accounts
     href: user-overview.md
+  - name: User interface customization
+    href: customize-ui-overview.md
 - name: How-to guides
   items:
   - name: Access audit logs 
@@ -72,11 +76,6 @@
     href: active-directory-b2c-reference-language-customization.md
   - name: Customize password
     href: active-directory-b2c-reference-password-complexity.md
-  - name: Customize user interface
-    href: active-directory-b2c-reference-ui-customization.md
-    items:
-    - name: Helper tool for customization
-      href: active-directory-b2c-reference-ui-customization-helper-tool.md
   - name: Define custom attributes
     href: active-directory-b2c-reference-custom-attr.md
   - name: Disable email verification
@@ -103,6 +102,8 @@
         href: active-directory-b2c-custom-rest-api-netfw-secure-cert.md
     - name: OIDC/OAUTH providers
       items:
+      - name: Amazon
+        href: setup-amazon-custom.md
       - name: Azure AD (Single-Tenant)
         href: active-directory-b2c-setup-aad-custom.md
       - name: Azure AD (Multi-Tenant) 
@@ -141,6 +142,8 @@
         href: active-directory-b2c-reference-kmsi-custom.md
     - name: Reference
       items:
+      - name: Claim resolvers
+        href: claim-resolver-overview.md
       - name: Identity Experience Framework schema
         items:
         - name: TrustFrameworkPolicy

articles/active-directory-b2c/TOC.yml

@@ -15,7 +15,7 @@ ms.component: B2C
 ---
 # Azure AD B2C: Requesting access tokens
 
-An access token (denoted as **access\_token** in the responses from Azure AD B2C) is a form of security token that a client can use to access resources that are secured by an [authorization server](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-reference-protocols#the-basics), such as a web API. Access tokens are represented as [JWTs](https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-reference-tokens#types-of-tokens) and contain information about the intended resource server and the granted permissions to the server. When calling the resource server, the access token must be present in the HTTP request.
+An access token (denoted as **access\_token** in the responses from Azure AD B2C) is a form of security token that a client can use to access resources that are secured by an [authorization server](active-directory-b2c-reference-protocols.md), such as a web API. Access tokens are represented as [JWTs](active-directory-b2c-reference-tokens.md) and contain information about the intended resource server and the granted permissions to the server. When calling the resource server, the access token must be present in the HTTP request.
 
 This article discusses how to configure a client application and web API in order to obtain an **access\_token**.
 
@@ -33,22 +33,22 @@ Before requesting an access token, you first need to register a web API and publ
 ### Register a web API
 
 1. On the Azure AD B2C features menu on the Azure portal, click **Applications**.
-1. Click **+Add** at the top of the menu.
-1. Enter a **Name** for the application that will describe your application to consumers. For example, you could enter "Contoso API".
-1. Toggle the **Include web app / web API** switch to **Yes**.
-1. Enter an arbitrary value for the **Reply URLs**. For example, enter `https://localhost:44316/`. The value does not matter since an API should not be receiving the token directly from Azure AD B2C.
-1. Enter an **App ID URI**. This is the identifier used for your web API. For example, enter 'notes' in the box. The **App ID URI** would then be `https://{tenantName}.onmicrosoft.com/notes`.
-1. Click **Create** to register your application.
-1. Click the application that you just created and copy down the globally unique **Application Client ID** that you'll use later in your code.
+2. Click **+Add** at the top of the menu.
+3. Enter a **Name** for the application that will describe your application to consumers. For example, you could enter "Contoso API".
+4. Toggle the **Include web app / web API** switch to **Yes**.
+5. Enter an arbitrary value for the **Reply URLs**. For example, enter `https://localhost:44316/`. The value does not matter since an API should not be receiving the token directly from Azure AD B2C.
+6. Enter an **App ID URI**. This is the identifier used for your web API. For example, enter 'notes' in the box. The **App ID URI** would then be `https://{tenantName}.onmicrosoft.com/notes`.
+7. Click **Create** to register your application.
+8. Click the application that you just created and copy down the globally unique **Application Client ID** that you'll use later in your code.
 
 ### Publishing permissions
 
 Scopes, which are analogous to permissions, are necessary when your app is calling an API. Some examples of scopes are "read" or "write". Suppose you want your web or native app to "read" from an API. Your app would call Azure AD B2C and request an access token that gives access to the scope "read". In order for Azure AD B2C to emit such an access token, the app needs to be granted permission to "read" from the specific API. To do this, your API first needs to publish the "read" scope.
 
 1. Within the Azure AD B2C **Applications** menu, open the web API application ("Contoso API").
-1. Click on **Published scopes**. This is where you define the permissions (scopes) that can be granted to other applications.
-1. Add **Scope Values** as necessary (for example, "read"). By default, the "user_impersonation" scope will be defined. You can ignore this if you wish. Enter a description of the scope in the **Scope Name** column.
-1. Click **Save**.
+2. Click on **Published scopes**. This is where you define the permissions (scopes) that can be granted to other applications.
+3. Add **Scope Values** as necessary (for example, "read"). By default, the "user_impersonation" scope will be defined. You can ignore this if you wish. Enter a description of the scope in the **Scope Name** column.
+4. Click **Save**.
 
 > [!IMPORTANT]
 > The **Scope Name** is the description of the **Scope Value**. When using the scope, make sure to use the **Scope Value**.
@@ -58,11 +58,11 @@ Scopes, which are analogous to permissions, are necessary when your app is calli
 Once an API is configured to publish scopes, the client application needs to be granted those scopes via the Azure portal.
 
 1. Navigate to the **Applications** menu in the Azure AD B2C features menu.
-1. Register a client application ([web app](active-directory-b2c-app-registration.md#register-a-web-app) or [native client](active-directory-b2c-app-registration.md#register-a-mobile-or-native-app)) if you don’t have one already. If you are following this guide as your starting point, you'll need to register a client application.
-1. Click on **API access**.
-1. Click on **Add**.
-1. Select your web API and the scopes (permissions) you would like to grant.
-1. Click **OK**.
+2. Register a client application ([web app](active-directory-b2c-app-registration.md) or [native client](active-directory-b2c-app-registration.md)) if you don’t have one already. If you are following this guide as your starting point, you'll need to register a client application.
+3. Click on **API access**.
+4. Click on **Add**.
+5. Select your web API and the scopes (permissions) you would like to grant.
+6. Click **OK**.
 
 > [!NOTE]
 > Azure AD B2C does not ask your client application users for their consent. Instead, all consent is provided by the admin, based on the permissions configured between the applications described above. If a permission grant for an application is revoked, all users who were previously able to acquire that permission will no longer be able to do so.