Merge branch 'main' into tiara1

Author: tiaraquan

.openpublishing.redirection.json

@@ -10,6 +10,11 @@
       "redirect_url": "/microsoftteams/guest-experience",
       "redirect_document_id": false
     },
+    {
+      "source_path": "microsoft-365/admin/manage/servicenow-service-health-incidents-solutions-only.md",
+      "redirect_url": "/microsoft-365/admin/manage/servicenow-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "microsoft-365/business-video/work-from-anywhere.md",
       "redirect_url": "https://support.microsoft.com/en-us/office/work-remotely-with-microsoft-365-164946c8-a47a-470e-a0b4-feb12a2eea04",
@@ -50,6 +55,41 @@
       "redirect_url": "https://support.microsoft.com/office/3f73d218-52d6-4f88-a733-9ff37073ee4c",
       "redirect_document_id": false
     },
+    {
+      "source_path": "microsoft-365/business-video/moveto-microsoft-365/add-google-domain.md",
+      "redirect_url": "/microsoft-365/admin/moveto-microsoft-365/add-google-domain",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/business-video/moveto-microsoft-365/cancel-google.md",
+      "redirect_url": "/microsoft-365/admin/moveto-microsoft-365/cancel-google",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/business-video/moveto-microsoft-365/connect-domain-tom365.md",
+      "redirect_url": "/microsoft-365/admin/moveto-microsoft-365/connect-domain-tom365",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/business-video/moveto-microsoft-365/migrate-email.md",
+      "redirect_url": "/microsoft-365/admin/moveto-microsoft-365/migrate-email",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/business-video/moveto-microsoft-365/move-from-google-workspace-overview.md",
+      "redirect_url": "/microsoft-365/admin/moveto-microsoft-365/move-from-google-workspace-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/business-video/moveto-microsoft-365/mover-migrate-files.md",
+      "redirect_url": "/microsoft-365/admin/moveto-microsoft-365/mover-migrate-files",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/business-video/moveto-microsoft-365/set-up-microsoft-365-forgoogle.md",
+      "redirect_url": "/microsoft-365/admin/moveto-microsoft-365/set-up-microsoft-365-forgoogle",
+      "redirect_document_id": false
+    },
     {
       "source_path": "microsoft-365/business-video/shared-calendar.md",
       "redirect_url": "https://support.microsoft.com/office/353ed2c1-3ec5-449d-8c73-6931a0adab88",
@@ -6647,6 +6687,11 @@
       "source_path": "microsoft-365/campaigns/share-files-and-videos.md",
       "redirect_url": "/microsoft-365/business-premium/share-files-and-videos",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "microsoft-365/compliance/what-the-dlp-functions-look-for.md",
+      "redirect_url": "/microsoft-365/compliance/sit-functions",
+      "redirect_document_id": false
     }
   ]
 }

microsoft-365/admin/TOC.yml

@@ -145,11 +145,11 @@
              href: add-users/remove-former-employee-step-1.md
            - name: Step 2. Save the contents of a former employee's mailbox
              href: add-users/remove-former-employee-step-2.md
-           - name: Step 3. Forward a former employee's email to another employee or convert to a shared mailbox
+           - name: Step 3. Wipe and block a former employee's mobile device
              href: add-users/remove-former-employee-step-3.md
-           - name: Step 4. Give another employee access to OneDrive and Outlook data
+           - name: Step 4. Forward a former employee's email to another employee or convert to a shared mailbox
              href: add-users/remove-former-employee-step-4.md
-           - name: Step 5. Wipe and block a former employee's mobile device
+           - name: Step 5. Give another employee access to OneDrive and Outlook data
              href: add-users/remove-former-employee-step-5.md
            - name: Step 6. Remove the Microsoft 365 license from a former employee
              href: add-users/remove-former-employee-step-6.md
@@ -328,8 +328,6 @@
              href: manage/servicenow-basic-authentication.md
            - name: Configure with Azure AD Auth Token
              href: manage/servicenow-aad-oauth-token.md
-           - name: Service health incidents and recommended solutions only
-             href: manage/servicenow-service-health-incidents-solutions-only.md
            - name: Testing the configuration
              href: manage/servicenow-testing-the-configuration.md
            - name: Troubleshooting
@@ -436,6 +434,28 @@
               href: basic-mobility-security/turn-off.md
             - name: Troubleshoot
               href: basic-mobility-security/troubleshoot.md
