Merge branch 'main' into patch-3

Author: Jak-MS

.openpublishing.publish.config.json

@@ -986,6 +986,7 @@
     ".openpublishing.redirection.azure-percept.json",
     ".openpublishing.redirection.azure-productivity.json",
     ".openpublishing.redirection.azure-australia.json",
+    ".openpublishing.redirection.aks.json",
     "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
     "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
     "articles/azure-relay/.openpublishing.redirection.relay.json",

.openpublishing.redirection.active-directory.json

@@ -10845,8 +10845,12 @@
       "source_path": "articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
       "redirect_url": "/azure/azure-percept/index",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
+      "redirect_url": "/azure/active-directory/fundamentals/customize-branding",
+      "redirect_document_id": false
     }
 
-
   ]
 }

.openpublishing.redirection.aks.json

@@ -0,0 +1,9 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/aks/azure-cni-overlay.md",
+      "redirect_url": "/azure/aks",
+      "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.json

@@ -6928,6 +6928,11 @@
     "redirect_url":  "/azure/azure-government/compare-azure-government-global-azure",
     "redirect_document_id":  false
 },
+{
+    "source_path_from_root":  "/articles/azure-government/documentation-government-overview.md",
+    "redirect_url":  "/azure/azure-government/documentation-government-plan-security",
+    "redirect_document_id":  false
+},
 {
     "source_path_from_root":  "/articles/security/compliance/azure-services-in-fedramp-auditscope.md",
     "redirect_url":  "/azure/azure-government/compliance/azure-services-in-fedramp-auditscope",

articles/active-directory-b2c/enable-authentication-web-api.md

@@ -443,7 +443,7 @@ Under the project root folder, create a *config.json* file, and then add to it t
 ```json
 {
     "credentials": {
-        "tenantName": "<your-tenant-name>",
+        "tenantName": "<your-tenant-name>.onmicrosoft.com",
         "clientID": "<your-webapi-application-ID>",
         "issuer": "https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/"
     },
@@ -470,7 +470,7 @@ In the *config.json* file, update the following properties:
 
 |Section  |Key  |Value  |
 |---------|---------|---------|
-| credentials | tenantName | The first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name) (for example, `contoso`).|
+| credentials | tenantName | Your Azure AD B2C [tenant name/domain name](tenant-management.md#get-your-tenant-name) (for example, `contoso.onmicrosoft.com`).|
 | credentials |clientID | The web API application ID. In the [preceding diagram](#app-registration-overview), it's the application with *App ID: 2*. To learn how to get your web API application registration ID, see [Prerequisites](#prerequisites). |
 | credentials | issuer| The token issuer `iss` claim value. By default, Azure AD B2C returns the token in the following format: `https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/`. Replace `<your-tenant-name>` with the first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name). Replace `<your-tenant-ID>` with your [Azure AD B2C tenant ID](tenant-management.md#get-your-tenant-id). |
 | policies | policyName | The user flows, or custom policy. To learn how to get your user flow or policy, see [Prerequisites](#prerequisites).|

articles/active-directory-b2c/index.yml

@@ -29,7 +29,7 @@ landingContent:
           - text: What is Azure AD B2C?
             url: overview.md
           - text: Compare solutions for External Identities
-            url: ../active-directory/external-identities/external-identities-overview.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
+            url: ../active-directory/external-identities/external-identities-overview.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
           - text: Get started with Azure AD B2C
             url: tutorial-create-tenant.md
           - text: Technical and feature overview
@@ -43,13 +43,13 @@ landingContent:
       - linkListType: learn
         links:
           - text: Authentication and authorization
-            url: ../active-directory/develop/authentication-vs-authorization.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
+            url: ../active-directory/develop/authentication-vs-authorization.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
           - text: Tokens
-            url: ../active-directory/develop/security-tokens.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
+            url: ../active-directory/develop/security-tokens.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
           - text: Protocols
-            url: ../active-directory/develop/v2-app-types.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
+            url: ../active-directory/develop/v2-app-types.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
           - text: Authentication library
-            url: ../active-directory/develop/msal-overview.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
+            url: ../active-directory/develop/msal-overview.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
           - text: 'Build a web site: HTML, CSS, JavaScript'
             url: /learn/modules/build-simple-website/
 

articles/active-directory-b2c/media/tutorial-delete-tenant/delete-tenant.png

@@ -129,7 +129,7 @@ In order to collect the user_agent from client-side, create your own `**ContentD
 To customize the user interface, you specify a URL in the `ContentDefinition` element with customized HTML content. In the self-asserted technical profile or orchestration step, you point to that ContentDefinition identifier.
 
 
-1. Open the `TrustFrameworksExtension.xml` and define a new **ContentDefinition** to customize the [self-asserted technical profile](https://docs.microsoft.com/azure/active-directory-b2c/self-asserted-technical-profile).
+1. Open the `TrustFrameworksExtension.xml` and define a new **ContentDefinition** to customize the [self-asserted technical profile](/azure/active-directory-b2c/self-asserted-technical-profile).
 
 1. Find the `BuildingBlocks` element and add the `**api.selfassertedDeduce**` ContentDefinition:
 
@@ -434,11 +434,11 @@ The **ClaimsSchema** element defines the claim types that can be referenced as p
 
 ### Step 6: Add Deduce ClaimsProvider
 
-A **claims provider** is an interface to communicate with different types of parties via its [technical profiles](https://docs.microsoft.com/azure/active-directory-b2c/technicalprofiles).
+A **claims provider** is an interface to communicate with different types of parties via its [technical profiles](/azure/active-directory-b2c/technicalprofiles).
 
 - `SelfAsserted-UserAgent` self-asserted technical profile is used to collect user_agent from client-side.
 
-- `deduce_insight_api` technical profile sends data to the Deduce RESTful service in an input claims collection and receives data back in an output claims collection. For more information, see [integrate REST API claims exchanges in your Azure AD B2C custom policy](https://docs.microsoft.com/azure/active-directory-b2c/api-connectors-overview?pivots=b2c-custom-policy)
+- `deduce_insight_api` technical profile sends data to the Deduce RESTful service in an input claims collection and receives data back in an output claims collection. For more information, see [integrate REST API claims exchanges in your Azure AD B2C custom policy](/azure/active-directory-b2c/api-connectors-overview?pivots=b2c-custom-policy)
 
 You can define Deduce as a claims provider by adding it to the **ClaimsProvider** element in the extension file of your policy.
 

articles/active-directory-b2c/media/tutorial-delete-tenant/manage-tenant.png

@@ -8,14 +8,14 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 09/20/2021
+ms.date: 08/30/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
 
 # Clean up resources and delete the tenant
 
-When you've finished the Azure AD B2C tutorials, you can delete the tenant you used for testing or training. To delete the tenant, you'll first need to delete all tenant resources. In this article, you'll:
+When you've finished the Azure Active Directory B2C (Azure AD B2C) tutorials, you can delete the tenant you used for testing or training. To delete the tenant, you'll first need to delete all tenant resources. In this article, you'll:
 
 > [!div class="checklist"]
 > * Use the **Delete tenant** option to identify cleanup tasks
@@ -25,62 +25,83 @@ When you've finished the Azure AD B2C tutorials, you can delete the tenant you u
 ## Identify cleanup tasks
 
 1. Sign in to the [Azure portal](https://portal.azure.com/) with a global administrator or subscription administrator role. Use the same work or school account or the same Microsoft account that you used to sign up for Azure.
-1. Make sure you're using the directory that contains your Azure AD B2C tenant. 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. Select the **Azure Active Directory** service.
-1. Under **Manage**, select **Properties**.
+1. 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** button next to it.
+1. In the Azure portal, search for and select the **Azure Active Directory** service.
+1. In the left menu, under **Manage**, select **Properties**.
 1. Under **Access management for Azure resources**, select **Yes**, and then select **Save**.
-1. Sign out of the Azure portal and then sign back in to refresh your access. Make sure you're using the directory that contains your Azure AD B2C tenant. 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. Select the **Azure Active Directory** service.
-1. On the **Overview** page, select **Delete tenant**. The **Required action** column indicates the resources you'll need to remove before you can delete the tenant.
+1. Sign out of the Azure portal and then sign back in to refresh your access.
+1. Repeat step two to make sure you're using the directory that contains your Azure AD B2C tenant.
+1. In the Azure portal, search for and select the **Azure Active Directory** service
+1. On the **Overview** page, select **Manage tenants**. 
+1. On the **Manage tenants** page, select (by check marking) the tenant you want to delete, and then, at the top of the page, select the **Delete** button. The **Required action** column indicates the resources you need to remove before you can delete the tenant.
 
    ![Delete tenant tasks](media/tutorial-delete-tenant/delete-tenant-tasks.png)
 
 ## Delete tenant resources
 
-If you have the confirmation page open from the previous section, you can use the links in the **Required action** column to open the Azure portal pages where you can remove these resources. Or, you can remove tenant resources from within the Azure AD B2C service using the following steps.
+If you've the confirmation page open from the previous section, you can use the links in the **Required action** column to open the Azure portal pages where you can remove these resources. Or, you can remove tenant resources from within the Azure AD B2C service using the following steps.
 
 1. Sign in to the [Azure portal](https://portal.azure.com/) with a global administrator or subscription administrator role. Use the same work or school account or the same Microsoft account that you used to sign up for Azure.
-1. Make sure you're using the directory that contains your Azure AD B2C tenant. 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. Select the **Azure AD B2C** service. Or use the search box to find and select **Azure AD B2C**.
-1. Delete all users *except* the admin account you're currently signed in as: Under **Manage**, select **Users**. On the **All users** page, select the checkbox next to each user (except the admin account you're currently signed in as). Select **Delete**, and then select **Yes** when prompted.
+1. 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** button next to it.
+1. In the Azure portal, select the **Azure AD B2C** service, or search for and select **Azure AD B2C**.
+1. Delete all users *except* the admin account you're currently signed in as: 
+    1. Under **Manage**, select **Users**. 
+    1. On the **All users** page, select the checkbox next to each user (except the admin account you're currently signed in as). 
+    1. At the top of the page, select **Delete user**, and then select **Yes** when prompted.
 
    ![Delete users](media/tutorial-delete-tenant/delete-users.png)
 
-1. Delete app registrations and the *b2c-extensions-app*: Under **Manage**, select **App registrations**. Select the **All applications** tab. Select an application, and then select **Delete**. Repeat for all applications, including the **b2c-extensions-app** application.
+1. Delete app registrations and the *b2c-extensions-app*: 
+    1. Under **Manage**, select **App registrations**. 
+    1. Select the **All applications** tab. 
+    1. Select an application to open it, and then select **Delete** button. Repeat for all applications, including the **b2c-extensions-app** application.
 
    ![Delete application](media/tutorial-delete-tenant/delete-applications.png)
 
-1. Delete any identity providers you configured: Under **Manage**, select **Identity providers**. Select an identity provider you configured, and then select **Remove**.
+1. Delete any identity providers you configured: 
+    1. Under **Manage**, select **Identity providers**. 
+    1. Select an identity provider you configured, and then select **Remove**.
 
    ![Delete identity provider](media/tutorial-delete-tenant/identity-providers.png)
 
-1. Delete user flows: Under **Policies**, select **User flows**. Next to each user flow, select the ellipses (...) and then select **Delete**.
+1. Delete user flows: 
+    1. Under **Policies**, select **User flows**. 
+    1. Next to each user flow, select the ellipses (...) and then select **Delete**.
 
    ![Delete user flows](media/tutorial-delete-tenant/user-flow.png)
 
-1. Delete policy keys: Under **Policies**, select **Identity Experience Framework**, and then select **Policy keys**. Next to each policy key, select the ellipses (...) and then select **Delete**.
+1. Delete policy keys: 
+    1. Under **Policies**, select **Identity Experience Framework**, and then select **Policy keys**. 
+    1. Next to each policy key, select the ellipses (...) and then select **Delete**.
 
-1. Delete custom policies: Under **Policies**, select **Identity Experience Framework**, select **Custom policies**, and then delete all policies.
+1. Delete custom policies: 
+    1. Under **Policies**, select **Identity Experience Framework**, and then select **Custom policies**.
+    1. Next to each Custom policy, select the ellipses (...) and then select **Delete**.
 
 ## Delete the tenant
 
+Once you delete all the tenant resources, you can now delete the tenant itself: 
+
 1. Sign in to the [Azure portal](https://portal.azure.com/) with a global administrator or subscription administrator role. Use the same work or school account or the same Microsoft account that you used to sign up for Azure.
-1. Make sure you're using the directory that contains your Azure AD B2C tenant. 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. Select the **Azure Active Directory** service.
+1. 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** button next to it.
+1. In the Azure portal, search for and select the **Azure Active Directory** service.
 1. If you haven't already granted yourself access management permissions, do the following:
 
-   * Under **Manage**, select **Properties**.
-   * Under **Access management for Azure resources**, select **Yes**, and then select **Save**.
-   * Sign out of the Azure portal and then sign back in to refresh your access, and select the **Azure Active Directory** service.
+   1. Under **Manage**, select **Properties**.
+   1. Under **Access management for Azure resources**, select **Yes**, and then select **Save**.
+   1. Sign out of the Azure portal and then sign back in to refresh your access, and select the **Azure Active Directory** service.
 
-1. On the **Overview** page, select **Delete tenant**.
+1. On the **Overview** page, select **Manage tenants**.
 
-   ![Delete the tenant](media/tutorial-delete-tenant/delete-tenant.png)
+   :::image type="content" source="media/tutorial-delete-tenant/manage-tenant.png" alt-text="Screenshot of how to manage tenant for deletion.":::
 
+1. On the **Manage tenants** page, select (by check marking) the tenant you want to delete, and then, at the top of the page, select the **Delete** button
 1. Follow the on-screen instructions to complete the process.
 
 ## Next steps