Merge pull request #179130 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ttorble

.openpublishing.redirection.json

@@ -418,6 +418,11 @@
       "redirect_url": "/articles/frontdoor/front-door-ddos",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/frontdoor/standard-premium/geo-filtering.md",
+      "redirect_url": "/articles/frontdoor/front-door-geo-filtering",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-sql/database/doc-changes-updates-release-notes.md",
       "redirect_url": "/azure/azure-sql/database/doc-changes-updates-release-notes-whats-new",

articles/active-directory-b2c/add-api-connector.md

@@ -5,7 +5,7 @@ services: active-directory-b2c
 ms.service: active-directory
 ms.subservice: B2C
 ms.topic: how-to
-ms.date: 08/24/2021
+ms.date: 11/09/2021
 
 ms.author: kengaderdus
 author: kengaderdus
@@ -72,6 +72,7 @@ Content-type: application/json
      }
  ],
  "displayName": "John Smith",
+ "objectId": "11111111-0000-0000-0000-000000000000"
  "givenName":"John",
  "surname":"Smith",
  "jobTitle":"Supplier",
@@ -142,6 +143,7 @@ Content-type: application/json
      }
  ],
  "displayName": "John Smith",
+ "objectId": "11111111-0000-0000-0000-000000000000",
  "givenName":"John",
  "lastName":"Smith",
  "step": "PostFederationSignup",
@@ -195,6 +197,7 @@ Content-type: application/json
      }
  ],
  "displayName": "John Smith",
+ "objectId": "11111111-0000-0000-0000-000000000000",
  "givenName":"John",
  "surname":"Smith",
  "jobTitle":"Supplier",

articles/active-directory-b2c/trustframeworkpolicy.md

@@ -8,7 +8,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 03/15/2021
+ms.date: 11/09/2021
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
@@ -66,6 +66,7 @@ The **TrustFrameworkPolicy** element contains the following elements:
 | [BuildingBlocks](buildingblocks.md) | 0:1 | The building blocks of your policy. |
 | [ClaimsProviders](claimsproviders.md) | 0:1 | A collection of claims providers. |
 | [UserJourneys](userjourneys.md) | 0:1 | A collection of user journeys. |
+| [SubJourneys](subjourneys.md) | 0:1 | A collection of sub journeys. |
 | [RelyingParty](relyingparty.md) | 0:1 | A definition of a relying party policy. |
 
 To inherit a policy from another policy, a **BasePolicy** element must be declared under the **TrustFrameworkPolicy** element of the policy file. The **BasePolicy** element is a reference to the base policy from which this policy is derived.

articles/active-directory/external-identities/b2b-tutorial-require-mfa.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: B2B
 ms.topic: tutorial
-ms.date: 06/22/2021
+ms.date: 11/08/2021
 
 ms.author: mimart
 author: msmimart