+    - name: Switch from Google Workspace to M365
+      items:
+        - name: Overview
+          href: moveto-microsoft-365/move-from-google-workspace-overview.md
+        - name: Sign up for Microsoft 365
+          href: admin-overview/sign-up-for-office-365.md?toc=/microsoft-365/admin/moveto-microsoft-365/toc.json&bc=/microsoft-365/admin/moveto-microsoft-365/breadcrumb/toc.json
+        - name: Set up Microsoft 365 for Google migration
+          href: moveto-microsoft-365/set-up-microsoft-365-forgoogle.md
+        - name: Set up security policies for Windows devices
+          href: setup/secure-win-10-pcs.md?toc=/microsoft-365/admin/moveto-microsoft-365/toc.json&bc=/microsoft-365/admin/moveto-microsoft-365/breadcrumb/toc.json
+        - name: Add Google Workspace Domain 
+          href: moveto-microsoft-365/add-google-domain.md
+        - name: Install Office apps and Microsoft Teams
+          href: setup/install-applications.md?toc=/microsoft-365/admin/moveto-microsoft-365/toc.json&bc=/microsoft-365/admin/moveto-microsoft-365/breadcrumb/toc.json
+        - name: Migrate email, calendar, and contacts to Microsoft 365
+          href: moveto-microsoft-365/migrate-email.md
+        - name: Connect your domain to Microsoft 365
+          href: moveto-microsoft-365/connect-domain-tom365.md
+        - name: Use Migration Manager to move everyone's data
+          href: moveto-microsoft-365/migrate-files-migration-manager.md
+        - name: Cancel Google Workspace
+          href: moveto-microsoft-365/cancel-google.md
     - name: Work with customers
       items: 
         - name: Share sites and files with guest users

microsoft-365/admin/add-users/remove-former-employee-step-6.md

@@ -30,6 +30,8 @@ description: "Follow these steps to remove the Microsoft 365 license from a form
 # Step 6 - Remove the Microsoft 365 license from a former employee
 
 If you don't want to pay for a license after someone leaves your organization, you need to remove their Microsoft 365 license and then delete it from your subscription. You can assign a license to another user if you don't delete it.
+
+If the mailbox needs to be accessed by authorized people who have been granted eDiscovery permissions for compliance or legal reasons, it must be assigned an Exchange Online Plan 2 license (or an Exchange Online Plan 1 license with an Exchange Online Archiving add-on license) so that a hold can be applied to the mailbox before it's deleted. After the user account is deleted, any Exchange Online license associated with the user account will be available to assign to a new user.
 
 When you remove the license, all that user's data is held for 30 days. You can [access](get-access-to-and-back-up-a-former-user-s-data.md) the data, or [restore](restore-user.md) the account if the user comes back. After 30 days, all the user's data (except for documents stored on SharePoint Online) is permanently deleted from Microsoft 365 and can't be recovered.
 

microsoft-365/admin/add-users/remove-former-employee.md

@@ -31,7 +31,7 @@ description: "Follow the steps in this solution to remove a former employee from
 
 # Overview: Remove a former employee and secure data
 
