Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into asc-melvyn-minortweaks

Author: memildin

.openpublishing.publish.config.json

@@ -429,6 +429,12 @@
       "branch": "cli-preview",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "terraform",
+      "url": "https://github.com/Azure/terraform",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-qnamaker-nodejs",
       "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-nodejs",

.openpublishing.redirection.active-directory.json

@@ -10509,6 +10509,11 @@
             "source_path": "articles/active-directory/privileged-identity-management/pim-resource-roles-start-access-review.md",
             "redirect_url": "/azure/active-directory/privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review",
             "redirect_document_id": false
-        }
+        },
+        {
+            "source_path_from_root": "/articles/active-directory-b2c/troubleshoot-custom-policies.md",
+            "redirect_url": "/azure/active-directory-b2c/troubleshoot",
+            "redirect_document_id": false
+          }
     ]
 }

.openpublishing.redirection.iot-hub.json

@@ -125,6 +125,16 @@
       "redirect_url": "/azure/iot-hub/about-iot-hub",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/iot-hub/about-iot-hub.md",
+      "redirect_url": "/azure/iot-hub/iot-concepts-and-iot-hub",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-concepts.md",
+      "redirect_url": "/azure/iot-hub/iot-concepts-and-iot-hub",
+      "redirect_document_id": false
+    },   
     {
       "source_path_from_root": "/articles/iot-hub/quickstart-send-telemetry-xamarinforms.md",
       "redirect_url": "/azure/iot-hub/about-iot-hub",

.openpublishing.redirection.json

@@ -28129,7 +28129,7 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/blobs/storage-blob-storage-tiers.md",
+      "source_path_from_root": "/articles/storage/blobs/storage-blob-storage-tiers.md",
       "redirect_url": "/azure/storage/blobs/access-tiers-overview",
       "redirect_document_id": true
     },
@@ -46412,7 +46412,36 @@
       "source_path_from_root": "/articles/iot-dps/quick-enroll-device-tpm-python.md",
       "redirect_url": "/azure/iot-dps/quick-enroll-device-tpm",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/quickstarts/get-started-with-form-recognizer.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/quickstarts/try-sample-label-tool",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/quickstarts/client-library.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/quickstarts/try-sdk-rest-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/concept-receipts.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/concept-receipt",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/concept-business-cards.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/concept-business-card",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/concept-identification-cards.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/concept-id-document",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/concept-invoices.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/concept-invoice",
+      "redirect_document_id": false
     }
-
   ]
-}
+}

CODEOWNERS

@@ -1,91 +1,90 @@
 # Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
+#
+# Help: https://docs.github.com/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+# Background: https://github.blog/2017-07-06-introducing-code-owners/
+# NOTE: The people you choose as code owners must have _write_ permissions for the repository. When the code owner is a team, that team must be _visible_ and it must have _write_ permissions, even if all the individual members of the team already have write permissions directly, through organization membership, or through another team membership.
 
-# Horizontals
-
-## Azure Policy: Samples and Compliance Controls
-articles/**/policy-reference.md @DCtheGeek
-articles/**/security-controls-policy.md @DCtheGeek
-includes/policy/ @DCtheGeek
+# Azure Policy: Samples and Compliance Controls
+/articles/**/policy-reference.md @DCtheGeek
+/articles/**/security-controls-policy.md @DCtheGeek
+/includes/policy/ @DCtheGeek
 
 # Azure Monitor