@@ -44,24 +44,24 @@ If you don’t have an Azure subscription, create a [free account](https://azure
 
 To complete the scenario in this tutorial, you need:
 
-- **Access to Azure AD Premium edition**, which includes Conditional Access policy capabilities. To enforce MFA, you need to create an Azure AD Conditional Access policy. Note that MFA policies are always enforced at your organization, regardless of whether the partner has MFA capabilities. If you set up MFA for your organization, you’ll need to make sure you have sufficient Azure AD Premium licenses for your guest users. 
+- **Access to Azure AD Premium edition**, which includes Conditional Access policy capabilities. To enforce MFA, you need to create an Azure AD Conditional Access policy. Note that MFA policies are always enforced at your organization, regardless of whether the partner has MFA capabilities.
 - **A valid external email account** that you can add to your tenant directory as a guest user and use to sign in. If you don't know how to create a guest account, see [Add a B2B guest user in the Azure portal](add-users-administrator.md).
 
 ## Create a test guest user in Azure AD
 
 1. Sign in to the [Azure portal](https://portal.azure.com/) as an Azure AD administrator.
-2. In the left pane, select **Azure Active Directory**.
-3. Under **Manage**, select **Users**.
-4. Select **New guest user**.
+1. In the Azure portal, select **Azure Active Directory**.
+1. In the left menu, under **Manage**, select **Users**.
+1. Select **New guest user**.
 
     ![Screenshot showing where to select the New guest user option](media/tutorial-mfa/tutorial-mfa-user-3.png)
 
-5. Under **User name**, enter the email address of the external user. Optionally, include a welcome message.
+1. Under **Identity**, enter the email address of the external user. Optionally, include a name and welcome message.
 
     ![Screenshot showing where to enter the guest invitation message](media/tutorial-mfa/tutorial-mfa-user-4.png)
 
-6. Select **Invite** to automatically send the invitation to the guest user. A **Successfully invited user** message appears.
-7. After you send the invitation, the user account is automatically added to the directory as a guest.
+1. Select **Invite** to automatically send the invitation to the guest user. A **Successfully invited user** message appears.
+1. After you send the invitation, the user account is automatically added to the directory as a guest.
 
 ## Test the sign-in experience before MFA setup
 
@@ -72,76 +72,76 @@ To complete the scenario in this tutorial, you need:
 ## Create a Conditional Access policy that requires MFA
 
 1. Sign in to your [Azure portal](https://portal.azure.com/) as a security administrator or a Conditional Access administrator.
-2. In the Azure portal, select **Azure Active Directory**.
-3. On the **Azure Active Directory** page, in the **Security** section, select **Conditional Access**.
-4. On the **Conditional Access** page, in the toolbar on the top, select **New policy**.
-5. On the **New** page, in the **Name** textbox, type **Require MFA for B2B portal access**.
-6. In the **Assignments** section, select **Users and groups**.
-7. On the **Users and groups** page, choose **Select users and groups**, and then select **All guest and external users**.
+1. In the Azure portal, select **Azure Active Directory**.
+1. In the left menu, under **Manage**, select **Security**.
+1. Under **Protect**, select **Conditional Access**.
+1. On the **Conditional Access** page, in the toolbar on the top, select **New policy**.
+1. On the **New** page, in the **Name** textbox, type **Require MFA for B2B portal access**.
+1. In the **Assignments** section, choose the link under **Users and groups**.
+1. On the **Users and groups** page, choose **Select users and groups**, and then choose **All guest and external users**.
 
     ![Screenshot showing selecting all guest users](media/tutorial-mfa/tutorial-mfa-policy-6.png)
-9. Select **Done**.
-10.	On the **New** page, in the **Assignments** section, select **Cloud apps**.
-11. On the **Cloud apps** page, choose **Select apps**, and then choose **Select**.
+1. In the **Assignments** section, choose the link under **Cloud apps or actions**.
+1. Choose **Select apps**, and then choose the link under **Select**.
 
     ![Screenshot showing the Cloud apps page and the Select option](media/tutorial-mfa/tutorial-mfa-policy-10.png)
 
-12.	On the **Select** page, choose **Microsoft Azure Management**, and then choose **Select**.
+1.	On the **Select** page, choose **Microsoft Azure Management**, and then choose **Select**.
 
     ![Screenshot that highlights the Microsoft Azure Management option.](media/tutorial-mfa/tutorial-mfa-policy-11.png)
 
-13.	On the **Cloud apps** page, select **Done**.
-14.	On the **New** page, in the **Access controls** section, select **Grant**.
-15.	On the **Grant** page, choose **Grant access**, select the **Require multi-factor authentication** check box, and then choose **Select**.
+1.	On the **New** page, in the **Access controls** section, choose the link under **Grant**.
+1.	On the **Grant** page, choose **Grant access**, select the **Require multi-factor authentication** check box, and then choose **Select**.
 
     ![Screenshot showing the Require multi-factor authentication option](media/tutorial-mfa/tutorial-mfa-policy-13.png)
 
-16.	Under **Enable policy**, select **On**.
+1.	Under **Enable policy**, select **On**.
 
     ![Screenshot showing the Enable policy option set to On](media/tutorial-mfa/tutorial-mfa-policy-14.png)
 
-17.	Select **Create**.
+1.	Select **Create**.
 
 ## Use the What If option to simulate sign-in
 
-1. On the **Conditional Access - Policies** page, select **What If**.
+1. On the **Conditional Access | Policies** page, select **What If**.
 
     ![Screenshot that highlights where to select the What if option on the Conditional Access - Policies page.](media/tutorial-mfa/tutorial-mfa-whatif-1.png)
 
-2. Select **User**, choose your test guest user, and then choose **Select**.
+1. Select the link under **User**. 
+1. In the search box, type the name of your test guest user. Choose the user in the search results, and then choose **Select**.
 
     ![Screenshot showing a guest user selected](media/tutorial-mfa/tutorial-mfa-whatif-2.png)
 
-3. Select **Cloud apps**.
-4. On the **Cloud apps** page, choose **Select apps** and then click  **Select**. In the applications list, select **Microsoft Azure Management**, and then click **Select**.
+1. Select the link under **Cloud apps, actions, or authentication content**. 
+. Choose **Select apps**, and then choose the link under **Select**.
 
     ![Screenshot showing the Microsoft Azure Management app selected](media/tutorial-mfa/tutorial-mfa-whatif-3.png)
 
-5. On the **Cloud apps** page, select **Done**.
-6. Select **What If**, and verify that your new policy appears under **Evaluation results** on the **Policies that will apply** tab.
+1. On the **Cloud apps** page, in the applications list, choose **Microsoft Azure Management**, and then choose **Select**.
+1. Choose **What If**, and verify that your new policy appears under **Evaluation results** on the **Policies that will apply** tab.
 
     ![Screenshot showing where to select the What if option](media/tutorial-mfa/tutorial-mfa-whatif-4.png)
 
 ## Test your Conditional Access policy
 
 1. Use your test user name and password to sign in to your [Azure portal](https://portal.azure.com/).
-2. You should see a request for additional authentication methods. Note that it could take some time for the policy to take effect.
+1. You should see a request for additional authentication methods. Note that it could take some time for the policy to take effect.
 
     ![Screenshot showing the More information required message](media/tutorial-mfa/mfa-required.png)
 
-3. Sign out.
+1. Sign out.
 
 ## Clean up resources
 
 When no longer needed, remove the test user and the test Conditional Access policy.
 
 1. Sign in to the [Azure portal](https://portal.azure.com/) as an Azure AD administrator.
-2. In the left pane, select **Azure Active Directory**.
-3. Under **Manage**, select **Users**.
-4. Select the test user, and then select **Delete user**.
-5. In the left pane, select **Azure Active Directory**.
-6. Under **Security**, select **Conditional Access**.
-7. In the **Policy Name** list, select the context menu (…) for your test policy, and then select **Delete**. Select **Yes** to confirm.
+1. In the left pane, select **Azure Active Directory**.
+1. Under **Manage**, select **Users**.
+1. Select the test user, and then select **Delete user**.
+1. In the left pane, select **Azure Active Directory**.
+1. Under **Security**, select **Conditional Access**.
+1. In the **Policy Name** list, select the context menu (…) for your test policy, and then select **Delete**. Select **Yes** to confirm.
 
 ## Next steps