Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into cost-management

Author: normesta

.openpublishing.redirection.azure-productivity.json

@@ -1,39 +1,89 @@
 {
-    "redirections": [
-        {
-            "source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
-            "redirect_url": "/azure/lab-services/lab-services-overview",
-            "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
-          "redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
-          "redirect_document_id": false
-      }
-    ]
-}
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
+      "redirect_url": "/azure/lab-services/lab-services-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
+      "redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-create-schedules-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-delete-lab-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-user-lists-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-vm-pool-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-get-started-create-lab-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-configure-teams-for-lab-plans",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/how-to-get-started-create-lab-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-configure-canvas-for-lab-plans",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/how-to-create-schedules-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-delete-lab-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-user-lists-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-vm-pool-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.json

@@ -25603,36 +25603,6 @@
             "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-copy-managed-disks-to-same-or-different-subscription",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-copy-managed-disks-vhd.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-copy-managed-disks-vhd",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-copy-snapshot-to-same-or-different-subscription.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-copy-snapshot-to-same-or-different-subscription",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-copy-snapshot-to-storage-account.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-copy-snapshot-to-storage-account",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-create-managed-disk-from-snapshot.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-create-managed-disk-from-snapshot",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-create-managed-disk-from-vhd.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-create-managed-disk-from-vhd",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-create-snapshot-from-vhd.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-create-snapshot-from-vhd",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-create-vm-from-managed-os-disks.md",
             "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-create-vm-from-managed-os-disks",

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.8 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

articles/active-directory-b2c/best-practices.md

@@ -4,13 +4,12 @@ titleSuffix: Azure AD B2C
 description: Recommendations and best practices to consider when working with Azure Active Directory B2C (Azure AD B2C).
 services: active-directory-b2c
 author: vigunase
+ms.author: vigunase
 manager: CelesteDG
-
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 10/01/2021
-ms.author: vigunase
+ms.date: 12/01/2022
 ms.subservice: B2C
 ---
 
@@ -32,15 +31,15 @@ Define your application and service architecture, inventory current systems, and
 
 | Best practice | Description |
 |--|--|
