Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-rest-api-version-2022-04-01

Author: rolyon

.openpublishing.publish.config.json

@@ -896,7 +896,7 @@
     ".openpublishing.redirection.defender-for-cloud.json",
     ".openpublishing.redirection.defender-for-iot.json",
     ".openpublishing.redirection.healthcare-apis.json",
-    ".openpublishing.redirection.iot-hub.json",
+    "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
     ".openpublishing.redirection.app-service.json",
     ".openpublishing.redirection.key-vault.json",
     ".openpublishing.redirection.sql-database.json",
@@ -950,7 +950,7 @@
     "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
     "articles/applied-ai-services/.openpublishing.archived.json",
     "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
-    ".openpublishing.redirection.baremetal-infrastructure.json"
-
+    ".openpublishing.redirection.baremetal-infrastructure.json",
+    "articles/iot-dps/.openpublishing.redirection.iot-dps.json"
   ]
 }

.openpublishing.redirection.active-directory.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path_from_root": "/articles/active-directory/authentication/concept-certificate-based-authentication-mobile.md",
+      "redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication-mobile-ios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/authentication/troubleshoot-certificate-based-authentication.md",
+      "redirect_url": "/azure/active-directory/authentication/certificate-based-authentication-faq",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/manage-apps/my-apps-deployment-plan.md",
       "redirect_url": "/azure/active-directory/manage-apps/myapps-overview",

.openpublishing.redirection.baremetal-infrastructure.json

@@ -49,7 +49,87 @@
             "source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/use-cases-and-supported-scenarios.md",
             "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/use-cases-and-supported-scenarios",
             "redirect_document_id": false
-        }                                  
+        },    
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/concepts-oracle-high-availability.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },  
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/options-considerations-high-availability.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/configure-snapcenter-oracle-baremetal.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },  
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/create-on-demand-backup-oracle-baremetal.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },  
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/netapp-snapcenter-integration-oracle-baremetal.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },  
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-architecture.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-ethernet.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },   
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-overview.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },    
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-patching.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },    
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-provision.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },    
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-skus.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },    
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-storage.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },    
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-high-availability-recovery.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },    
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/restore-oracle-database-baremetal.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },    
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/set-up-snapcenter-to-route-traffic.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/oracle/high-availability-features.md",
+            "redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
+            "redirect_document_id": false
+        }                     
     ]
 }
 

.openpublishing.redirection.defender-for-cloud.json

@@ -729,6 +729,11 @@
             "source_path_from_root": "/articles/defender-for-cloud/release-notes.md#auto-deployment-of-azure-monitor-agent-preview",
             "redirect_url": "/azure/defender-for-cloud/release-notes#azure-monitor-agent-integration-now-in-preview",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-cicd.md",
+            "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
+            "redirect_document_id": true
         }
 
       ]

.openpublishing.redirection.json

@@ -14138,61 +14138,6 @@
             "redirect_url": "/azure/industry-marketing/retail/visual-search-use-case-overview",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/iot-dps/concepts-auto-provisioning.md",
-            "redirect_url": "/azure/iot-dps/concepts-roles-operations",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/concepts-device.md",
-            "redirect_url": "/azure/iot-dps/concepts-service",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/concepts-security.md",
-            "redirect_url": "/azure/iot-dps/concepts-service#attestation-mechanism",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/use-hsm-with-sdk.md",
-            "redirect_url": "/azure/iot-dps/tutorial-custom-hsm-enrollment-group-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/how-to-use-sdk-tools.md",
-            "redirect_url": "/azure/iot-dps/tutorial-custom-hsm-enrollment-group-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/how-to-manage-enrollments-sdks.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-x509-java",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/how-to-manage-dps-with-cli.md",
-            "redirect_url": "/azure/iot-dps/quick-setup-auto-provision-cli",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/tutorial-net-provision-device-to-hub.md",
-            "redirect_url": "/azure/iot-dps/",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/tutorial-provision-device-to-hub.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/tutorial-set-up-cloud.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/tutorial-set-up-device.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/security/fundamentals/iot-overview.md",
             "redirect_url": "/azure/iot-fundamentals/iot-security-architecture",
