Merge pull request #29399 from MicrosoftDocs/main

OOB publish main to live to remove articles added in PR 29387

Author: garycentric

.openpublishing.redirection.admin.json

@@ -42,8 +42,8 @@
        },
        {
          "source_path": "microsoft-365/campaigns/m365-campaigns-protect-admin-accounts.md",
-         "redirect_url": "/microsoft-365/business-premium/m365bp-protect-admin-accounts",
-         "redirect_document_id": true
+         "redirect_url": "/microsoft-365/admin/security-and-compliance/m365b-account-security-admins",
+         "redirect_document_id": false
        },
        {
          "source_path": "microsoft-365/campaigns/m365-campaigns-protect-campaign-infographic.md",
@@ -57,8 +57,8 @@
        },
        {
          "source_path": "microsoft-365/campaigns/m365-campaigns-security-overview.md",
-         "redirect_url": "/microsoft-365/business-premium/m365bp-security-overview",
-         "redirect_document_id": true
+         "redirect_url": "/microsoft-365/admin/security-and-compliance/m365bp-security-benefits",
+         "redirect_document_id": false
        },
        {
          "source_path": "microsoft-365/campaigns/m365-campaigns-sign-in.md",
@@ -99,6 +99,6 @@
          "source_path": "microsoft-365/campaigns/share-files-and-videos.md",
          "redirect_url": "/microsoft-365/business-premium/share-files-and-videos",
          "redirect_document_id": true
-       },
+       }
     ]
  }

.openpublishing.redirection.business.json

