Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into asb-migration

Author: msmbaldwin

.openpublishing.redirection.json

@@ -19310,15 +19310,20 @@
       "redirect_url": "/azure/devtest-labs/use-paas-services",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/digital-twins/how-to-create-custom-sdks.md",
+      "redirect_url": "/azure/digital-twins/how-to-use-apis-sdks",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/digital-twins/quickstart-adt-explorer.md",
       "redirect_url": "/azure/digital-twins/quickstart-azure-digital-twins-explorer",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/digital-twins/how-to-interpret-event-data.md",
       "redirect_url": "/azure/digital-twins/concepts-event-notifications",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/digital-twins/how-to-integrate-models.md",
@@ -19328,17 +19333,17 @@
     {
       "source_path_from_root": "/articles/digital-twins/how-to-enable-private-link.md",
       "redirect_url": "/azure/digital-twins/how-to-enable-private-link-portal",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/digital-twins/how-to-enable-managed-identities.md",
       "redirect_url": "/azure/digital-twins/how-to-enable-managed-identities-portal",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/digital-twins/overview-differences.md",
       "redirect_url": "/azure/digital-twins/resources-compare-original-release",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/digital-twins/concepts-convert-models.md",
@@ -19353,7 +19358,7 @@
     {
       "source_path_from_root": "/articles/digital-twins/how-to-manage-routes.md",
       "redirect_url": "/azure/digital-twins/how-to-manage-routes-apis-cli",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/digital-twins/how-to-use-parser.md",
@@ -19363,22 +19368,22 @@
     {
       "source_path_from_root": "/articles/digital-twins/how-to-set-up-instance-manual.md",
       "redirect_url": "/azure/digital-twins/how-to-set-up-instance-cli",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/digital-twins/how-to-set-up-instance.md",
       "redirect_url": "/azure/digital-twins/how-to-set-up-instance-portal",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/digital-twins/how-to-configure-postman.md",
       "redirect_url": "/azure/digital-twins/how-to-use-postman",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/digital-twins/about-digital-twins.md",
       "redirect_url": "/azure/digital-twins/overview",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/cosmos-db/mongodb-migrate.md",
@@ -27237,8 +27242,13 @@
     },
     {
       "source_path_from_root": "/articles/machine-learning/service/how-to-deploy-existing-model.md",
-      "redirect_url": "/azure/machine-learning/how-to-deploy-existing-model",
-      "redirect_document_id": true
+      "redirect_url": "/azure/machine-learning/how-to-deploy-and-where",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/machine-learning/how-to-deploy-existing-model.md",
+      "redirect_url": "/azure/machine-learning/how-to-deploy-and-where",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/machine-learning/service/concept-accelerate-with-fpgas.md",

articles/active-directory-b2c/TOC.yml

@@ -45,6 +45,8 @@
       href: tutorial-desktop-app-webapi.md
     - name: Single page
       href: tutorial-single-page-app-webapi.md
+  - name: 6 - Clean up and delete tenant
+    href: tutorial-delete-tenant.md
 - name: Samples
   href: code-samples.md
 - name: Concepts

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

@@ -0,0 +1,103 @@
+---
+title: Clean up resources and delete a tenant - Azure Active Directory B2C
+description: Steps describing how to delete an Azure AD B2C tenant. Learn how to delete all tenant resources, and then delete the tenant.
+services: active-directory-b2c
+author: msmimart
+manager: celestedg
+
+ms.service: active-directory
+ms.workload: identity
+ms.topic: conceptual
+ms.date: 04/23/2021
+ms.author: mimart
+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:
+
+> [!div class="checklist"]
+> * Use the **Delete tenant** option to identify cleanup tasks
+> * Delete tenant resources (user flows, identity providers, applications, users)
+> * Delete the tenant
+
+## 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.
+
+2. Select the **Directory + subscription** filter in the top menu, and then select the directory that contains your Azure AD B2C tenant.
+
+3. Select the **Azure Active Directory** service.
+
+4. Under **Manage**, select **Properties**.
+
+5. Under **Access management for Azure resources**, select **Yes**, and then select **Save**.
+
+6. Sign out of the Azure portal and then sign back in to refresh your access. Use the **Directory + subscription** filter in the top menu again to select the directory that contains your Azure AD B2C tenant.
+
+7. Select the **Azure Active Directory** service.
+
+8. 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.
+
+   ![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.
+
+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.
+
+2. Select the **Directory + subscription** filter in the top menu, and then select the directory that contains your Azure AD B2C tenant.
+
+3. Select the **Azure AD B2C** service. Or use the search box to find and select **Azure AD B2C**.
+
+4. 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.
+
+   ![Delete users](media/tutorial-delete-tenant/delete-users.png)
+   
+5. 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.
+
+   ![Delete application](media/tutorial-delete-tenant/delete-applications.png)
+
+6. Delete any identity providers you configured: Under **Manage**, select **Identity providers**. Select an identity provider you configured, and then select **Remove**.
+
+   ![Delete identity provider](media/tutorial-delete-tenant/identity-providers.png)
+
+8. Delete user flows: Under **Policies**, select **User flows**. Next to each user flow, select the ellipses (...) and then select **Delete**.
+
+   ![Delete user flows](media/tutorial-delete-tenant/user-flow.png)
+
+9. 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**.
+
+10. Delete custom policies: Under **Policies**, select **Identity Experience Framework**, select **Custom policies**, and then delete all policies.
+
+## Delete the tenant
+
+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.
+
+2. Select the **Directory + subscription** filter in the top menu, and then select the directory that contains your Azure AD B2C tenant.
+
+3. Select the **Azure Active Directory** service.
+
+4. 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.
+
+5. On the **Overview** page, select **Delete tenant**.
+
+   ![Delete the tenant](media/tutorial-delete-tenant/delete-tenant.png)
+
+6. Follow the on-screen instructions to complete the process.
+
+## Next steps
+
+In this article, you learned how to:
+
+> [!div class="checklist"]
+> * Delete your tenant resources
+> * Delete the tenant
+
+Next, learn more about getting started with Azure AD B2C [user flows and custom policies](user-flow-overview.md).

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

@@ -1,6 +1,6 @@
 ---
-title: Azure Active Directory sign-in activity reports - preview | Microsoft Docs
-description: Introduction to the sign-in activity reports in the Azure Active Directory portal 
+title: Azure Active Directory sign-in activity logs - preview | Microsoft Docs
+description: Introduction to the sign-in activity logs in the Azure Active Directory portal 
 services: active-directory
 documentationcenter: ''
 author: MarkusVi
@@ -14,13 +14,13 @@ ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: identity
 ms.subservice: report-monitor
-ms.date: 04/19/2021
+ms.date: 04/23/2021
 ms.author: markvi
 ms.reviewer: besiler
 
 ms.collection: M365-identity-device-management
 ---
-# Azure Active Directory sign-in activity reports - preview
+# Azure Active Directory sign-in activity logs - preview
 
 As an IT administrator, you want to know how your IT environment is doing. The information about your system’s health enables you to assess whether and how you need to respond to potential issues. 
 
@@ -31,15 +31,15 @@ To support you with this goal, the Azure Active Directory portal gives you acces
 - **[Provisioning](concept-provisioning-logs.md)** – Activities performed by the provisioning service, such as the creation of a group in ServiceNow or a user imported from Workday.
 
 
-The classic sign-ins report in Azure Active Directory provides you with an overview of interactive user sign-ins. In addition, you now have access to three additional sign-in reports that are now in preview:
+The classic sign-ins report in Azure Active Directory provides you with an overview of interactive user sign-ins. In addition, you now have access to three additional sign-in logs that are now in preview:
 
 - Non-interactive user sign-ins
 
 - Service principal sign-ins
 
 - Managed identities for Azure resource sign-ins
 
-This article gives you an overview of the sign-in activity report with the preview of non-interactive, application, and managed identities for Azure resources sign-ins. For information about the sign-in report without the preview features, see  [Sign-in activity reports in the Azure Active Directory portal](concept-sign-ins.md).
+This article gives you an overview of the sign-in activity report with the preview of non-interactive, application, and managed identities for Azure resources sign-ins. For information about the sign-in report without the preview features, see  [Sign-in activity logs in the Azure Active Directory portal](concept-sign-ins.md).
 
 
 
@@ -61,7 +61,7 @@ Before you can start using this feature, you should know the answers to:
 
 ### What Azure AD license do you need to access sign-in activity?
 
-Your tenant must have an Azure AD Premium license associated with it to see sign-in activities. See [Getting started with Azure Active Directory Premium](../fundamentals/active-directory-get-started-premium.md) to upgrade your Azure Active Directory edition. It will take a couple of days for the data to show up in the reports after you upgrade to a premium license with no data activities before the upgrade.
+Your tenant must have an Azure AD Premium license associated with it to see sign-in activities. See [Getting started with Azure Active Directory Premium](../fundamentals/active-directory-get-started-premium.md) to upgrade your Azure Active Directory edition. It will take a couple of days for the data to show up in the logs after you upgrade to a premium license with no data activities before the upgrade.
 
 
 
@@ -367,12 +367,12 @@ The filter for interactive and non-interactive sign-ins is the same. Because of
 
 
 
-## Access the new sign-in activity reports 
+## Access the new sign-in activity logs 
 
-The sign-ins activity report in the Azure portal provides you with a simple method to switch the preview report on and off. If you have the preview reports enabled, you get a new menu that gives you access to all sign-in activity report types.     
+The sign-ins activity report in the Azure portal provides you with a simple method to switch the preview report on and off. If you have the preview logs enabled, you get a new menu that gives you access to all sign-in activity report types.     
 
 
-To access the new sign-in reports with non-interactive and application sign-ins: 
+To access the new sign-in logs with non-interactive and application sign-ins: 
 
 1. In the [Azure portal](https://portal.azure.com), select **Azure Active Directory**.
 
@@ -396,7 +396,7 @@ To access the new sign-in reports with non-interactive and application sign-ins:
 
 
 
-## Download sign-in activity reports
+## Download sign-in activity logs
 
 When you download a sign-in activity report, the following is true:
 
@@ -409,7 +409,7 @@ When you download a sign-in activity report, the following is true:
 - The number of records you can download is constrained by the [Azure Active Directory report retention policies](reference-reports-data-retention.md). 
 
 
-![Download reports](./media/concept-all-sign-ins/download-reports.png "Download reports")
+![Download logs](./media/concept-all-sign-ins/download-reports.png "Download logs")
 
 
 Each CSV download consists of six different files: