Merge pull request #175030 from MicrosoftDocs/master

Merge Master to Live, 4 AM

Author: PMEds28

.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
     }
-
   ]
-}
+}

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
 

articles/active-directory-b2c/technical-overview.md

@@ -296,6 +296,12 @@ By integrating Azure Application Insights into Azure AD B2C custom policies, you
 
 For more information, see [Track user behavior in Azure Active Directory B2C using Application Insights](analytics-with-application-insights.md).
 
+## Automation using Microsoft Graph API
+
+Use MS graph API to manage your Azure AD B2C directory. You can also create the Azure AD B2C directory itself. You can manage users, identity providers, user flows, custom policies and many more. 
+
+Learn more about how to [Manage Azure AD B2C with Microsoft Graph](microsoft-graph-operations.md). 
+
 ## Azure AD B2C service limits and restrictions
 Learn more about [Azure AD B2C service limits and restrictions](service-limits.md)
 

articles/active-directory/saas-apps/klaxoon-provisioning-tutorial.md

@@ -0,0 +1,159 @@
+---
+title: 'Tutorial: Configure Klaxoon for automatic user provisioning with Azure Active Directory | Microsoft Docs'
+description: Learn how to automatically provision and de-provision user accounts from Azure AD to Klaxoon.
+services: active-directory
+documentationcenter: ''
+author: twimmer
+writer: Thwimmer
+manager: beatrizd
+
+ms.assetid: b7a61926-171c-415b-858f-54f6e53515f2
+ms.service: active-directory
+ms.subservice: saas-app-tutorial
+ms.workload: identity
+ms.tgt_pltfrm: na
+ms.devlang: na
+ms.topic: article
+ms.date: 09/22/2021
+ms.author: Thwimmer
+---
+
+# Tutorial: Configure Klaxoon for automatic user provisioning
+
+This tutorial describes the steps you need to perform in both Klaxoon and Azure Active Directory (Azure AD) to configure automatic user provisioning. When configured, Azure AD automatically provisions and de-provisions users and groups to [Klaxoon](https://www.Klaxoon.com/) using the Azure AD Provisioning service. For important details on what this service does, how it works, and frequently asked questions, see [Automate user provisioning and deprovisioning to SaaS applications with Azure Active Directory](../app-provisioning/user-provisioning.md). 
+
+
+## Capabilities supported
+> [!div class="checklist"]
+> * Create users in Klaxoon.
+> * Disable users in Klaxoon when they do not require access anymore.
+> * Keep user attributes synchronized between Azure AD and Klaxoon.
+> * Provide licenses to users in Klaxoon based on Azure AD Groups.
+> * [Single sign-on](klaxoon-saml-tutorial.md) to Klaxoon (recommended).
+
+## Prerequisites
+
+The scenario outlined in this tutorial assumes that you already have the following prerequisites:
+
+* [An Azure AD tenant](../develop/quickstart-create-new-tenant.md). 
+* A user account in Azure AD with [permission](../roles/permissions-reference.md) to configure provisioning (for example, Application Administrator, Cloud Application administrator, Application Owner, or Global Administrator). 
+* An existing [Klaxoon contract](https://klaxoon.com/enterprise).
+
+## Step 1. Plan your provisioning deployment
+1. Learn about [how the provisioning service works](../app-provisioning/user-provisioning.md).
+1. Determine who will be in [scope for provisioning](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
+1. Determine what data to [map between Azure AD and Klaxoon](../app-provisioning/customize-application-attributes.md). 
+
+## Step 2. Configure Klaxoon to support provisioning with Azure AD
+
+* Contact [Klaxoon](https://klaxoon.com/) to receive a unique **Tenant URL** and a **Secret Token**.
+
+## Step 3. Add Klaxoon from the Azure AD application gallery
+
+Add Klaxoon from the Azure AD application gallery to start managing provisioning to Klaxoon. If you have previously setup Klaxoon for SSO you can use the same application. However it is recommended that you create a separate app when testing out the integration initially. Learn more about adding an application from the gallery [here](../manage-apps/add-application-portal.md). 
+
+## Step 4. Define who will be in scope for provisioning 
+
+The Azure AD provisioning service allows you to scope who will be provisioned based on assignment to the application and or based on attributes of the user / group. If you choose to scope who will be provisioned to your app based on assignment, you can use the following [steps](../manage-apps/assign-user-or-group-access-portal.md) to assign users and groups to the application. If you choose to scope who will be provisioned based solely on attributes of the user or group, you can use a scoping filter as described [here](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
+
+* When assigning users and groups to Klaxoon, you must select a role other than **Default Access**. Users with the Default Access role are excluded from provisioning and will be marked as not effectively entitled in the provisioning logs. If the only role available on the application is the default access role, you can [update the application manifest](../develop/howto-add-app-roles-in-azure-ad-apps.md) to add additional roles. 
+
+* Start small. Test with a small set of users and groups before rolling out to everyone. When scope for provisioning is set to assigned users and groups, you can control this by assigning one or two users or groups to the app. When scope is set to all users and groups, you can specify an [attribute based scoping filter](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md). 
+
+
+## Step 5. Configure automatic user provisioning to Klaxoon 
+
+This section guides you through the steps to configure the Azure AD provisioning service to create, update, and disable users and/or groups in Klaxoon based on user and/or group assignments in Azure AD.
+
+### To configure automatic user provisioning for Klaxoon in Azure AD:
+
+1. Sign in to the [Azure portal](https://portal.azure.com). Select **Enterprise Applications**, then select **All applications**.
+
+	![Enterprise applications blade](common/enterprise-applications.png)
+
+1. In the applications list, select **Klaxoon**.
+
+	![The Klaxoon link in the Applications list](common/all-applications.png)
+
+1. Select the **Provisioning** tab.
+
+	![Provisioning tab](common/provisioning.png)
+
+1. Set the **Provisioning Mode** to **Automatic**.
+
+	![Provisioning tab automatic](common/provisioning-automatic.png)
+
+1. Under the **Admin Credentials** section, input your Klaxoon Tenant URL and Secret Token provided by Klaxoon. Click **Test Connection** to ensure Azure AD can connect to Klaxoon. If the connection fails, please contact Klaxoon to check your account setup.
+
+ 	![Token](common/provisioning-testconnection-tenanturltoken.png)
+
+1. In the **Notification Email** field, enter the email address of a person or group who should receive the provisioning error notifications and select the **Send an email notification when a failure occurs** check box.
+
+	![Notification Email](common/provisioning-notification-email.png)
+
+1. Select **Save**.
+
+1. Under the **Mappings** section, select **Synchronize Azure Active Directory Users to Klaxoon**.
+
+1. Review the user attributes that are synchronized from Azure AD to Klaxoon in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the user accounts in Klaxoon for update operations. If you choose to change the [matching target attribute](../app-provisioning/customize-application-attributes.md), you will need to ensure that the Klaxoon API supports filtering users based on that attribute. Select the **Save** button to commit any changes.
+
+   |Attribute|Type|Supported for filtering|Required by Klaxoon|
+   |---|---|---|---|
+   |userName|String|✓|✓|
+   |emails[type eq "work"].value|String|✓|✓|
+   |externalId|String||✓|
+   |name.givenName|String||✓|
+   |name.familyName|String||✓|
+   |active|Boolean||✓|
+
+1. Under the **Mappings** section, select **Synchronize Azure Active Directory Groups to Klaxoon**.
+
+1. Review the group attributes that are synchronized from Azure AD to Klaxoon in the **Attribute-Mapping** section. The attributes selected as **Matching** properties are used to match the groups in Klaxoon for update operations. Select the **Save** button to commit any changes.
+
+      |Attribute|Type|Supported for filtering|Required by Klaxoon|
+      |---|---|---|---|
+      |displayName|String|✓|✓
+      |externalId|String||✓
+      |members|Reference||
+      |urn:ietf:params:scim:schemas:extension:klaxoon:2.0:Group:license|String||
+
+
+1. Define **urn:ietf:params:scim:schemas:extension:klaxoon:2.0:Group:license** attribute to provide Klaxoon PRO licenses to users linked to a group.
+
+      |Value|Group with Klaxoon PRO license|
+      |---|---|
+      |true|✓|
+      |false|No|
+      |not specified (default value)|✓|
+
+1. To configure scoping filters, refer to the following instructions provided in the [Scoping filter tutorial](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
+
+1. To enable the Azure AD provisioning service for Klaxoon, change the **Provisioning Status** to **On** in the **Settings** section.
+
+	![Provisioning Status Toggled On](common/provisioning-toggle-on.png)
+
+1. Define the users and/or groups that you would like to provision to Klaxoon by choosing the desired values in **Scope** in the **Settings** section.
+
+	![Provisioning Scope](common/provisioning-scope.png)
+
+1. When you are ready to provision, click **Save**.
+
+	![Saving Provisioning Configuration](common/provisioning-configuration-save.png)
+
+This operation starts the initial synchronization cycle of all users and groups defined in **Scope** in the **Settings** section. The initial cycle takes longer to perform than subsequent cycles, which occur approximately every 40 minutes as long as the Azure AD provisioning service is running. 
+
+## Step 6. Monitor your deployment
+Once you've configured provisioning, use the following resources to monitor your deployment:
+
+* Use the [provisioning logs](../reports-monitoring/concept-provisioning-logs.md) to determine which users have been provisioned successfully or unsuccessfully
+* Check the [progress bar](../app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user.md) to see the status of the provisioning cycle and how close it is to completion
+* If the provisioning configuration seems to be in an unhealthy state, the application will go into quarantine. Learn more about quarantine states [here](../app-provisioning/application-provisioning-quarantine-status.md).  
+
+## More resources
+
+* [Managing user account provisioning for Enterprise Apps](../app-provisioning/configure-automatic-user-provisioning-portal.md)
+* [What is application access and single sign-on with Azure Active Directory?](../manage-apps/what-is-single-sign-on.md)
+
+## Next steps
+
+* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)

articles/active-directory/saas-apps/toc.yml

@@ -2535,6 +2535,8 @@
         href: jostle-provisioning-tutorial.md
       - name: Juno Journey
         href: juno-journey-provisioning-tutorial.md
+      - name: Klaxoon
+        href: klaxoon-provisioning-tutorial.md 
       - name: Keeper Password Manager & Digital Vault
         href: keeper-password-manager-digitalvault-provisioning-tutorial.md
       - name: Klaxoon SAML

articles/aks/monitor-aks.md

@@ -17,7 +17,7 @@ The [Cloud Monitoring Guide](/azure/cloud-adoption-framework/manage/monitor/) de
 ## Scope of the scenario
 This scenario is intended for customers using Azure Monitor to monitor AKS. It does not include the following, although this content may be added in subsequent updates to the scenario.
 
-- Monitoring of Kubernetes clusters outside of Azure except for referring to existing content for Azure Arc enabled Kubernetes. 
+- Monitoring of Kubernetes clusters outside of Azure except for referring to existing content for Azure Arc-enabled Kubernetes. 
 - Monitoring of AKS with tools other than Azure Monitor except to fill gaps in Azure Monitor and Container Insights.
 
 > [!NOTE]

articles/api-management/api-management-howto-provision-self-hosted-gateway.md

@@ -47,5 +47,5 @@ Now the gateway resource has been provisioned in your API Management instance. Y
 
 * To learn more about the self-hosted gateway, see [Azure API Management self-hosted gateway overview](self-hosted-gateway-overview.md)
 * Learn more about how to [Deploy a self-hosted gateway to Kubernetes](how-to-deploy-self-hosted-gateway-kubernetes.md)
-- Learn more about how to [Deploy a self-hosted gateway to an Azure Arc enabled Kubernetes cluster](how-to-deploy-self-hosted-gateway-azure-arc.md)
+- Learn more about how to [Deploy a self-hosted gateway to an Azure Arc-enabled Kubernetes cluster](how-to-deploy-self-hosted-gateway-azure-arc.md)
 * Learn more about how to [Deploy a self-hosted gateway to Docker](how-to-deploy-self-hosted-gateway-docker.md)

articles/api-management/how-to-deploy-self-hosted-gateway-azure-arc.md

@@ -10,9 +10,9 @@ ms.date: 05/25/2021
 
 # Deploy an Azure API Management gateway on Azure Arc (preview)
 
-With the integration between Azure API Management and [Azure Arc on Kubernetes](../azure-arc/kubernetes/overview.md), you can deploy the API Management gateway component as an [extension in an Azure Arc enabled Kubernetes cluster](../azure-arc/kubernetes/extensions.md). 
+With the integration between Azure API Management and [Azure Arc on Kubernetes](../azure-arc/kubernetes/overview.md), you can deploy the API Management gateway component as an [extension in an Azure Arc-enabled Kubernetes cluster](../azure-arc/kubernetes/extensions.md). 
 
-Deploying the API Management gateway on an Arc-enabled Kubernetes cluster expands API Management support for hybrid and multi-cloud environments. Enable the deployment using a cluster extension to make managing and applying policies to your Arc-enabled cluster a consistent experience.
+Deploying the API Management gateway on an Azure Arc-enabled Kubernetes cluster expands API Management support for hybrid and multi-cloud environments. Enable the deployment using a cluster extension to make managing and applying policies to your Azure Arc-enabled cluster a consistent experience.
 
 [!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-azure-arc.md)]
 
@@ -67,7 +67,7 @@ Deploying the API Management gateway on an Arc-enabled Kubernetes cluster expand
 
 ## Deploy the API Management gateway extension using Azure portal
 
-1. In the Azure portal, navigate to your Azure Arc connected cluster.
+1. In the Azure portal, navigate to your Azure Arc-connected cluster.
 1. In the left menu, select **Extensions (preview)** > **+ Add** > **API Management gateway (preview)**.
 1. Select **Create**.
 1. In the **Install API Management gateway** window, configure the gateway extension:
@@ -108,5 +108,5 @@ To enable monitoring of the self-hosted gateway, configure the following Log Ana
 ## Next Steps
 
 * To learn more about the self-hosted gateway, see [Azure API Management self-hosted gateway overview](self-hosted-gateway-overview.md).
-* Discover all [Azure Arc enabled Kubernetes extensions](../azure-arc/kubernetes/extensions.md). 
-* Learn more about [Azure Arc enabled Kubernetes](../azure-arc/kubernetes/overview.md).
+* Discover all [Azure Arc-enabled Kubernetes extensions](../azure-arc/kubernetes/extensions.md). 
+* Learn more about [Azure Arc-enabled Kubernetes](../azure-arc/kubernetes/overview.md).