Merge pull request #3 from MicrosoftDocs/master

merge back

Author: shemers

.openpublishing.publish.config.json

@@ -231,6 +231,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-functions-python-worker-extension",
+      "url": "https://github.com/Azure-Samples/python-worker-extension-timer",
+      "branch": "main",
+      "branch_mapping": {}
+    },    
     {
       "path_to_root": "functions-openapi-turbine-repair",
       "url": "https://github.com/Azure-Samples/functions-openapi-turbine-repair",
@@ -381,6 +387,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": "remote-monitoring-webui",
       "url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -498,31 +510,31 @@
     {
       "path_to_root": "azure-sdk-for-java-event-hubs",
       "url": "https://github.com/Azure/azure-sdk-for-java/",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "azure-sdk-for-java-cosmos-db",
       "url": "https://github.com/Azure/azure-sdk-for-java/",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "azure-sdk-for-java-script-event-hubs",
       "url": "https://github.com/Azure/azure-sdk-for-js/",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "azure-sdk-for-net-event-hubs",
       "url": "https://github.com/Azure/azure-sdk-for-net/",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "azure-sdk-for-python-event-hubs",
       "url": "https://github.com/Azure/azure-sdk-for-python/",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -600,7 +612,7 @@
     {
       "path_to_root": "cosmosdb-python-sdk",
       "url": "https://github.com/Azure/azure-sdk-for-python/",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -621,6 +633,18 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "active-directory-aspnetcore-webapp-openidconnect-v2",
+      "url": "https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "sample-active-directory-aspnetcore-webapp-openidconnect-v2",
+      "url": "https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2",
+      "branch": "aspnetcore3-1",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cognitive-services-content-moderator-samples",
       "url": "https://github.com/Azure-Samples/cognitive-services-content-moderator-samples",
@@ -726,7 +750,7 @@
     {
       "path_to_root": "azure-sdk-for-net",
       "url": "https://github.com/Azure/azure-sdk-for-net/",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -740,6 +764,24 @@
       "url": "https://github.com/Azure-Samples/digital-twins-iothub-integration",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-spring-cloud-reference-architecture",
+      "url": "https://github.com/Azure/azure-spring-cloud-reference-architecture",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+    "path_to_root": "digital-twins-docs-samples-getting-started",
+    "url": "https://github.com/Azure-Samples/azure-digital-twins-getting-started",
+    "branch": "main",
+    "branch_mapping": {}
+    },
+    {
+      "path_to_root": "dotnet-samples",
+      "url": "https://github.com/dotnet/samples",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {
@@ -763,8 +805,21 @@
   },
   "redirection_files": [
     ".openpublishing.redirection.json",
+    ".openpublishing.redirection.defender-for-iot.json",
     ".openpublishing.redirection.healthcare-apis.json",
     ".openpublishing.redirection.security-benchmark.json",
-    ".openpublishing.redirection.media-services.json"
+    ".openpublishing.redirection.media-services.json",
+    ".openpublishing.redirection.data-factory.json",
+    "articles/azure-relay/.openpublishing.redirection.relay.json",    
+    "articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
+    "articles/event-hubs/.openpublishing.redirection.event-hubs.json",
+    "articles/event-grid/.openpublishing.redirection.event-grid.json",    
+    "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
+    "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
+    "articles/iot-central/.openpublishing.redirection.iot-central.json",
+    "articles/iot-pnp/.openpublishing.redirection.iot-pnp.json",
+    "articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
+    "articles/purview/.openpublishing.redirection.purview.json",
+    "articles/data-catalog/.openpublishing.redirection.data-catalog.json"
   ]
 }

.openpublishing.redirection.data-factory.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/data-factory/compute-optimized-retire.md",
+            "redirect_url": "/azure/data-factory/concepts-data-flow-overview",
+            "redirect_document_id": false
+        }
+    ]
+}