Merge branch 'main' into patch-9

Author: Jak-MS

.openpublishing.build.ps1

@@ -590,6 +590,12 @@
             "branch": "main",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "msdocs-jboss-mysql-sample-app",
+            "url": "https://github.com/Azure-Samples/msdocs-jboss-mysql-sample-app",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "playwright-testing-service",
             "url": "https://github.com/microsoft/playwright-testing-service",

.openpublishing.publish.config.json

@@ -1,5 +1,105 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/lab-services/class-type-adobe-creative-cloud.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-adobe-creative-cloud",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-arcgis.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-arcgis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-autodesk.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-autodesk",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-big-data-analytics.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-big-data-analytics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-database-management.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-database-management",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-deep-learning-natural-language-processing.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-deep-learning-natural-language-processing",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-ethical-hacking.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-ethical-hacking",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-matlab.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-matlab",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-jupyter-notebook.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-jupyter-notebook",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-networking-gns3.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-networking-gns3",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-pltw.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-pltw",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-react-linux.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-react-linux",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-react-windows.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-react-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-rstudio-linux.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-rstudio-linux",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-rstudio-windows.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-rstudio-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-shell-scripting-linux.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-shell-scripting-linux",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-solidworks.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-solidworks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-sql-server.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-sql-server",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-types.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-types",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-create-lab-accounts.md",
+      "redirect_url": "/previous-versions/azure/lab-services/how-to-create-lab-accounts",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/devtest-labs/devtest-lab-integrate-ci-cd.md",
       "redirect_url": "/previous-versions/azure/devtest-labs/devtest-lab-integrate-ci-cd",
@@ -45,6 +145,11 @@
       "redirect_url": "/previous-versions/azure/azure-app-configuration/rest-api-fiddler",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-app-configuration/run-experiments-aspnet-core.md",
+      "redirect_url": "/azure/azure-app-configuration/concept-experimentation",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/public-multi-access-edge-compute-mec/considerations-for-deployment.md",
       "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/considerations-for-deployment",
@@ -3330,6 +3435,11 @@
       "redirect_url": "/azure/vpn-gateway/add-remove-site-to-site-connections",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-point-to-site-resource-manager-portal.md",
+      "redirect_url": "/azure/vpn-gateway/point-to-site-certificate-gateway",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-openvpn-clients.md",
       "redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",
@@ -3609,6 +3719,86 @@
       "source_path_from_root": "/articles/reliability/resiliency-recommendations/recommend-cosmos-db-nosql.md",
       "redirect_url": "/azure/reliability/reliability-cosmos-db-nosql",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-create-route-table-portal.md",
+      "redirect_url": "/azure/virtual-network/tutorial-create-route-table",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-create-route-table-powershell.md",
+      "redirect_url": "/azure/virtual-network/tutorial-create-route-table",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-create-route-table-cli.md",
+      "redirect_url": "/azure/virtual-network/tutorial-create-route-table",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-portal.md",
+      "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-powershell.md",
+      "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-cli.md",
+      "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-upload-firmware-using-azure-command-line-interface.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-upload-firmware-using-powershell.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/tutorial-analyze-firmware.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/defender-iot-firmware-analysis-faq.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/defender-iot-firmware-analysis-rbac.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+     },
+     {
+      "source_path_from_root": "/articles/virtual-network/ip-services/public-ip-upgrade-portal.md",
+      "redirect_url": "/azure/virtual-network/ip-services/public-ip-upgrade",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/ip-services/public-ip-upgrade-cli.md",
+      "redirect_url": "/azure/virtual-network/ip-services/public-ip-upgrade",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/ip-services/public-ip-upgrade-powershell.md",
+      "redirect_url": "/azure/virtual-network/ip-services/public-ip-upgrade",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-upload-firmware-using-python.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/defender-for-iot/device-builders/overview-firmware-analysis.md",
+      "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
+      "redirect_document_id": false
     }
   ]
