Merge branch 'public' into patch-2

Author: denisebmsft

.openpublishing.redirection.json

@@ -9622,7 +9622,7 @@
     },
     {
       "source_path": "microsoft-365/security/office-365-security/configure-global-settings-for-safe-links.md",
-      "redirect_url": "/microsoft-365/security/office-365-security/safe-links-policies-global-settings-configure",
+      "redirect_url": "/microsoft-365/security/office-365-security/tenant-allow-block-list-urls-configure",
       "redirect_document_id": true
     },
     {
@@ -9688,7 +9688,7 @@
     {
       "source_path": "microsoft-365/security/office-365-security/allow-block-urls.md",
       "redirect_url": "/microsoft-365/security/office-365-security/tenant-allow-block-list-urls-configure",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "microsoft-365/security/office-365-security/threat-explorer.md",
@@ -10915,6 +10915,11 @@
     "redirect_url": "/microsoft-365/security/office-365-security/why-do-i-need-microsoft-defender-for-office-365",
     "redirect_document_id": false
   },
+  {
+    "source_path": "microsoft-365/security/office-365-security/safe-links-policies-global-settings-configure.md",
+    "redirect_url": "/microsoft-365/security/office-365-security/tenant-allow-block-list-urls-configure",
+    "redirect_document_id": false
+  },
   {
     "source_path": "microsoft-365/business-premium/m365bp-secure-users.md",
     "redirect_url": "/microsoft-365/business-premium/why-choose-microsoft-365-business-premium",
@@ -10965,10 +10970,55 @@
     "redirect_url": "/microsoft-365/business-premium/m365bp-protect-managed-devices",
     "redirect_document_id": true
   },
+  {
+    "source_path": "microsoft-365/frontline/flw-onboarding-wizard.md",
+    "redirect_url": "/microsoft-365/frontline/flw-setup-microsoft-365",
+    "redirect_document_id": false
+  },
   {
     "source_path": "microsoft-365/business-premium/m365bp-upgrade-windows-10-pro.md",
     "redirect_url": "/microsoft-365/business-premium/m365bp-upgrade-windows-pro",
     "redirect_document_id": true
+  },
+  {
+    "source_path": "microsoft-365/security/defender-business/mdb-next-gen-configuration-settings.md",
+    "redirect_url": "/microsoft-365/security/defender-business/mdb-next-generation-protection",
+    "redirect_document_id": true
+  },
+  {
+    "source_path": "microsoft-365/security/defender-business/mdb-custom-rules-firewall.md",
+    "redirect_url": "/microsoft-365/security/defender-business/mdb-firewall",
+    "redirect_document_id": true
+  },
+  {
+    "source_path": "microsoft-365/business-premium/m365bp-security-incident-quick-start.md",
+    "redirect_url": "/microsoft-365/business-premium/m365bp-security-operations-guide",
+    "redirect_document_id": true
+  },
+  {
+    "source_path": "microsoft-365/business-premium/m365bp-add-users.md",
+    "redirect_url": "/microsoft-365/business-premium/m365bp-admin-guide",
+    "redirect_document_id": true
+  },
+  {
+    "source_path": "microsoft-365/business-premium/m365bp-reset-passwords.md",
+    "redirect_url": "/microsoft-365/business-premium/m365bp-admin-guide",
+    "redirect_document_id": false
+  },
+  {
+    "source_path": "microsoft-365/business-premium/m365bp-reset-devices-to-factory-settings.md",
+    "redirect_url": "/mem/autopilot/windows-autopilot",
+    "redirect_document_id": false
+  },
+  {
+    "source_path": "microsoft-365/security/defender-endpoint/mde-sec-ops-guide.md",
+    "redirect_url": "/microsoft-365/security/defender-endpoint",
+    "redirect_document_id": false
+  },
+  {
+    "source_path": "microsoft-365/business-premium/m365bp-remove-company-data.md",
+    "redirect_url": "/microsoft-365/admin/add-users/remove-former-employee",
+    "redirect_document_id": false
   }
  ]
 }

microsoft-365/admin/activity-reports/activity-reports.md

@@ -116,10 +116,10 @@ Depending on your subscription, here are the available reports in all environmen
 |[Skype for Business Online conference organized activity](/SkypeForBusiness/skype-for-business-online-reporting/conference-organizer-activity-report)|Yes|Yes|N/A<sup>1</sup>|N/A<sup>1</sup>|Yes|
 |[Skype for Business Online conference participant activity](/SkypeForBusiness/skype-for-business-online-reporting/conference-participant-activity-report)|Yes|Yes|N/A<sup>1</sup>|N/A<sup>1</sup>|Yes|
 |[Skype for Business Online peer-to-peer activity](/SkypeForBusiness/skype-for-business-online-reporting/peer-to-peer-activity-report)|Yes|Yes|N/A<sup>1</sup>|N/A<sup>1</sup>|Yes|