@@ -26493,11 +26438,6 @@
             "redirect_url": "https://github.com/Azure/azure-webjobs-sdk/wiki",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/iot-dps/how-to-connect-mxchip-iot-devkit.md",
-            "redirect_url": "/azure/iot-develop/quickstart-devkit-mxchip-az3166",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/app-service-api/app-service-api-dotnet-swashbuckle-customize.md",
             "redirect_url": "https://github.com/Azure-Samples/app-service-api-dotnet-swashbuckle-swaggerresponse",
@@ -28574,116 +28514,6 @@
             "redirect_url": "/azure/aks/integrations#open-source-and-third-party-integrations",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-device-symmetric-key-csharp.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-device-symmetric-key-node.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-device-symmetric-key-python.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-symmetric-key-java.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-symm-key",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-tpm-csharp.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-tpm-java.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-tpm-node.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-tpm-python.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-x509-csharp.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-x509-java.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-x509-node.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-create-simulated-device-x509-python.md",
-            "redirect_url": "/azure/iot-dps/quick-create-simulated-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-x509-csharp.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-x509-java.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-x509-node.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-x509-python.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-x509",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-tpm-csharp.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-tpm-java.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-tpm-node.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/quick-enroll-device-tpm-python.md",
-            "redirect_url": "/azure/iot-dps/quick-enroll-device-tpm",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/iot-dps/how-to-use-custom-allocation-policies.md",
-            "redirect_url": "/azure/iot-dps/tutorial-custom-allocation-policies",
-            "redirect_document_id": false
-          },          
         {
             "source_path_from_root": "/articles/app-service/environment/app-service-app-service-environment-web-application-firewall.md",
             "redirect_url": "/azure/app-service/environment/integrate-with-application-gateway",
@@ -28943,7 +28773,13 @@
             "source_path": "articles/aks/keda-troubleshoot.md",
             "redirect_url": "/troubleshoot/azure/azure-kubernetes/troubleshoot-kubernetes-event-driven-autoscaling-add-on?context=/azure/aks/context/aks-context",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/windows/using-visual-studio-vm.md",
+            "redirect_url": "/visualstudio/install/using-visual-studio-vm",
+            "redirect_document_id": false
         }
+
     ]
 }
 

.openpublishing.redirection.virtual-desktop.json

@@ -31,9 +31,9 @@
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/virtual-machines/windows/using-visual-studio-vm.md",
-            "redirect_url": "/visualstudio/install/using-visual-studio-vm",
+            "source_path": "articles/virtual-desktop/azure-stack-hci-faq.yml",
+            "redirect_url": "/azure/virtual-desktop/azure-stack-hci",
             "redirect_document_id": false
-        }        
+        }       
     ]
 }

articles/active-directory-b2c/json-transformations.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 08/10/2022
+ms.date: 09/07/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
@@ -251,6 +251,26 @@ The following claims transformation outputs a JSON string claim that will be the
     }
     ```
 
+The **GenerateJson** claims transformation accepts plain strings. If an input claim contains a JSON string, that string will be escaped. In the following example, if you use email output from [CreateJsonArray above](json-transformations.md#example-of-createjsonarray), that is ["[email protected]"], as an input parameter, the email will look like as shown in the following JSON claim:
+
+- Output claim:
+  - **requestBody**:
+
+    ```json
+    {
+       "customerEntity":{
+          "email":"[\"[email protected]\"]",
+          "userObjectId":"01234567-89ab-cdef-0123-456789abcdef",
+          "firstName":"John",
+          "lastName":"Smith",
+          "role":{
+             "name":"Administrator",
+             "id": 1
+          }
+       }
+    }
+    ```
+
 ## GetClaimFromJson
 
 Get a specified element from a JSON data. Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json#getclaimfromjson) of this claims transformation.