bring even with master (resolve conflicts)

Author: aczechowski

.acrolinx-config.edn

@@ -1,2 +1,2 @@
-{:allowed-branchname-matches ["^master$" "^release..*"]
- :allowed-filename-matches ["(?i)^memdocs/(?:(?!configmgr/mdt/use-the-mdt.md))"]}
+{:allowed-branchname-matches ["main" "release-.*"]
+ :allowed-filename-matches ["(?i)memdocs/(?:(?!configmgr/mdt/use-the-mdt.md))" "windows-365"]}

.openpublishing.publish.config.json

@@ -13,6 +13,20 @@
       },
       "build_entry_point": "docs",
       "template_folder": "_themes"
+    },
+    {
+      "docset_name": "windows-365",
+      "build_source_folder": "windows-365",
+      "build_output_subfolder": "windows-365",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
     }
   ],
   "notification_subscribers": [
@@ -21,21 +35,27 @@
   "sync_notification_subscribers": [],
   "branches_to_filter": [],
   "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/memdocs",
-  "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": {},
   "dependent_repositories": [
     {
       "path_to_root": "_themes",
       "url": "https://github.com/Microsoft/templates.docs.msft",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "mde",
+      "url": "https://github.com/MicrosoftDocs/microsoft-365-docs-pr/",
       "branch": "master",
       "branch_mapping": {}
     },
     {
       "path_to_root": "_themes.pdf",
       "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     }
   ],
@@ -54,4 +74,4 @@
   "docs_build_engine": {
     "name": "docfx_v3"
   }
-}
+}