-
-articles/azure-monitor/* @bwren
-articles/azure-monitor/agents @bwren
-articles/azure-monitor/alerts @rboucher
-articles/azure-monitor/app @bwren @lgayhardt
-articles/azure-monitor/autoscale @rboucher
-articles/azure-monitor/containers @bwren
-articles/azure-monitor/essentials @bwren @rboucher
-articles/azure-monitor/insights @bwren @rboucher @lgayhardt
-articles/azure-monitor/logs @bwren
-articles/azure-monitor/visualize @bwren @lgayhardt
-articles/azure-monitor/vm @bwren
-articles/advisor @rboucher
-articles/service-health @rboucher
+/articles/azure-monitor/* @bwren
+/articles/azure-monitor/agents @bwren
+/articles/azure-monitor/alerts @rboucher
+/articles/azure-monitor/app @bwren @lgayhardt
+/articles/azure-monitor/autoscale @rboucher
+/articles/azure-monitor/containers @bwren
+/articles/azure-monitor/essentials @bwren @rboucher
+/articles/azure-monitor/insights @bwren @rboucher @lgayhardt
+/articles/azure-monitor/logs @bwren
+/articles/azure-monitor/visualize @bwren @lgayhardt
+/articles/azure-monitor/vm @bwren
+/articles/advisor @rboucher
+/articles/service-health @rboucher
 
 # Azure Active Directory
-
-articles/active-directory-b2c/ @msmimart @yoelhor
-articles/active-directory/app-provisioning/ @CelesteDG
-articles/active-directory/develop/ @mmacy
-articles/active-directory/manage-apps/ @CelesteDG
+/articles/active-directory-b2c/ @msmimart @yoelhor
+/articles/active-directory/app-provisioning/ @CelesteDG
+/articles/active-directory/develop/ @mmacy
+/articles/active-directory/manage-apps/ @CelesteDG
 
 # Azure Synapse Analytics
-articles/synapse-analytics/ @julieMSFT [email protected] @ryanmajidi @saveenr 
-articles/synapse-analytics/backuprestore/ @joannapea @julieMSFT
-articles/synapse-analytics/catalog-governance/@djpmsft @chanuengg 
-articles/synapse-analytics/ccid/ @liudan66 @julieMSFT
-articles/synapse-analytics/data-integration/ @kromerm @jonburchel 
-articles/synapse-analytics/machine-learning/ @garyericson @NelGson @midesa 
-articles/synapse-analytics/metadata/@MikeRys @julieMSFT @jocaplan
-articles/synapse-analytics/security/ @RonyMSFT  @nanditavalsan @meenalsri @julieMSFT
-articles/synapse-analytics/spark/ @euangms @mlee3gsd @midesa 
-articles/synapse-analytics/sql/ @filippopovic @azaricstefan @anumjs @WilliamDAssafMSFT @jovanpop-msft
-articles/synapse-analytics/sql-data-warehouse/ @anumjs @ronortloff @julieMSFT
-articles/synapse-analytics/synapse-link/ @Rodrigossz @SnehaGunda @jovanpop-msft
+/articles/synapse-analytics/ @julieMSFT @ryanmajidi @saveenr 
+/articles/synapse-analytics/backuprestore/ @joannapea @julieMSFT
+/articles/synapse-analytics/catalog-governance/@djpmsft @chanuengg 
+/articles/synapse-analytics/ccid/ @liudan66 @julieMSFT
+/articles/synapse-analytics/data-integration/ @kromerm @jonburchel 
+/articles/synapse-analytics/machine-learning/ @garyericson @NelGson @midesa 
+/articles/synapse-analytics/metadata/@MikeRys @julieMSFT @jocaplan
+/articles/synapse-analytics/security/ @RonyMSFT  @nanditavalsan @meenalsri @julieMSFT
+/articles/synapse-analytics/spark/ @euangms @mlee3gsd @midesa 
+/articles/synapse-analytics/sql/ @filippopovic @azaricstefan @anumjs @WilliamDAssafMSFT @jovanpop-msft
+/articles/synapse-analytics/sql-data-warehouse/ @anumjs @ronortloff @julieMSFT
+/articles/synapse-analytics/synapse-link/ @Rodrigossz @SnehaGunda @jovanpop-msft
 
 # Cognitive Services
-articles/cognitive-services/ @aahill @patrickfarley @nitinme @mrbullwinkle @laujan
+/articles/cognitive-services/ @aahill @patrickfarley @nitinme @mrbullwinkle @laujan
 
 # DevOps
-articles/ansible/ @TomArcherMsft
-articles/chef/ @TomArcherMsft
-articles/jenkins/ @TomArcherMsft
-articles/terraform/ @TomArcherMsft
+/articles/ansible/ @TomArcherMsft
+/articles/chef/ @TomArcherMsft
+/articles/jenkins/ @TomArcherMsft
+/articles/terraform/ @TomArcherMsft
 
 # compute
-articles/virtual-machines/ @cynthn @mimckitt
-articles/virtual-machine-scale-sets/ @ju-shim @mimckitt
-articles/cloud-services/ @mimckitt
-articles/cloud-services-extended-support/ @mimckitt
-articles/service-fabric/ @sukanyamsft @mimckitt
-articles/container-instances/ @macolso @mimckitt
-articles/container-registry/ @dlepow @mimckitt
+/articles/virtual-machines/ @cynthn @mimckitt
+/articles/virtual-machine-scale-sets/ @ju-shim @mimckitt
+/articles/cloud-services/ @mimckitt
+/articles/cloud-services-extended-support/ @mimckitt
+/articles/service-fabric/ @sukanyamsft @mimckitt
+/articles/container-instances/ @macolso @mimckitt
+/articles/container-registry/ @dlepow @mimckitt
 
 # Requires Internal Review
-articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking
+/articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking
 
 # Governance
-articles/governance/ @DCtheGeek
+/articles/governance/ @DCtheGeek
 
 # Security
-articles/security/fundamentals/feature-availability.md @msmbaldwin @terrylanfear
+/articles/security/fundamentals/feature-availability.md @msmbaldwin @terrylanfear
 
 # Azure Security Center
-articles/security-center/ @memildin
-includes/*security-controls*.md @memildin
+/articles/security-center/ @memildin
+/includes/*security-controls*.md @memildin
 
 # DDOS Protection
-
-articles/ddos-protection @aletheatoh @anupamvi
+/articles/ddos-protection @aletheatoh @anupamvi
 
 # Lighthouse
-articles/lighthouse/ @JnHs
+/articles/lighthouse/ @JnHs
 
 # Healthcare APIs
-articles/healthcare-apis/ @ginalee-dotcom
+/articles/healthcare-apis/ @ginalee-dotcom
 
 # Configuration
-*.json @SyntaxC4 @snoviking @martinekuan
-.acrolinx-config.edn @MonicaRush @martinekuan
-articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @martinekuan
+*.json @SyntaxC4 @snoviking
+.acrolinx-config.edn @MonicaRush 
+articles/zone-pivot-groups.yml @SyntaxC4 @snoviking

articles/active-directory-b2c/TOC.yml

@@ -398,15 +398,13 @@
       displayName: rest claims exchange
     - name: Secure an API connector
       href: secure-rest-api.md
-  - name: Custom policy
+  - name: Troubleshooting
     items:
-    - name: Troubleshooting
-      items:
-      - name: Collect logs using Application Insights
-        href: troubleshoot-with-application-insights.md
-        displayName: troubleshooting, app insights
-      - name: Troubleshooting custom policies
-        href: troubleshoot-custom-policies.md
+    - name: Collect logs using Application Insights
+      href: troubleshoot-with-application-insights.md
+      displayName: troubleshooting, app insights
+    - name: Troubleshooting and error handling
+      href: troubleshoot.md
   - name: UserInfo endpoint
     href: userinfo-endpoint.md
   - name: Partner integration

articles/active-directory-b2c/add-password-reset-policy.md

@@ -335,6 +335,9 @@ Custom policies are a set of XML files that you upload to your Azure AD B2C tena
 
 ::: zone-end
 
+## Troubleshoot Azure AD B2C user flows and custom policies
+Your application needs to handle certain errors coming from Azure B2C service. Learn [how to troubleshoot Azure AD B2C's user flows and custom policies](troubleshoot.md).
+
 ## Next steps
 
 Set up a [force password reset](force-password-reset.md).

articles/active-directory-b2c/add-ropc-policy.md

@@ -50,15 +50,18 @@ When using the ROPC flow, consider the following:
 
 ##  Create a resource owner user flow
 
-1. Sign in to the Azure portal as the global administrator of your Azure AD B2C tenant.
-2. To switch to your Azure AD B2C tenant, select the B2C directory in the upper-right corner of the portal.
-3. Select **User flows**, and select **New user flow**.
-4. Select **Sign in using resource owner password credentials (ROPC)**.
-5. Under **Version**, make sure **Preview** is selected, and then select **Create**.
-7. Provide a name for the user flow, such as *ROPC_Auth*.
-8. Under **Application claims**, click **Show more**.
-9. Select the application claims that you need for your application, such as Display Name, Email Address, and Identity Provider.
-10. Select **OK**, and then select **Create**.
+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:
+    1. Select the **Directories + subscriptions** icon in the portal toolbar.
+    1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
+1. In the Azure portal, search for and select **Azure AD B2C**.
+1. Select **User flows**, and select **New user flow**.
+1. Select **Sign in using resource owner password credentials (ROPC)**.
+1. Under **Version**, make sure **Preview** is selected, and then select **Create**.
+1. Provide a name for the user flow, such as *ROPC_Auth*.
+1. Under **Application claims**, click **Show more**.
+1. Select the application claims that you need for your application, such as Display Name, Email Address, and Identity Provider.
+1. Select **OK**, and then select **Create**.
 
 ::: zone-end
 

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

@@ -32,11 +32,11 @@ To verify that the b2c-extensions-app is present:
 
 If you accidentally deleted the b2c-extensions-app, you have 30 days to recover it. You can restore the app using the Graph API:
 
-1. Browse to [https://graphexplorer.azurewebsites.net/](https://graphexplorer.azurewebsites.net/).
+1. Browse to [https://developer.microsoft.com/en-us/graph/graph-explorer](https://developer.microsoft.com/en-us/graph/graph-explorer).
 1. Log in to the site as a global administrator for the Azure AD B2C directory that you want to restore the deleted app for. This global administrator must have an email address similar to the following: `username@{yourTenant}.onmicrosoft.com`.
-1. Issue an HTTP GET against the URL `https://graph.windows.net/myorganization/deletedApplications` with api-version=1.6. This operation will list all of the applications that have been deleted within the past 30 days.
+1. Issue an HTTP GET against the URL `https://graph.microsoft.com/beta/directory/deleteditems/microsoft.graph.application`. This operation will list all of the applications that have been deleted within the past 30 days.
 1. Find the application in the list where the name begins with 'b2c-extensions-app’ and copy its `objectid` property value.
-1. Issue an HTTP POST against the URL `https://graph.windows.net/myorganization/deletedApplications/{OBJECTID}/restore`. Replace the `{OBJECTID}` portion of the URL with the `objectid` from the previous step.
+1. Issue an HTTP POST against the URL `https://graph.microsoft.com/beta/directory/deleteditems/{id}/restore`. Replace the `{id}` portion of the URL with the `objectid` from the previous step.
 
 You should now be able to [see the restored app](#verifying-that-the-extensions-app-is-present) in the Azure portal.
 

articles/active-directory-b2c/overview.md

@@ -1,6 +1,6 @@
 ---
 title: What is Azure Active Directory B2C?
-description: Learn how you can use Azure Active Directory B2C to support external identities in your applications, including social login with Facebook, Google, and other identity providers.
+description: Learn how you can use Azure Active Directory B2C to support external identities in your applications, including social sign up with Facebook, Google, and other identity providers.
 services: active-directory-b2c
 author: msmimart
 manager: celestedg
@@ -21,10 +21,10 @@ Azure Active Directory B2C provides business-to-customer identity as a service.
 
 Azure AD B2C is a customer identity access management (CIAM) solution capable of supporting millions of users and billions of authentications per day. It takes care of the scaling and safety of the authentication platform, monitoring, and automatically handling threats like denial-of-service, password spray, or brute force attacks.
 
-Azure AD B2C is a separate service from [Azure Active Directory (Azure AD)](../active-directory/fundamentals/active-directory-whatis.md). It is built on the same technology as Azure AD but for a different purpose - to allow businesses build customer facing application and then allow anyone to sign up into those applications with no restrictions on user account.
+Azure AD B2C is a separate service from [Azure Active Directory (Azure AD)](../active-directory/fundamentals/active-directory-whatis.md). It is built on the same technology as Azure AD but for a different purpose. It allows businesses to build customer facing application, and then allow anyone to sign up into those applications with no restrictions on user account.
 
 ## Who uses Azure AD B2C?
-Any business or individual who wishes to allow anyone to sign up to their web/mobile applications. 
+Any business or individual who wishes to authenticate end users to their web/mobile applications using a white-label authentication solution. Apart from authentication, Azure AD B2C service is used for authorization such as access to API resources by authenticated users. Azure AD B2C is meant to be used by **IT administrators** and **developers**.
 
 ## Custom-branded identity solution