-}
+}

.openpublishing.redirection.json

@@ -78,10 +78,10 @@ Content-type: application/json
      }
  ],
  "displayName": "John Smith",
- "objectId": "ab3ec3b2-a435-45e4-b93a-56a005e88bb7",
+ "objectId": "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb",
  "extension_<extensions-app-id>_CustomAttribute1": "custom attribute value",
  "extension_<extensions-app-id>_CustomAttribute2": "custom attribute value",
- "client_id": "231c70e8-8424-48ac-9b5d-5623b9e4ccf3",
+ "client_id": "00001111-aaaa-2222-bbbb-3333cccc4444",
  "step": "PreTokenIssuance",
  "ui_locales":"en-US"
 }
@@ -280,8 +280,8 @@ Save the files you changed: *TrustFrameworkBase.xml*, and *TrustFrameworkExtensi
   "exp": 1584961516,
   "nbf": 1584957916,
   "ver": "1.0",
-  "iss": "https://contoso.b2clogin.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
-  "aud": "e1d2612f-c2bc-4599-8e7b-d874eaca1ee1",
+  "iss": "https://contoso.b2clogin.com/aaaabbbb-0000-cccc-1111-dddd2222eeee/v2.0/",
+  "aud": "11112222-bbbb-3333-cccc-4444dddd5555",
   "acr": "b2c_1a_signup_signin",
   "nonce": "defaultNonce",
   "iat": 1584957916,

articles/active-directory-b2c/add-api-connector-token-enrichment.md

@@ -76,7 +76,7 @@ Content-type: application/json
      }
  ],
  "displayName": "John Smith",
- "objectId": "11111111-0000-0000-0000-000000000000",
+ "objectId": "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb",
  "givenName":"John",
  "surname":"Smith",
  "jobTitle":"Supplier",
@@ -88,7 +88,7 @@ Content-type: application/json
  "extension_<extensions-app-id>_CustomAttribute1": "custom attribute value",
  "extension_<extensions-app-id>_CustomAttribute2": "custom attribute value",
  "step": "<step-name>",
- "client_id":"93fd07aa-333c-409d-955d-96008fd08dd9",
+ "client_id":"00001111-aaaa-2222-bbbb-3333cccc4444",
  "ui_locales":"en-US"
 }
 ```
@@ -211,7 +211,7 @@ Content-type: application/json
  "extension_<extensions-app-id>_CustomAttribute1": "custom attribute value",
  "extension_<extensions-app-id>_CustomAttribute2": "custom attribute value",
  "step": "PostAttributeCollection",
- "client_id":"93fd07aa-333c-409d-955d-96008fd08dd9",
+ "client_id":"00001111-aaaa-2222-bbbb-3333cccc4444",
  "ui_locales":"en-US"
 }
 ```