-|[Viva Learning activity](viva-learning-activity.md)|Yes|N/A|N/A|N/A|N/A<sup>2</sup>|
-|[Viva Insights activity](viva-insights-activity.md)|Yes|Yes|N/A|N/A|N/A<sup>2</sup>|
-|[Project activity](project-activity.md)|Yes|Yes|N/A|N/A|N/A<sup>2</sup>|
-|[Visio activity](visio-activity.md)|Yes|Yes|N/A|N/A|N/A<sup>2</sup>|
+|[Viva Learning activity](viva-learning-activity.md)|Yes|N/A<sup>1</sup>|N/A<sup>1</sup>|N/A<sup>1</sup>|N/A<sup>2</sup>|
+|[Viva Insights activity](viva-insights-activity.md)|Yes|Yes|N/A<sup>1</sup>|N/A<sup>1</sup>|N/A<sup>2</sup>|
+|[Project activity](project-activity.md)|Yes|Yes|N/A<sup>1</sup>|N/A<sup>1</sup>|N/A<sup>2</sup>|
+|[Visio activity](visio-activity.md)|Yes|Yes|N/A<sup>1</sup>|N/A<sup>1</sup>|N/A<sup>2</sup>|
 
 N/A<sup>1</sup>: The report is in plan to be released in the future. The <a href="https://www.microsoft.com/en-us/microsoft-365/roadmap?filters=" target="_blank">Microsoft 365 Roadmap</a> will be updated before the release.
 

microsoft-365/admin/add-users/about-admin-roles.md

@@ -90,7 +90,7 @@ You'll probably only need to assign the following roles in your organization. By
 |License admin    |   Assign the License admin role to users who need to assign and remove licenses from users and edit their usage location. <br/><br/> License admins also can: <br> - Reprocess license assignments for group-based licensing <br> - Assign product licenses to groups for group-based licensing  |
 |Message center privacy reader    |   Assign the Message center privacy reader role to users who need to read privacy and security messages and updates in the Microsoft 365 Message center. Message center privacy readers may get email notifications related to data privacy, depending on their preferences, and they can unsubscribe using Message center preferences. Only global administrators and Message center privacy readers can read data privacy messages. This role has no permission to view, create, or manage service requests. <br><br>Message center privacy readers can also: <br> - Monitor all notifications in the Message Center, including data privacy messages <br> - View groups, domains, and subscriptions   |
 |Message center reader |   Assign the Message center reader role to users who need to do the following: <br> - Monitor message center notifications <br> - Get weekly email digests of message center posts and updates <br> - Share message center posts <br> - Have read-only access to Azure AD services, such as users and groups|
-|Office Apps admin    |   Assign the Office Apps admin role to users who need to do the following: <br> - Use the Cloud Policy service for Microsoft 365 to create and manage cloud-based policies for Office <br> - Create and manage service requests <br> - Manage the What's New content that users see in their Office apps   <br> - Monitor service health  |
+|Office Apps admin    |   Assign the Office Apps admin role to users who need to do the following: <br> - Use the Cloud Policy service for Microsoft 365 to create and manage cloud-based policies. <br> - Create and manage service requests <br> - Manage the What's New content that users see in their Microsoft 365 apps   <br> - Monitor service health  |
 |Organizational Message Writer    |    Assign the Organizational Message Writer role to users who need to write, publish, manage, and review the organizational messages for end-users through Microsoft product surfaces.   |
 |Password admin  |   Assign the Password admin role to a user who needs to reset passwords for non-administrators and Password Administrators.   |
 |Power Platform admin |   Assign the Power Platform admin role to users who need to do the following: <br> - Manage all admin features for Power Apps, Power Automate, and Microsoft Purview Data Loss Prevention <br> - Create and manage service requests <br> - Monitor service health  |

microsoft-365/admin/setup/upgrade-users-to-latest-office-client.md

@@ -25,11 +25,11 @@ ms.custom:
 - fwlink 824861; CampaignID O365_Comm_SR_UpgradeOffice
 - AdminSurgePortfolio
 ms.assetid: f6b00895-b5fd-4af6-a656-b7788ea20cbb
-description: Learn about how to upgrade Microsoft Office to the latest Office client for users in your organization.
+description: Learn about how to upgrade Microsoft Office to the latest Microsoft 365 apps for users in your organization.
 ms.topic: article
 ---
 
-# Upgrade your Microsoft 365 for business users to the latest Office client
+# Upgrade your Microsoft 365 for business users to the latest Microsoft 365 apps
 
 ## Get ready to upgrade to Microsoft 365
 
@@ -43,7 +43,7 @@ If you're the admin responsible for the Microsoft 365 for business subscription
 
 ## Upgrade steps
 
-The steps below will guide you through the process of upgrading your users to the latest Office desktop client. We recommend you read through these steps before beginning the upgrade process.
+The steps below will guide you through the process of upgrading your users to the latest Microsoft 365 desktop apps. We recommend you read through these steps before beginning the upgrade process.
 
 ## Step 1 - Check system requirements
 

microsoft-365/business-premium/TOC.yml

@@ -109,18 +109,10 @@
   items: 
     - name: Overview
       href: m365bp-maintain-environment.md
+    - name: Administration guide
+      href: m365bp-admin-guide.md
     - name: Security operations guide
-      href: m365bp-security-incident-quick-start.md
-    - name: Add users
-      href: m365bp-add-users.md
-    - name: Reset passwords
-      href: m365bp-reset-passwords.md
-    - name: Remove users who have left
-      href: ../admin/add-users/remove-former-employee.md?toc=/microsoft-365/business-premium/toc.json&bc=/microsoft-365/business-premium/breadcrumb/toc.json
-    - name: Remove data from devices
-      href: m365bp-remove-company-data.md
-    - name: Reset devices to factory settings
-      href: m365bp-reset-devices-to-factory-settings.md
+      href: m365bp-security-operations-guide.md
 - name: Reference
   items:
     - name: Top 10 ways to secure your business data