Merge branch 'main' into angelwong-patch-1

Author: angelwong

Diff for: .openpublishing.publish.config.json

@@ -28,6 +28,7 @@
       ],
       "open_to_public_contributors": true,
       "type_mapping": {
+        "ZonePivotGroups": "Toc",
         "Conceptual": "Content",
         "ManagedReference": "Content",
         "RestApi": "Content"
@@ -70,7 +71,7 @@
     {
       "path_to_root": "azure-docs",
       "url": "https://github.com/MicrosoftDocs/azure-docs-pr",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -92,6 +93,9 @@
   },
   "redirection_files": [
     ".openpublishing.redirection.json",
+    ".openpublishing.redirection.archive.2013.json",
+    ".openpublishing.redirection.archive.2015.json",
+    ".openpublishing.redirection.archive.2017.json",
     "docs/legacy/.openpublishing.redirection.legacy.json",
     "docs/pipelines/.openpublishing.redirection.pipelines.json",
     "docs/report/.openpublishing.redirection.report.json",