Merge branch 'main' into front-door-domain-quickstarts

Author: johndowns

.openpublishing.publish.config.json

@@ -34,7 +34,7 @@
   ],
   "branches_to_filter": [],
   "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
-  "git_repository_branch_open_to_public_contributors": "master",
+  "git_repository_branch_open_to_public_contributors": "main",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
   "contribution_branch_mappings": {},
@@ -381,6 +381,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "media-services-v3-python",
+      "url": "https://github.com/Azure-Samples/media-services-v3-python",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-javascript",
       "url": "https://github.com/Microsoft/tsiclient",
@@ -411,12 +417,6 @@
       "branch": "main",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "media-services-v3-python",
-      "url": "https://github.com/Azure-Samples/media-services-v3-python",
-      "branch": "main",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "remote-monitoring-webui",
       "url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -893,11 +893,12 @@
     "articles/purview/.openpublishing.redirection.purview.json",
     "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
     "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
+    "articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
     "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
     "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
     "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
     "articles/mysql/.openpublishing.redirection.mysql.json",
     "articles/container-apps/.openpublishing.redirection.container-apps.json",
     "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
   ]
-}
+}

.openpublishing.redirection.active-directory.json

@@ -3483,7 +3483,7 @@
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-enable.md",
             "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-faqs.md",
@@ -3498,7 +3498,7 @@
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-overview.md",
             "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-overview",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-troubleshooting.md",
@@ -3510,6 +3510,11 @@
             "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-windows-settings-reference",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/active-directory/devices/enterprise-state-roaming-overview.md",
+            "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/active-directory/device-management-faq.md",
             "redirect_url": "/azure/active-directory/devices/faq",

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

@@ -60,6 +60,11 @@
             "redirect_url": "/azure/defender-for-cloud/os-coverage",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds.md",
+            "redirect_url": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/security-center/security-center-just-in-time.md",
             "redirect_url": "/azure/defender-for-cloud/just-in-time-access-usage",
@@ -632,7 +637,7 @@
         },
         {
             "source_path_from_root": "/articles/security-center/supported-machines-endpoint-solutions-clouds.md",
-            "redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds",
+            "redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
             "redirect_document_id": true
         },
         {

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/storage/blobs/storage-ios-how-to-use-blob-storage.md",
+      "redirect_url": "/previous-versions/azure/storage/blobs/storage-ios-how-to-use-blob-storage",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/virtual-machines/linux/login-using-aad.md",
       "redirect_url": "/previous-versions/azure/virtual-machines/linux/login-using-aad",
@@ -683,6 +688,31 @@
       "redirect_url": "/azure/frontdoor/troubleshoot-issues",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/frontdoor/concept-rule-set-actions.md",
+      "redirect_url": "/azure/frontdoor/front-door-rules-engine-actions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/frontdoor/concept-rules-set.md",
+      "redirect_url": "/azure/frontdoor/front-door-rules-engine",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/frontdoor/concept-caching.md",
+      "redirect_url": "/azure/frontdoor/front-door-caching",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/frontdoor/concept-route.md",
+      "redirect_url": "/azure/frontdoor/front-door-route-matching",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/frontdoor/concept-rule-set-url-redirect-and-rewrite.md",
+      "redirect_url": "/azure/frontdoor/front-door-url-redirect",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/app-service-web/web-sites-dotnet-deploy-aspnet-mvc-app-membership-oauth-sql-database.md",
       "redirect_url": "/aspnet/core/security/authorization/secure-data",
@@ -6843,6 +6873,11 @@
       "redirect_url": "/azure/azure-functions/functions-kubernetes-keda",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-functions/functions-bindings-event-iot-output.md",
+      "redirect_url": "/azure/azure-functions/functions-bindings-event-hubs-output",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-government/documentation-government-k8.md",
       "redirect_url": "/azure/azure-government",
@@ -9109,8 +9144,18 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "articles/azure-resource-manager/managed-application-createuidefinition-overview.md",
-      "redirect_url": "/azure/azure-resource-manager/managed-applications/create-uidefinition-overview",
+      "source_path": "articles/azure-resource-manager/managed-applications/scripts/managed-application-cli-sample-create-application.md",
+      "redirect_url": "/azure/azure-resource-manager/managed-applications/scripts/managed-application-define-create-cli-sample",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-resource-manager/managed-applications/scripts/managed-application-cli-sample-create-definition.md",
+      "redirect_url": "/azure/azure-resource-manager/managed-applications/scripts/managed-application-define-create-cli-sample",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-resource-manager/managed-applications/scripts/managed-application-cli-sample-get-managed-group-resize-vm.md",
+      "redirect_url": "/azure/azure-resource-manager/managed-applications/update-managed-resources",
       "redirect_document_id": false
     },
     {
@@ -19864,6 +19909,11 @@
       "redirect_url": "/azure/machine-learning/how-to-deploy-custom-docker-image",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/machine-learning/service/tutorial-labeling.md",
+      "redirect_url": "/azure/machine-learning/how-to-create-image-labeling-projects",
+      "redirect_document_id": "false"
+    },
     {
       "source_path_from_root": "/articles/machine-learning/service/how-to-deploy-existing-model.md",
       "redirect_url": "/azure/machine-learning/how-to-deploy-and-where",
@@ -32784,6 +32834,11 @@
       "redirect_url": "tutorial-app-containerization-java-kubernetes",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/migrate/migrate-appliance-architecture.md",
+      "redirect_url": "discovered-metadata",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/storage/common/storage-access-blobs-queues-portal.md",
       "redirect_url": "articles/storage/blobs/authorize-blob-access-portal",
@@ -38679,6 +38734,11 @@
       "redirect_url": "/azure/cognitive-services/Speech-Service/language-identification",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/cognitive-services/Speech-Service/phone-sets.md",
+      "redirect_url": "/azure/cognitive-services/Speech-Service/customize-pronunciation",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/cognitive-services/entitylinking/GettingStarted.md",
       "redirect_url": "/azure/cognitive-services/text-analytics",
@@ -43919,24 +43979,10 @@
         "redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
         "redirect_document_id": false
       },