@@ -262,7 +262,7 @@ POST <API-endpoint>
 Content-type: application/json
 
 {
- "clientId": "231c70e8-8424-48ac-9b5d-5623b9e4ccf3",
+ "clientId": "11112222-bbbb-3333-cccc-4444dddd5555",
  "step": "PreTokenApplicationClaims",
  "ui_locales":"en-US",
  "email": "[email protected]",
@@ -597,8 +597,8 @@ To return the promo code claim back to the relying party application, add an out
   "exp": 1584295703,
   "nbf": 1584292103,
   "ver": "1.0",
-  "iss": "https://contoso.b2clogin.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
-  "aud": "e1d2612f-c2bc-4599-8e7b-d874eaca1ee1",
+  "iss": "https://contoso.b2clogin.com/aaaabbbb-0000-cccc-1111-dddd2222eeee/v2.0/",
+  "aud": "22223333-cccc-4444-dddd-5555eeee6666",
   "acr": "b2c_1a_signup_signin",
   "nonce": "defaultNonce",
   "iat": 1584292103,

articles/active-directory-b2c/add-api-connector.md

@@ -234,9 +234,9 @@ For the various page layouts, use the following page layout versions:
 
 |Page layout |Page layout version range |
 |---------|---------|
-| Selfasserted  | >=2.1.30 |
-| Unifiedssp  | >=2.1.18 |
-|  Multifactor  |    >=1.2.16  |
+| Selfasserted  | >=2.1.33 |
+| Unifiedssp  | >=2.1.21 |
+|  Multifactor  |    >=1.2.19  |
 
 **Example:**
 

articles/active-directory-b2c/add-captcha.md

@@ -316,7 +316,7 @@ POST /<tenant-name>.onmicrosoft.com/B2C_1A_ROPC_Auth/oauth2/v2.0/token HTTP/1.1
 Host: <tenant-name>.b2clogin.com
 Content-Type: application/x-www-form-urlencoded
 
-username=contosouser.outlook.com.ws&password=Passxword1&grant_type=password&scope=openid+bef22d56-552f-4a5b-b90a-1988a7d634ce+offline_access&client_id=bef22d56-552f-4a5b-b90a-1988a7d634ce&response_type=token+id_token
+username=contosouser.outlook.com.ws&password=Passxword1&grant_type=password&scope=openid+00001111-aaaa-2222-bbbb-3333cccc4444+offline_access&client_id=00001111-aaaa-2222-bbbb-3333cccc4444&response_type=token+id_token
 ```
 
 A successful response with offline-access looks like the following example:
@@ -379,4 +379,4 @@ A successful response looks like the following example:
 
 ## Use a native SDK or App-Auth
 
-Azure AD B2C meets OAuth 2.0 standards for public client resource owner password credentials and should be compatible with most client SDKs. For the latest information, see [Native App SDK for OAuth 2.0 and OpenID Connect implementing modern best practices](https://appauth.io/).
+Azure AD B2C meets OAuth 2.0 standards for public client resource owner password credentials and should be compatible with most client SDKs. For the latest information, see [Native App SDK for OAuth 2.0 and OpenID Connect implementing modern best practices](https://appauth.io/).

articles/active-directory-b2c/add-ropc-policy.md

@@ -25,7 +25,7 @@ Age gating in Azure Active Directory B2C (Azure AD B2C) enables you to identify
 >This feature is in public preview. Do not use feature for production applications.
 >
 
-When age gating is enabled for a user flow, users are asked for their date of birth, and country of residence. If a user signs in that hasn't previously entered the information, they'll need to enter it the next time they sign in. The rules are applied every time a user signs in.
+When age gating is enabled for a user flow, users are asked for their date of birth, and country/region of residence. If a user signs in that hasn't previously entered the information, they'll need to enter it the next time they sign in. The rules are applied every time a user signs in.
 
 ![Screenshot of age gating information gather flow](./media/age-gating/age-gating-information-gathering.png)
 
@@ -69,7 +69,7 @@ After your tenant is set up to use age gating, you can then use this feature in
 1. To test your policy, select **Run user flow**.
 1. For **Application**, select the web application named *testapp1* that you previously registered. The **Reply URL** should show `https://jwt.ms`.
 1. Select the **Run user flow** button.
-1. Sign-in with a local or social account. Then select your country of residence, and date of birth that simulate a minor. 
+1. Sign-in with a local or social account. Then select your country/region of residence, and date of birth that simulate a minor. 
 1. Repeat the test, and select a date of birth that simulates an adult.  
 
 When you sign-in as a minor, you should see the following error message: *Unfortunately, your sign on has been blocked. Privacy and online safety laws in your country prevent access to accounts belonging to children.*

articles/active-directory-b2c/age-gating.md

@@ -47,7 +47,7 @@ eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6ImtyaU1QZG1Cd...
 {
     "name": "John Smith",
     "email": "[email protected]",
-    "oid": "d9674823-dffc-4e3f-a6eb-62fe4bd48a58"
+    "oid": "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb"
     ...
 }
 ```