@@ -3787,7 +3787,7 @@
      },
      {
        "source_path": "microsoft-365/security-and-compliance/index.md",
-       "redirect_url": "/microsoft-365/business-premium/secure-your-business-data",
+       "redirect_url": "/microsoft-365/admin/security-and-compliance/m365b-security-best-practices",
        "redirect_document_id": false
      },
      {

.openpublishing.redirection.campaigns.json

@@ -19,6 +19,6 @@ You have two options:
 
   :::image type="content" source="../media/microsoft-365-copilot-e5-guide/purview-sensitivity-labels-prompt.png" alt-text="In Microsoft Purview Information Protection, turn on sensitivity labels for SharePoint and OneDrive." lightbox="../media/microsoft-365-copilot-e5-guide/purview-sensitivity-labels-prompt.png":::
 
-- **Option 2**: Use the `[Set-SPOTenant](/powershell/module/sharepoint-online/set-spotenant)` Windows PowerShell cmdlet.
+- **Option 2**: Use the `[Set-SPOTenant](/powershell/module/microsoft.online.sharepoint.powershell/set-spotenant)` Windows PowerShell cmdlet.
 
 To learn more about this configuration, see [Enable sensitivity labels for files in SharePoint and OneDrive](/purview/sensitivity-labels-sharepoint-onedrive-files).

.openpublishing.redirection.security.json

@@ -474,50 +474,76 @@ items:
       href: ../commerce/index.yml
     - name: Secure your organization
       items: 
-        - name: Multi-factor authentication for Microsoft 365
-          href: security-and-compliance/multi-factor-authentication-microsoft-365.md
-        - name: Set up multi-factor authentication
-          href: security-and-compliance/set-up-multi-factor-authentication.md
-        - name: Manage and monitor priority accounts
-          href: setup/priority-accounts.md
-        - name: Increase threat protection for Microsoft 365 for business
-          href: security-and-compliance/increase-threat-protection.md
-        - name: Turn on Idle session timeout
-          href: manage/idle-session-timeout-web-apps.md
-        - name: A guide to GDPR compliance
-          href: security-and-compliance/gdpr-compliance.md
-    - name: Manage devices and app data
-      items:
-        - name: Device and app data protection methods
-          href: basic-mobility-security/choose-between-basic-mobility-and-security-and-intune.md
-        - name: Manage user consent to apps
-          href: misc/user-consent.md
-        - name: Basic Mobility and Security
+        - name: Microsoft 365 for business security overview
+          href: security-and-compliance/m365b-security-overview.md
+        - name: What's new in security in Microsoft 365 for business
+          href: security-and-compliance/m365b-security-whats-new.md
+        - name: Get started
+          items:
+          - name: Microsoft 365 for business security best practices
+            href: security-and-compliance/m365b-security-best-practices.md
+          - name: Set up information protection in Microsoft 365 Business Premium
+            href: security-and-compliance/m365bp-information-protection.md
+          - name: Why should I choose Microsoft 365 Business Premium?
+            href: security-and-compliance/m365bp-security-benefits.md
+          - name: Monitor Microsoft 365 Business Premium and Defender for Business
+            href: security-and-compliance/m365bp-security-monitor.md
+          - name: Add Microsoft 365 E5 Security to Microsoft 365 Business Premium
+            href: security-and-compliance/m365bp-add-m365e5s.md
+          - name: Secure Microsoft 365 Copilot for small businesses
+            href: security-and-compliance/m365b-copilot-security.md
+          - name: GDPR simplified - A guide for your small business
+            href: security-and-compliance/gdpr-compliance.md
+        - name: Account security
+          items:
+            - name: Multi-factor authentication in Microsoft 365
+              href: security-and-compliance/multi-factor-authentication-microsoft-365.md
+            - name: Set up multi-factor authentication
+              href: security-and-compliance/set-up-multi-factor-authentication.md
+            - name: Admin account security in Microsoft 365 for business
+              href: security-and-compliance/m365b-account-security-admins.md
+            - name: Manage and monitor priority accounts
+              href: security-and-compliance/priority-accounts.md
+        - name: Email & Collaboration security
+          items:
+            - name: Email and collaboration security in Microsoft 365 for business
+              href: security-and-compliance/m365b-email-collaboration-security.md
+            - name: Protect users against phishing and other attacks in Microsoft 365 for business
+              href: security-and-compliance/m365b-users-phishing-spam-malware.md
+        - name: Device security
           items:
+          - name: Device protection in Microsoft 365 Business Premium
+            items:
+            - name: Microsoft Intune and Microsoft Defender for Business
+              href: security-and-compliance/m365bp-devices-protection.md
+            - name: Device management and application management in Microsoft 365 Business Premium
+              href: security-and-compliance/m365bp-devices-enrollment.md
+            - name: Device groups and Microsoft Intune categories in Microsoft 365 Business Premium
+              href: security-and-compliance/m365bp-devices-groups-categories.md
+          - name: Basic Mobility and Security
+            items:
             - name: Overview of Basic Mobility and Security
-              href: basic-mobility-security/overview.md
-            - name: Compare Basic Mobility and Security and Intune
-              href: basic-mobility-security/choose-between-basic-mobility-and-security-and-intune.md
-            - name: Capabilities of Basic Mobility and Security
-              href: basic-mobility-security/capabilities.md  
+              href: security-and-compliance/m365b-devices-basic-mobility-security-overview.md
             - name: Set up Basic Mobility and Security
-              href: basic-mobility-security/set-up.md
-            - name: Create device security policies
-              href: basic-mobility-security/create-device-security-policies.md
-            - name: Create an APNs certificate for iOS devices
-              href: basic-mobility-security/create-an-apns-certificate-for-ios-devices.md
-            - name: Manage device access settings
-              href: basic-mobility-security/manage-device-access-settings.md
-            - name: Manage enrolled devices
-              href: basic-mobility-security/manage-enrolled-devices.md
-            - name: Enroll your mobile device
-              href: basic-mobility-security/enroll-your-mobile-device.md
-            - name: Frequently asked questions
-              href: basic-mobility-security/frequently-asked-questions.yml
-            - name: Wipe mobile devices
-              href: basic-mobility-security/wipe-mobile-device.md
-            - name: Turn off Basic Mobility and Security
-              href: basic-mobility-security/turn-off.md
+              href: security-and-compliance/m365b-devices-basic-mobility-security-set-up.md
+            - name: Configure policies in Basic Mobility and Security
+              href: security-and-compliance/m365b-devices-basic-mobility-security-policies-configure.md
+            - name: Enroll devices in Basic Mobility and Security
+              href: security-and-compliance/m365b-devices-basic-mobility-security-enroll-devices.md
+            - name: View device details in Basic Mobility and Security
+              href: security-and-compliance/m365b-devices-basic-mobility-security-view-device-details.md
+            - name: Wipe devices in Basic Mobility and Security
+              href: security-and-compliance/m365b-devices-basic-mobility-security-wipe-devices.md
+            - name: Turn off Basic Mobility and Security enforcement
+              href: security-and-compliance/m365b-devices-basic-mobility-security-turn-off.md
+          - name: Use Windows Autopilot to set up or reset devices
+            href: /autopilot/overview?toc=/microsoft-365/admin/security-and-compliance/toc.json&bc=/microsoft-365/admin/security-and-compliance/breadcrumb/toc.json
+          - name: Manage Microsoft 365 installation options for devices
+            href: /DeployOffice/manage-software-download-settings-office-365?toc=/microsoft-365/admin/security-and-compliance/toc.json&bc=/microsoft-365/admin/security-and-compliance/breadcrumb/toc.json
+          - name: Manage user consent to apps
+            href: misc/user-consent.md
+          - name: Turn on Idle session timeout
+            href: manage/idle-session-timeout-web-apps.md
     - name: Switch from Google Workspace to M365
       items:
         - name: Overview

copilot/includes/copilot-e5-e3-enable-sensitivity-labels-sharepoint-onedrive.md

@@ -206,7 +206,7 @@ If the user has no photo, the commands return the error: `Exception of type 'Mic
   Remove-MgUserPhoto -UserId [email protected]
   ```
 
-  For detailed syntax and parameter information, see [Remove-MgUserPhoto](/powershell/module/exchange/remove-userphoto).
+  For detailed syntax and parameter information, see [Remove-MgUserPhoto](/powershell/module/exchangepowershell/remove-userphoto).
 
 - **Microsoft 365 Groups**:
 
@@ -222,7 +222,7 @@ If the user has no photo, the commands return the error: `Exception of type 'Mic
   Remove-MgGroupPhoto -GroupId 173cd812-5563-439c-9da4-bc2715fa2aee
   ```
 
-  For detailed syntax and parameter information, see [Remove-MgGroupPhoto](/powershell/module/exchange/remove-userphoto).
+  For detailed syntax and parameter information, see [Remove-MgGroupPhoto](/powershell/module/exchangepowershell/remove-userphoto).
 
 ## Configure photo update settings in your Microsoft 365 organization
 

microsoft-365/admin/TOC.yml

@@ -47,7 +47,7 @@ Before you begin, think about what you want to do with the user's email and OneD
 |:-----|:-----|
 |Product licenses |You can remove the license from the user and remove it from your subscriptions to stop paying for that license. If you select this option, the license will be removed automatically from your subscriptions.  <br/><br/> **You can't remove the license** if you bought it through a Partner or volume licensing. If you're paying for an annual plan or if you're in the middle of a billing cycle, you won't be able to remove the license from your subscription until your commitment is completed. |
 |OneDrive content |If the user saved their files to OneDrive, you can give another user access to these files.  <br/><br/> You'll need to move the files you want to keep within the retention period that is set for OneDrive files. **By default, the retention period is 30 days.** If you don't move the files within the retention period after deleting the user, the OneDrive for the deleted user is moved to the site collection recycle bin, where it is kept for 93 days. During this time, users will no longer be able to access any shared content in the OneDrive. To restore the OneDrive, you need to use PowerShell. For info, see [Restore a deleted OneDrive](/onedrive/restore-deleted-onedrive).<br/><br/> To increase the number of days that you retain OneDrive files for deleted accounts, see [Set the OneDrive retention for deleted users](/onedrive/set-retention).  <br/><br/> **Important!** If the deleted user used a personal computer to download files from SharePoint and OneDrive, there's no way for you to wipe those files they stored on their computer. They will continue to have access to any files that were synced from OneDrive. |
-|Email | Giving another user access to the deleted user's email will convert the deleted user's mailbox to a shared mailbox. The new mailbox owner can then access the mailbox and monitor for new email. You'll also have the following options:  <br/>  <br/>Change the display name - We recommend changing the display name so that it will be easy to identify the shared mailbox in the **Active users** list.  <br/>  <br/>  Turn on automatic replies - We've already written a polite automatic reply for you. You can send different automatic replies to people within your organization and people from outside your organization. <br/> <br/> [Remove any existing calendar permissions](/powershell/module/exchange/remove-mailboxfolderpermission) using PowerShell. <br/> <br/> Clean up aliases - Aliases are additional email addresses for users. Some organizations don't use them, so if you don't have any you don't need to do anything else here. If the user does have aliases, we recommend removing them so that you can reuse those email addresses. Otherwise, you can't reuse those email addresses until the retention period for deleted mailboxes has passed. By default, a deleted mailbox is recoverable for 30 days. For more information, see  [Delete or restore user mailboxes in Exchange Online](/exchange/recipients-in-exchange-online/delete-or-restore-mailboxes#delete-a-user-mailbox). |
+|Email | Giving another user access to the deleted user's email will convert the deleted user's mailbox to a shared mailbox. The new mailbox owner can then access the mailbox and monitor for new email. You'll also have the following options:  <br/>  <br/>Change the display name - We recommend changing the display name so that it will be easy to identify the shared mailbox in the **Active users** list.  <br/>  <br/>  Turn on automatic replies - We've already written a polite automatic reply for you. You can send different automatic replies to people within your organization and people from outside your organization. <br/> <br/> [Remove any existing calendar permissions](/powershell/module/exchangepowershell/remove-mailboxfolderpermission) using PowerShell. <br/> <br/> Clean up aliases - Aliases are additional email addresses for users. Some organizations don't use them, so if you don't have any you don't need to do anything else here. If the user does have aliases, we recommend removing them so that you can reuse those email addresses. Otherwise, you can't reuse those email addresses until the retention period for deleted mailboxes has passed. By default, a deleted mailbox is recoverable for 30 days. For more information, see  [Delete or restore user mailboxes in Exchange Online](/exchange/recipients-in-exchange-online/delete-or-restore-mailboxes#delete-a-user-mailbox). |
 |Active Directory |If your business uses **Active Directory** that is synchronizing with Microsoft Entra ID, you need to delete the user account from Active Directory. You can't do it through Microsoft 365. For instructions, see [Delete a User Account](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/cc753730(v=ws.11)). |
 
 ### Get started

microsoft-365/admin/add-users/change-user-profile-photos.md

@@ -30,7 +30,7 @@ description: "Use the Exchange admin center to wipe and block a former employee'
 
 # Step 3 - Wipe and block a former employee's mobile device
 
-If your former employee had an organization phone, you can use the <a href="https://go.microsoft.com/fwlink/p/?linkid=2059104" target="_blank">Exchange admin center</a> to wipe and block that device so that all organization data is removed from the device and it can no longer connect to Microsoft 365. If your organization uses Basic Mobility and Security to manage mobile devices, you can wipe and block those devices [using Basic Mobility and Security](../basic-mobility-security/wipe-mobile-device.md).
+If your former employee had an organization phone, you can use the <a href="https://go.microsoft.com/fwlink/p/?linkid=2059104" target="_blank">Exchange admin center</a> to wipe and block that device so that all organization data is removed from the device and it can no longer connect to Microsoft 365. If your organization uses Basic Mobility and Security to manage mobile devices, you can wipe and block those devices [using Basic Mobility and Security](/microsoft-365/admin/security-and-compliance/m365b-devices-basic-mobility-security-wipe-devices).
 
 ## Wipe mobile device using the Exchange admin center
 

microsoft-365/admin/add-users/delete-a-user.md

@@ -90,4 +90,4 @@ If you're using Microsoft Entra ID, see the [Remove-MgUser](/powershell/module/m
 
 [Restore a user](restore-user.md) (article)\
 [Assign or unassign licenses for users in the Microsoft 365 admin center](../manage/assign-licenses-to-users.md) (article)\
-[Remove-CalendarEvents](/powershell/module/exchange/remove-calendarevents)
+[Remove-CalendarEvents](/powershell/module/exchangepowershell/remove-calendarevents)