-      {   "source_path_from_root": "/articles/azure/marketplace/co-sell-requirements.md",
-          "redirect_url": "/partner-center/co-sell-requirements",
-          "redirect_document_id": false
-      },        
       {
-        "source_path_from_root": "/articles/azure/marketplace/co-sell-status.md",
-        "redirect_url": "/partner-center/co-sell-status",
+        "source_path_from_root": "/articles/virtual-desktop/compare-virtual-desktop-windows-365.md",
+        "redirect_url": "/azure/virtual-desktop/overview",
         "redirect_document_id": false
-      },
-      {
-          "source_path_from_root": "/articles/azure/marketplace/co-sell-configure.md",
-          "redirect_url": "/partner-center/co-sell-configure",
-          "redirect_document_id": false
-      },
-      {
-          "source_path_from_root": "/articles/azure/marketplace/co-sell-overview.md",
-          "redirect_url": "/partner-center/co-sell-overview",
-          "redirect_document_id": false
       }
   ]
 }

.openpublishing.redirection.media-services.json

@@ -634,10 +634,60 @@
             "source_path_from_root": "/articles/media-services/latest/architecture-design-multi-drm-system.md",
             "redirect_url": "/azure/media-services/latest/drm-content-protection-concept",
             "redirect_document_id": true
-          },     
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/job-create-cli-how-to.md",
+            "redirect_url": "/azure/media-services/latest/job-create-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-subclip-video-dotnet-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-subclip-video-how-to",
+            "redirect_document_id": false
+          }, 
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-subclip-video-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-subclip-video-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-presets-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-generate-thumbnails-dotnet-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-generate-thumbnails-how-to",
+            "redirect_document_id": false
+          },   
+          {
+            "source_path_from_root": "/articles/media-services/latest/crop-howto.md",
+            "redirect_url": "/azure/media-services/latest/transform-crop-how-to",
+            "redirect_document_id": false
+          },  
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-preset-cli-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-preset-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-generate-thumbnails-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-generate-thumbnails-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/media-reserved-units-cli-how-to.md",
+            "redirect_url": "/azure/media-services/latest/media-reserved-units-how-to",
+            "redirect_document_id": false
+          },
         {
-            "source_path_from_root": "/articles/media-services/latest/latest/questions-collection.md",
-            "redirect_url": "/articles/media-services/latest/frequently-asked-questions.yml",
+            "source_path_from_root": "/articles/media-services/latest/latest/asset-publish-cli-how-to.md",
+            "redirect_url": "/azure/media-services/latest/video-on-demand-simple-portal-quickstart",
             "redirect_document_id": false
       }       
     ]

.vscode/settings.json

@@ -342,3 +342,5 @@ Your application needs to handle certain errors coming from Azure B2C service. L
 ## Next steps
 
 Set up a [force password reset](force-password-reset.md).
+
+[Sign-up and Sign-in with embedded password reset](https://github.com/azure-ad-b2c/samples/tree/master/policies/embedded-password-reset).