Merge branch 'main' into release-updatecenterv2-publicpreview

Author: v-alje

.openpublishing.redirection.azure-monitor.json

@@ -321,6 +321,11 @@
             "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-action-rules.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-processing-rules",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/data-explorer.md" ,
             "redirect_url": "/azure/data-explorer/data-explorer-insights",

.openpublishing.redirection.json

@@ -40237,6 +40237,16 @@
       "source_path_from_root": "/articles/azure-monitor/insights/sql-insights-troubleshoot.md",
       "redirect_url": "/azure/azure-sql/database/sql-insights-troubleshoot",
       "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/virtual-machines/windows/connect-logon.md",
+      "redirect_url": "/articles/virtual-machines/windows/connect-rdp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-machines/windows/winrm.md",
+      "redirect_url": "/articles/virtual-machines/windows/connect-winrm",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/TOC.yml

@@ -168,6 +168,14 @@
         href: enable-authentication-angular-spa-app.md
       - name: Authentication options
         href: enable-authentication-angular-spa-app-options.md
+    - name: React single-page application
+      items:
+      - name: Configure a sample React app
+        href: configure-authentication-sample-react-spa-app.md
+      - name: Enable authentication in your React app
+        href: enable-authentication-react-spa-app.md
+      - name: Authentication options
+        href: enable-authentication-react-spa-app-options.md
     - name: Android mobile app
       items:
       - name: Configure a sample Android app

articles/active-directory-b2c/configure-a-sample-node-web-app.md

@@ -8,7 +8,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 06/08/2022
+ms.date: 07/07/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
@@ -32,19 +32,13 @@ In this article, you’ll do the following tasks:
 
 ## Step 1: Configure your user flows
 
-[!INCLUDE [active-directory-b2c-app-integration-add-user-flow](../../includes/active-directory-b2c-app-integration-add-user-flow.md)] Repeat the steps to create three separate user flows as follows: 
-
-- A combined **Sign in and sign up** user flow, such as `susi`. This user flow also supports the **Forgot your password** experience.
-- A **Profile editing** user flow, such as `edit_profile`.
-- A **Password reset** user flow, such as `reset_password`.
-
-Azure AD B2C prepends `B2C_1_` to the user flow name. For example, `susi` becomes `B2C_1_susi`.
+[!INCLUDE [active-directory-b2c-app-integration-add-user-flow](../../includes/active-directory-b2c-app-integration-add-user-flow.md)] 
 
 ## Step 2: Register a web application
 
 To enable your application sign in with Azure AD B2C, register your app in the Azure AD B2C directory. The app registration establishes a trust relationship between the app and Azure AD B2C.  
 
-During app registration, you'll specify the *Redirect URI*. The redirect URI is the endpoint to which the user is redirected by Azure AD B2C after they authenticate with Azure AD B2C. The app registration process generates an *Application ID*, also known as the *client ID*, that uniquely identifies your app. After your app is registered, Azure AD B2C uses both the application ID and the redirect URI to create authentication requests. 
+During app registration, you'll specify the *Redirect URI*. The redirect URI is the endpoint to which the user is redirected by Azure AD B2C after they authenticate with Azure AD B2C. The app registration process generates an *Application ID*, also known as the *client ID*, that uniquely identifies your app. After your app is registered, Azure AD B2C uses both the application ID, and the redirect URI to create authentication requests. 
 
 ### Step 2.1: Register the app 
 
@@ -119,7 +113,7 @@ Open your web app in a code editor such as Visual Studio Code. Under the project
 |`EDIT_PROFILE_POLICY_AUTHORITY`|The **Profile editing** user flow authority such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<profile-edit-user-flow-name>`. Replace `<your-tenant-name>` with the name of your tenant and `<reset-password-user-flow-name>` with the name of your reset password user flow such as `B2C_1_edit_profile_node_app`. |
 |`AUTHORITY_DOMAIN`| The Azure AD B2C authority domain such as `https://<your-tenant-name>.b2clogin.com`. Replace `<your-tenant-name>` with the name of your tenant.|
 |`APP_REDIRECT_URI`| The application redirect URI where Azure AD B2C will return authentication responses (tokens). It matches the **Redirect URI** you set while registering your app in Azure portal, and it must be publicly accessible. Leave the value as is.|
-|`LOGOUT_ENDPOINT`| The Azure AD B2C sign out endpoint such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<sign-in-sign-up-user-flow-name>/oauth2/v2.0/logout?post_logout_redirect_uri=http://localhost:3000`. Replace `<your-tenant-name>` with the name of your tenant and `<sign-in-sign-up-user-flow-name>` with the name of your Sign in and Sign up user flow such as `B2C_1_susi`.|
+|`LOGOUT_ENDPOINT`| The Azure AD B2C sign-out endpoint such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<sign-in-sign-up-user-flow-name>/oauth2/v2.0/logout?post_logout_redirect_uri=http://localhost:3000`. Replace `<your-tenant-name>` with the name of your tenant and `<sign-in-sign-up-user-flow-name>` with the name of your Sign in and Sign up user flow such as `B2C_1_susi`.|
 
 Your final configuration file should look like the following sample:
 

articles/active-directory-b2c/configure-authentication-in-sample-node-web-app-with-api.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 06/08/2022
+ms.date: 07/07/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
@@ -65,13 +65,7 @@ The application registrations and the application architecture are described in
 
 ## Step 1: Configure your user flow
 
-[!INCLUDE [active-directory-b2c-app-integration-add-user-flow](../../includes/active-directory-b2c-app-integration-add-user-flow.md)] Repeat the steps to create three separate user flows as follows: 
-
-- A combined **Sign in and sign up** user flow, such as `susi`. This user flow also supports the **Forgot your password** experience.
-- A **Profile editing** user flow, such as `edit_profile`.
-- A **Password reset** user flow, such as `reset_password`.
-
-Azure AD B2C prepends `B2C_1_` to the user flow name. For example, `susi` becomes `B2C_1_susi`.
+[!INCLUDE [active-directory-b2c-app-integration-add-user-flow](../../includes/active-directory-b2c-app-integration-add-user-flow.md)]
 
 ## Step 2: Register your web app and API