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

Author: batamig

.openpublishing.redirection.active-directory.json

@@ -10921,6 +10921,11 @@
       "redirect_url": "/azure/azure-percept/index",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/howto-install-use-log-analytics-views.md",
+      "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
       "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",

.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.defender-for-cloud.json

@@ -759,6 +759,11 @@
             "source_path_from_root": "/articles/defender-for-cloud/deploy-vulnerability-assessment-tvm.md",
             "redirect_url": "/azure/defender-for-cloud/deploy-vulnerability-assessment-defender-vulnerability-management",
             "redirect_document_id": true
-        }    
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/plan-multicloud-security-other-resources.md",
+            "redirect_url": "/azure/defender-for-cloud/multicloud",
+            "redirect_document_id": true
+        }
       ]
 }

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/add-password-reset-policy.md

@@ -9,8 +9,8 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 10/07/2022
-ms.custom: project-no-code
+ms.date: 10/25/2022
+ms.custom: project-no-code, engagement-fy23
 ms.author: kengaderdus
 ms.subservice: B2C
 zone_pivot_groups: b2c-policy-type
@@ -28,13 +28,19 @@ The password reset flow involves the following steps:
 1. In the next dialog that appears, the user enters their email address, and then selects **Send verification code**. Azure AD B2C sends a verification code to the user's email account. The user copies the verification code from the email, enters the code in the Azure AD B2C password reset dialog, and then selects **Verify code**.
 1. The user can then enter a new password. (After the email is verified, the user can still select the **Change e-mail** button; see [Hide the change email button](#hide-the-change-email-button).)
 
-   ![Diagram that shows three dialogs in the password reset flow.](./media/add-password-reset-policy/password-reset-flow.png)
+:::image type="content" source="./media/add-password-reset-policy/password-reset-flow.png" alt-text="Diagram that shows three dialogs in the password reset flow." lightbox="./media/add-password-reset-policy/password-reset-flow.png":::
 
 > [!TIP]
-> A user can change their password by using the self-service password reset flow if they forget their password and want to reset it. Choose one of these user flow options:
+> A user can change their password by using the self-service password reset flow if they forget their password and want to reset it. You can also choose one of the following user flow options:
 > - If a user knows their password and wants to change it, use a [password change flow](add-password-change-policy.md).
 > - If you want to force a user to reset their password (for example, when they sign in for the first time, when their passwords have been reset by an admin, or after they've been migrated to Azure AD B2C with random passwords), use a [force password reset](force-password-reset.md) flow.
 
+The default name of the **Change email** button in *selfAsserted.html* is **changeclaims**. To find the button name, on the sign-up page, inspect the page source by using a browser tool such as _Inspect_.
+
+## Prerequisites
+
+[!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
+
 ### Hide the change email button
 
 After the email is verified, the user can still select **Change email**, enter another email address, and then repeat email verification. If you'd prefer to hide the **Change email** button, you can modify the CSS to hide the associated HTML elements in the dialog. For example, you can add the following CSS entry to selfAsserted.html and [customize the user interface by using HTML templates](customize-ui-with-html.md):
@@ -48,12 +54,6 @@ After the email is verified, the user can still select **Change email**, enter a
 </style>
 ```
 
-The default name of the **Change email** button in *selfAsserted.html* is **changeclaims**. To find the button name, on the sign-up page, inspect the page source by using a browser tool like Inspect.
-
-## Prerequisites
-
-[!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
-
 ## Self-service password reset (recommended)
 
 The new password reset experience is now part of the sign-up or sign-in policy. When the user selects the **Forgot your password?** link, they are immediately sent to the Forgot Password experience. Your application no longer needs to handle the [AADB2C90118 error code](#password-reset-policy-legacy), and you don't need a separate policy for password reset.
@@ -204,7 +204,7 @@ The sub journey is called from the user journey and performs the specific steps
 
 ### Prepare your user journey
 
-Next, connect the **Forgot your password?** link to the Forgot Password sub journey. Reference the Forgot Password sub journey ID in the **ClaimsProviderSelection** element of the **CombinedSignInAndSignUp** step.
+Next, to connect the **Forgot your password?** link to the **Forgot Password** sub journey you will need to reference the **Forgot Password** sub journey ID in the **ClaimsProviderSelection** element of the **CombinedSignInAndSignUp** step.
 
 If you don't have your own custom user journey that has a **CombinedSignInAndSignUp** step, complete the following steps to duplicate an existing sign-up or sign-in user journey. Otherwise, continue to the next section.
 
@@ -287,9 +287,10 @@ Your application might need to detect whether the user signed in by using the Fo
 1. In the **Portal settings | Directories + subscriptions** pane, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
 1. In the Azure portal, search for and select **Azure AD B2C**.
 1. In the menu under **Policies**, select **Identity Experience Framework**.
-1. Select **Upload custom policy**. In the following order, upload the two policy files that you changed:
-   1. The extension policy, for example, *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*.
-   1. The relying party policy, for example, *SocialAndLocalAccounts/SignUpOrSignin.xml*.
+1. Select **Upload custom policy**. In the following order, upload the policy files that you changed:
+   1. The base file of your policy, for example *TrustFrameworkBase.xml*.  
+   1. The extension policy, for example, *TrustFrameworkExtensions.xml*.
+   1. The relying party policy, for example, *SignUpSignIn.xml*.
 
 ::: zone-end
 
@@ -341,8 +342,8 @@ To let your application users reset their passwords, create a password reset use
 To test the user flow:
 
 1. Select the user flow you created. On the user flow overview page, select **Run user flow**.
-1. For **Application**, select the web application named *webapp1* that you registered earlier. The **Reply URL** should be `https://jwt.ms`.
-1. Select **Run user flow**, verify the email address of the account you created earlier, and then select **Continue**.
+1. For **Application**, select the web application you wish to test, such as the one named *webapp1* if you registered that earlier. The **Reply URL** should be `https://jwt.ms`.
+1. Select **Run user flow**, verify the email address of the account that you want to reset the password for, and then select **Continue**.
 1. Change the password, and then select **Continue**. The token is returned to `https://jwt.ms` and the browser displays it.
 
 ::: zone-end