-A question we often get is, "What should I do to secure data and protect access when an employee leaves my organization?" This article series explains how to block access to Microsoft 365 so these user's can't sign in to Microsoft 365, the steps you should take to secure organization data, and how to allow other employees to access email and OneDrive data.
+A question we often get is, "What should I do to secure data and protect access when an employee leaves my organization?" This article series explains how to block access to Microsoft 365 so these users can't sign in to Microsoft 365, the steps you should take to secure organization data, and how to allow other employees to access email and OneDrive data.
 
 > [!TIP]
 > If you need help with the steps in this topic, consider [working with a Microsoft small business specialist](https://go.microsoft.com/fwlink/?linkid=2186871). With Business Assist, you and your employees get around-the-clock access to small business specialists as you grow your business, from onboarding to everyday use.
@@ -82,12 +82,11 @@ After you remove a user, you have up to 30 days to restore their account.
 |---|---|
 |[Step 1 - Prevent a former employee from logging in and block access to Microsoft 365 services](remove-former-employee-step-1.md)|This blocks your former employee from logging in to Microsoft 365 and prevents the person from accessing Microsoft 365 services.|
 |[Step 2 - Save the contents of a former employee's mailbox](remove-former-employee-step-2.md)|This is useful for the person who is going to take over the employee's work, or if there is litigation.|
-|[Step 3 - Forward a former employee's email to another employee or convert to a shared mailbox](remove-former-employee-step-3.md)|This lets you keep the former employee's email address active. If you have customers or partners still sending email to the former employee's address, this gets them to the person taking over the work.|
-|[Step 4 - Give another employee access to OneDrive and Outlook data](remove-former-employee-step-4.md)|If you only remove a user's license but don't delete the account, the content in the user's OneDrive will remain accessible to you even after 30 days. <p> Before you delete the account, you should give access of their OneDrive and Outlook to another user. After you delete an employee's account, the content in their OneDrive and Outlook is retained for **30** days. During that 30 days, however, you can restore the user's account, and gain access to their content. If you restore the user's account, the OneDrive and Outlook content will remain accessible to you even after 30 days.|
-|[Step 5 - Wipe and block a former employee's mobile device](remove-former-employee-step-5.md)|Removes your business data from the phone or tablet.|
+|[Step 3 - Wipe and block a former employee's mobile device](remove-former-employee-step-3.md)|Removes your business data from the phone or tablet.|
+|[Step 4 - Forward a former employee's email to another employee or convert to a shared mailbox](remove-former-employee-step-4.md)|This lets you keep the former employee's email address active. If you have customers or partners still sending email to the former employee's address, this gets them to the person taking over the work.|
+|[Step 5 - Give another employee access to OneDrive and Outlook data](remove-former-employee-step-5.md)|If you only remove a user's license but don't delete the account, the content in the user's OneDrive will remain accessible to you even after 30 days. <p> Before you delete the account, you should give access of their OneDrive and Outlook to another user. After you delete an employee's account, the content in their OneDrive and Outlook is retained for **30** days. During that 30 days, however, you can restore the user's account, and gain access to their content. If you restore the user's account, the OneDrive and Outlook content will remain accessible to you even after 30 days.| 
 |[Step 6 - Remove and delete the Microsoft 365 license from a former employee](remove-former-employee-step-6.md)|When you remove a license, you can assign it to someone else. Or, you can delete the license so you don't pay for it until you hire another person. <p> When you remove or delete a license, the user's old email, contacts, and calendar are retained for **30 days**, then permanently deleted. If you remove or delete a license but don't delete the account, the content in the user's OneDrive will remain accessible to you even after 30 days.|
 |[Step 7 - Delete a former employee's user account](remove-former-employee-step-7.md)|This removes the account from your admin center. Keeps things clean.|
-|
 
 ## Related content
 

microsoft-365/admin/admin-overview/sign-up-for-office-365.md

@@ -64,6 +64,7 @@ Need help with choosing a plan? Sales consultants are available to answer your q
 ::: moniker-end
 
 ::: moniker range="o365-worldwide"
+
 ## Ready to sign up for a free trial or buy a subscription?
 
 Go to [Compare all products](https://products.office.com/compare-all-microsoft-office-products?tab=2) to choose the plan you want to buy and to start the sign-up wizard. 
@@ -72,9 +73,9 @@ If you start with a free trial, you can [buy it later](../../commerce/try-or-buy
 
 You don't need to cancel your trial. If you don't buy the trial subscription, it automatically expires at the end of the trial period, and all the information is permanently deleted.
 
-## Watch: Set up Microsoft 365 Business Premium
+## Watch: Sign up for Microsoft 365 Business Premium
 
-> [!VIDEO https://www.microsoft.com/videoplayer/embed/RE471FJ]
+> [!VIDEO https://www.microsoft.com/videoplayer/embed/RE3znhX]
 
 ::: moniker-end
 
@@ -102,6 +103,10 @@ You don't need to cancel your trial. If you don't buy the trial subscription, it
     > [!IMPORTANT]
     >  When you sign up, be sure to choose the best payment option for your organization. Changing payment options involves calling billing support.
 
+## Watch: Set up Microsoft 365 Business Premium
+
+> [!VIDEO https://www.microsoft.com/videoplayer/embed/RE471FJ]
+
 ## Related content
 
 [Microsoft 365 for business training videos](../../business-video/index.yml) (link page)

microsoft-365/admin/admin-video-library.yml

@@ -178,9 +178,17 @@ landingContent:
         - text: Employee quick setup  
           url: ../business-video/employee-quick-setup.md
   # Card
-  - title: Switch from Google Workspace
+  - title: Switch from Google Workspace to M365
     linkLists:
       - linkListType: video
         links:
-          - text: Switch from Google Workspace
-            url: ../business-video/moveto-microsoft-365/move-from-google-workspace-overview.md
+          - text: Set up Microsoft 365 for Google Workspace migration
+            url: /moveto-microsoft-365/set-up-microsoft-365-forgoogle
+          - text: Add your Google Workspace domain to Microsoft 365
+            url: /moveto-microsoft-365/add-google-domain
+          - text: Migrate business email and calendar from Google Workspace
+            url: /moveto-microsoft-365/migrate-email          
+          - text: Connect your domain to Microsoft 365 for business
+            url: /moveto-microsoft-365/connect-domain-tom365
+          - text: Migrate Google files to Microsoft 365 for business with Migration Manager
+            url: /moveto-microsoft-365/migrate-files-migration-manager

microsoft-365/admin/manage/centralized-deployment-of-add-ins.md

@@ -80,10 +80,10 @@ Check with your organization's Exchange admin to find out which configuration is
 
 ### Admin requirements
 
-In order to deploy an add-in via Centralized Deployement, you need to be either a Global admin or an Exchange admin in the organization.
+In order to deploy an add-in via Centralized Deployment, you need to be either a Global admin or an Exchange admin in the organization.
 
 > [!NOTE]
-> An Exchange admin can deploy an add-in only if the **App Registrations** property is set to true in Azure Active Directory admin center as shown in the following image:
+> An Exchange admin can deploy an add-in if the **Application Administrator** role is added or if the **App Registrations** property is set to true in Azure Active Directory admin center as shown in the following image:
 >
 > ![image](https://user-images.githubusercontent.com/89943918/144516704-8874a10d-b540-41f3-ae9d-c07a8d7e143f.png)
 

microsoft-365/admin/manage/servicenow-overview.md

@@ -21,6 +21,8 @@ description: "Scoped Certified application installation and configuration guide
 
 # Microsoft 365 support integration with ServiceNow configuration overview
 
+The following content applies to the Microsoft 365 support integration app with a minimum version of **1.0.7**.
+
 **Microsoft 365 support integration** enables you to integrate Microsoft 365 help, support, and service health with your ServiceNow instances. You can research Microsoft known and reported issues, resolve incidents, complete tasks by using Microsoft recommended solutions, and, if necessary, escalate to Microsoft human-assisted support.
 
 For the **Microsoft 365 support integration** app from the ServiceNow store, go to the [ServiceNow Store](https://store.servicenow.com/sn_appstore_store.do#!/store/application/6d05c93f1b7784507ddd4227cc4bcb9f).
@@ -75,18 +77,14 @@ Permissions required:
 
 After the Microsoft 365 Support Integration app has been installed, two Application Cross-Scope accesses are created. If they're not created successfully, create them manually.
 
-## What features will work for your organization based on your configuration?
-
-Before setting up any configuration for Microsoft 365 support integration, review your answers to these questions:
-
-**Question \#1**: Does your ServiceNow environment allow Basic Authentication (access with ServiceNow user credential) for inbound webservice calls?
+## What configuration is right for your organization?
 
-**Question \#2**: If you have multiple tenants, do you plan to use a single tenant integrated with your ServiceNow environment for Microsoft 365 support integration?
+After you've downloaded the app, navigate to the Microsoft 365 setup wizard in your SNOW environment to complete the setup process.
+:::image type="content" source="../../media/154124985-76e13e7d-b32e-4741-830b-bbb110d3ecbf.png" alt-text="Snow setup wizard":::
 
-Depending on your answers to the questions above, this table tells you what features are available and how to set up Microsoft 365 support integration. For a description of each feature, see [Microsoft 365 support integration](https://store.servicenow.com/sn_appstore_store.do#!/store/application/6d05c93f1b7784507ddd4227cc4bcb9f).
+You can learn more about the steps by visiting the following pages:
+- If your ServiceNow environment allows Basic Authentication (access with ServiceNow user credential) for inbound webservice calls, then follow instructions in [Set up Microsoft 365 support integration with ServiceNow Basic Authentication](servicenow-basic-authentication.md).
+- If your ServiceNow environment does NOT allows Basic Authentication (access with ServiceNow user credential) for inbound webservice calls, then follow instructions in [Set up Microsoft 365 support integration with Azure AD Auth Token](servicenow-aad-oauth-token.md).
+  - This configuration will require an SSO tenant in order for the AAD Auth Token to work correctly.
 
-| Question \#1 Answer | Question \#2 Answer | What features are available? | Configuration steps |
-|---------------------|---------------------|-----------|----------------|
-| Yes                 | Yes/No              | Service Health Incidents Recommended Solutions Microsoft service request | [Set up Microsoft 365 support integration with ServiceNow Basic Authentication](servicenow-basic-authentication.md) |
-| No                  | Yes                 | Service Health Incidents Recommended Solutions Microsoft service request | [Set up Microsoft 365 support integration with Azure AD Auth Token](servicenow-aad-oauth-token.md)                 |
-| No                  | No                  | Service Health Incidents Recommended Solutions                           | [Set up Microsoft 365 support integration for Insights ONLY](servicenow-service-health-incidents-solutions-only.md)                    |
+To understand each feature, see [Microsoft 365 support integration](https://store.servicenow.com/sn_appstore_store.do#!/store/application/6d05c93f1b7784507ddd4227cc4bcb9f).