-| Architect an end-to-end solution | Include all of your applications' dependencies when planning an Azure AD B2C integration. Consider all services and products that are currently in your environment or that might need to be added to the solution, for example, Azure Functions, customer relationship management (CRM) systems, Azure API Management gateway, and storage services. Take into account the security and scalability for all services. |
+| Architect an end-to-end solution | Include all of your applications' dependencies when planning an Azure AD B2C integration. Consider all services and products that are currently in your environment or that might need to be added to the solution (for example, Azure Functions, customer relationship management (CRM) systems, Azure API Management gateway, and storage services). Take into account the security and scalability for all services. |
 | Document your users' experiences | Detail all the user journeys your customers can experience in your application. Include every screen and any branching flows they might encounter when interacting with the identity and profile aspects of your application. Include usability, accessibility, and localization in your planning. |
 | Choose the right authentication protocol |  For a breakdown of the different application scenarios and their recommended authentication flows, see [Scenarios and supported authentication flows](../active-directory/develop/authentication-flows-app-scenarios.md#scenarios-and-supported-authentication-flows). |
 | Pilot a proof-of-concept (POC) end-to-end user experience | Start with our [Microsoft code samples](integrate-with-app-code-samples.md) and [community samples](https://github.com/azure-ad-b2c/samples). |
 | Create a migration plan |Planning ahead can make migration go more smoothly. Learn more about [user migration](user-migration.md).|
 | Usability vs. security | Your solution must strike the right balance between application usability and your organization's acceptable level of risk. |
 | Move on-premises dependencies to the cloud | To help ensure a resilient solution, consider moving existing application dependencies to the cloud. |
 | Migrate existing apps to b2clogin.com | The deprecation of login.microsoftonline.com will go into effect for all Azure AD B2C tenants on 04 December 2020. [Learn more](b2clogin.md). |
-| Use Identity Protection and Conditional Access | Use these capabilities for significantly greater control over risky authentications and access policies. Azure AD B2C Premium P2 is required. [Learn more](conditional-access-identity-protection-overview.md). |
+| Use Identity Protection and Conditional Access | Use these capabilities for greater control over risky authentications and access policies. Azure AD B2C Premium P2 is required. [Learn more](conditional-access-identity-protection-overview.md). |
 
 ## Implementation
 
@@ -50,7 +49,7 @@ During the implementation phase, consider the following recommendations.
 |--|--|
 | Edit custom policies with the Azure AD B2C extension for Visual Studio Code | Download Visual Studio Code and this community-built [extension from the Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=AzureADB2CTools.aadb2c). While not an official Microsoft product, the Azure AD B2C extension for Visual Studio Code includes several features that help make working with custom policies easier. |
 | Learn how to troubleshoot Azure AD B2C | Learn how to [troubleshoot custom policies](./troubleshoot-custom-policies.md?tabs=applications) during development. Learn what a normal authentication flow looks like and use tools for discovering anomalies and errors. For example, use [Application Insights](troubleshoot-with-application-insights.md) to review output logs of user journeys. |
-| Leverage our library of proven custom policy patterns | Find [samples](https://github.com/azure-ad-b2c/samples) for several enhanced Azure AD B2C customer identity and access management (CIAM) user journeys. |
+| Leverage our library of proven custom policy patterns | Find [samples](https://github.com/azure-ad-b2c/samples) for enhanced Azure AD B2C customer identity and access management (CIAM) user journeys. |
 
 ## Testing
 
@@ -62,7 +61,7 @@ Test and automate your Azure AD B2C implementation.
 | Functional and UI testing | Test the user flows end-to-end. Add synthetic tests every few minutes using Selenium, VS Web Test, etc. |
 | Pen-testing | Before going live with your solution, perform penetration testing exercises to verify all components are secure, including any third-party dependencies. Verify you've secured your APIs with access tokens and used the right authentication protocol for your application scenario. Learn more about [Penetration testing](../security/fundamentals/pen-testing.md) and the [Microsoft Cloud Unified Penetration Testing Rules of Engagement](https://www.microsoft.com/msrc/pentest-rules-of-engagement?rtc=1). |
 | A/B Testing | Flight your new features with a small, random set of users before rolling out to your entire population. With JavaScript enabled in Azure AD B2C, you can integrate with A/B testing tools like Optimizely, Clarity, and others. |
-| Load testing | Azure AD B2C can scale, but your application can scale only if all of its dependencies can scale. Load-test your APIs and CDN. |
+| Load testing | Azure AD B2C can scale, but your application can scale only if all of its dependencies can scale. Load-test your APIs and CDN. Learn more about [Resilience through developer best practices](../active-directory/fundamentals/resilience-b2c-developer-best-practices.md).|
 | Throttling |  Azure AD B2C throttles traffic if too many requests are sent from the same source in a short period of time. Use several traffic sources while load testing, and handle the `AADB2C90229` error code gracefully in your applications. |
 | Automation | Use continuous integration and delivery (CI/CD) pipelines to automate testing and deployments, for example, [Azure DevOps](deploy-custom-policies-devops.md). |
 
@@ -75,7 +74,7 @@ Manage your Azure AD B2C environment.
 | Create multiple environments | For easier operations and deployment roll-out, create separate environments for development, testing, pre-production, and production. Create Azure AD B2C tenants for each. |
 | Use version control for your custom policies | Consider using GitHub, Azure Repos, or another cloud-based version control system for your Azure AD B2C custom policies. |
 | Use the Microsoft Graph API to automate the management of your B2C tenants | Microsoft Graph APIs:<br/>Manage [Identity Experience Framework](/graph/api/resources/trustframeworkpolicy?preserve-view=true&view=graph-rest-beta) (custom policies)<br/>[Keys](/graph/api/resources/trustframeworkkeyset?preserve-view=true&view=graph-rest-beta)<br/>[User Flows](/graph/api/resources/identityuserflow?preserve-view=true&view=graph-rest-beta) |
-| Integrate with Azure DevOps | A [CI/CD pipeline](deploy-custom-policies-devops.md) makes moving code between different environments easy and ensures production readiness at all times.   |
+| Integrate with Azure DevOps | A [CI/CD pipeline](deploy-custom-policies-devops.md) makes moving code between different environments easy and ensures production readiness always.   |
 | Integrate with Azure Monitor | [Audit log events](view-audit-logs.md) are only retained for seven days. [Integrate with Azure Monitor](azure-monitor.md) to retain the logs for long-term use, or integrate with third-party security information and event management (SIEM) tools to gain insights into your environment. |
 | Setup active alerting and monitoring | [Track user behavior](./analytics-with-application-insights.md) in Azure AD B2C using Application Insights. |
 
@@ -87,4 +86,4 @@ Stay up to date with the state of the service and find support options.
 |--|--|
 | [Service updates](https://azure.microsoft.com/updates/?product=active-directory-b2c) |  Stay up to date with Azure AD B2C product updates and announcements. |
 | [Microsoft Support](support-options.md) | File a support request for Azure AD B2C technical issues. Billing and subscription management support is provided at no cost. |
-| [Azure status](https://azure.status.microsoft/status) | View the current health status of all Azure services. |
+| [Azure status](https://azure.status.microsoft/status) | View the current health status of all Azure services. |