Merge pull request #9210 from simonxjx/simon-6

AB#6427: Multiple updates

Author: Simonx Xu

.openpublishing.publish.config.json

@@ -196,7 +196,8 @@
     "support/azure/.openpublishing.redirection.azure.json",
     "support/system-center/.openpublishing.redirection.systemcenter.json",
     "SkypeForBusiness/.openpublishing.redirection.skypeforbusiness.json",
-    "SharePoint/.openpublishing.redirection.SharePoint.json"
+    "SharePoint/.openpublishing.redirection.SharePoint.json",
+    "Microsoft365/.openpublishing.redirection.microsoft365.json"
   ],
   "need_generate_pdf_url_template": true
 }

Exchange/Hub/index.yml

@@ -23,14 +23,10 @@ productDirectory:
       # imageSrc should be square in ratio with no whitespace
       imageSrc: /media/logos/logo-ms-social.png
       links:
-        - url: /troubleshoot/microsoft-365/o365-enterprise-welcome
-          text: Microsoft 365 Enterprise
         - url: /troubleshoot/microsoft-365/o365-admin-welcome
           text: Microsoft 365 admin center
         - url: /troubleshoot/microsoft-365/microsoft-purview-welcome
           text: Microsoft Purview
-        - url: /troubleshoot/microsoft-365/microsoft-365-security-welcome
-          text: Microsoft 365 Security
     # Card
     - title: Microsoft Teams
       imageSrc: /media/logos/logo_MSTeams.svg
@@ -43,7 +39,7 @@ productDirectory:
       imageSrc: /support/media/hub-landing/logo-m365-app.png
       links:
         - url: /troubleshoot/office/office-client-welcome
-          text: Microsoft 365 Apps (Office products)
+          text: Microsoft 365 Apps
         - url: /troubleshoot/office/office-experts-welcome
           text: From the Office Experts
     # Card

Microsoft365/.openpublishing.redirection.microsoft365.json

@@ -0,0 +1,64 @@
+{
+  "redirections": [
+    {
+      "source_path": "enterprise/administration/com-net-errors-after-migration.md",
+      "redirect_url": "/troubleshoot/microsoft-365/access-management/com-net-errors-after-migration"
+    },
+    {
+      "source_path": "enterprise/administration/diagnostic-log-collection-in-support-and-recovery-assistant.md",
+      "redirect_url": "/previous-versions/troubleshoot/content-retirement"
+    },
+    {
+      "source_path": "enterprise/o365-enterprise-welcome.yml",
+      "redirect_url": "/previous-versions/troubleshoot/content-retirement"
+    },
+    {
+      "source_path": "enterprise/administration/assistant-outlook-scan.md",
+      "redirect_url": "/troubleshoot/microsoft-365/miscellaneous/assistant-outlook-scan"
+    },
+    {
+      "source_path": "enterprise/administration/assistant-reset-office-activation.md",
+      "redirect_url": "/troubleshoot/microsoft-365/miscellaneous/assistant-reset-office-activation"
+    },
+    {
+      "source_path": "enterprise/administration/assistant-teams-meeting-add-in-outlook.md",
+      "redirect_url": "/troubleshoot/microsoft-365/miscellaneous/assistant-teams-meeting-add-in-outlook"
+    },
+    {
+      "source_path": "enterprise/administration/sara-command-line-version.md",
+      "redirect_url": "/troubleshoot/microsoft-365/miscellaneous/sara-command-line-version"
+    },
+    {
+      "source_path": "enterprise/administration/assistant-office-activation.md",
+      "redirect_url": "/troubleshoot/microsoft-365/miscellaneous/assistant-office-activation"
+    },
+    {
+      "source_path": "enterprise/administration/assistant-office-shared-computer-activation.md",
+      "redirect_url": "/troubleshoot/microsoft-365/miscellaneous/assistant-office-shared-computer-activation"
+    },
+    {
+      "source_path": "enterprise/administration/assistant-office-uninstall.md",
+      "redirect_url": "/troubleshoot/microsoft-365/miscellaneous/assistant-office-uninstall"
+    },
+    {
+      "source_path": "enterprise/administration/assistant-outlook-calendar-scan.md",
+      "redirect_url": "/troubleshoot/microsoft-365/miscellaneous/assistant-outlook-calendar-scan"
+    },
+    {
+      "source_path": "security/o365-security/invalid-security-code-office-365-azure.md",
+      "redirect_url": "/previous-versions/troubleshoot/content-retirement"
+    },
+    {
+      "source_path": "security/microsoft-365-security-welcome.yml",
+      "redirect_url": "/previous-versions/troubleshoot/content-retirement"
+    },
+    {
+      "source_path": "security/o365-security/account-security-alert-email.md",
+      "redirect_url": "/troubleshoot/microsoft-365/account-security/account-security-alert-email"
+    },
+    {
+      "source_path": "security/o365-security/cannot-access-application-from-ios-device.md",
+      "redirect_url": "/troubleshoot/microsoft-365/account-security/cannot-access-application-from-ios-device"
+    }
+  ]
+}

Microsoft365/Hub/context/enterprise-context.yml

@@ -23,14 +23,10 @@ productDirectory:
       # imageSrc should be square in ratio with no whitespace
       imageSrc: /media/logos/logo-ms-social.png
       links:
-        - url: ../enterprise/o365-enterprise-welcome.yml
-          text: Microsoft 365 Enterprise
         - url: ../admin/o365-admin-welcome.yml
           text: Microsoft 365 admin center
         - url: ../purview/microsoft-purview-welcome.yml
           text: Microsoft Purview
-        - url: ../security/microsoft-365-security-welcome.yml
-          text: Microsoft 365 Security
     # Card
     - title: Microsoft Teams
       imageSrc: /media/logos/logo_MSTeams.svg
@@ -43,7 +39,7 @@ productDirectory:
       imageSrc: /support/media/hub-landing/logo-m365-app.png
       links:
         - url: /troubleshoot/office/office-client-welcome
-          text: Microsoft 365 Apps (Office Products)
+          text: Microsoft 365 Apps
         - url: /troubleshoot/office/office-experts-welcome
           text: From the Office Experts
     # Card