Merge branch 'master' into siosulli-working

.openpublishing.redirection.json

@@ -1605,6 +1605,41 @@
       "redirect_url": "https://docs.microsoft.com/microsoft-365/compliance/classifier-get-started-with",
       "redirect_document_id": false
     },
+    {
+      "source_path": "microsoft-365/enterprise/microsoft-365-policies-configurations.md",
+      "redirect_url": "https://docs.microsoft.com/microsoft-365/security/microsoft-365-policies-configurations",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/enterprise/identity-access-prerequisites.md",
+      "redirect_url": "https://docs.microsoft.com/microsoft-365/security/identity-access-prerequisites",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/enterprise/identity-access-policies.md",
+      "redirect_url": "https://docs.microsoft.com/microsoft-365/security/identity-access-policies",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/enterprise/identity-access-policies-guest-access.md",
+      "redirect_url": "https://docs.microsoft.com/microsoft-365/security/identity-access-policies-guest-access",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/enterprise/teams-access-policies.md",
+      "redirect_url": "https://docs.microsoft.com/microsoft-365/security/teams-access-policies",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/enterprise/secure-email-recommended-policies.md",
+      "redirect_url": "https://docs.microsoft.com/microsoft-365/security/secure-email-recommended-policies",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "microsoft-365/enterprise/sharepoint-file-access-policies.md",
+      "redirect_url": "https://docs.microsoft.com/microsoft-365/security/sharepoint-file-access-policies",
+      "redirect_document_id": false
+    },
     {
       "source_path": "microsoft-365/compliance/classifier-using-a-ready-to-use-classifier.md",
       "redirect_url": "https://docs.microsoft.com/microsoft-365/compliance/classifier-learn-about",

microsoft-365/admin/create-groups/manage-groups.md

@@ -191,10 +191,10 @@ This option is great if you want to have a company email address such as info@co
 
 [Manage guest access to Microsoft 365 groups](https://support.microsoft.com/office/bfc7a840-868f-4fd6-a390-f347bf51aff6)
 
-[Choose the domain to use when creating Microsoft 365 groups](choose-domain-to-create-groups.md)
+[Choose the domain to use when creating Microsoft 365 groups](../../solutions/choose-domain-to-create-groups.md)
 
-[Allow members to send as or send on behalf of a Microsoft 365 group](allow-members-to-send-as-or-send-on-behalf-of-group.md)
+[Allow members to send as or send on behalf of a Microsoft 365 group](../../solutions/allow-members-to-send-as-or-send-on-behalf-of-group.md)
 
 [Upgrade distribution lists to Microsoft 365 groups](../manage/upgrade-distribution-lists.md)
 
-[Manage Microsoft 365 groups with PowerShell](https://docs.microsoft.com/microsoft-365/enterprise/powershell/manage-office-365-groups-with-powershell)
+[Manage Microsoft 365 groups with PowerShell](https://docs.microsoft.com/microsoft-365/enterprise/manage-microsoft-365-groups-with-powershell)

microsoft-365/admin/email/convert-user-mailbox-to-shared-mailbox.md

@@ -46,48 +46,9 @@ When you convert a user's mailbox to a shared mailbox, all of the existing email
 
 4. If the mailbox is smaller than 50 GB, you can remove the [license from the user](../manage/remove-licenses-from-users.md), and stop paying for it. Don't delete the user's account. The shared mailbox needs it there as an anchor. If you are converting the mailbox of an employee that is leaving your organization, you should take additional steps to make sure that they cannot log in anymore. Please see [Remove a former employee from Microsoft 365](../add-users/remove-former-employee.md).
 
-5. For everything else you need to know about shared mailboxes, see [About shared mailboxes](about-shared-mailboxes.md) and [Create a shared mailbox](create-a-shared-mailbox.md).
-
-## Use the Microsoft 365 admin center to convert a mailbox
-
-::: moniker range="o365-worldwide"
-
-1. In the admin center, go to the **Users** \> <a href="https://go.microsoft.com/fwlink/p/?linkid=834822" target="_blank">Active users</a> page.
-
-2. Select the name of the user whose mailbox you want to convert.
-
-3. Reset the user's password.
-
-   > [!NOTE]
-   > It's not required to reset the user's password during mailbox conversion. However, if the password is not reset, **the original username and password continue to work** after the mailbox conversion is finished.
-
-4. On the **Mail** tab, under **More actions**, select **Convert to shared mailbox**. 
-
-::: moniker-end
-
-::: moniker range="o365-germany"
-
-1. In the admin center, go to the **Users** \> <a href="https://go.microsoft.com/fwlink/p/?linkid=847686" target="_blank">Active users</a> page.
-
-2. Select the user whose mailbox you want to convert.
-
-3. In the right pane, expand **Mail Settings**. Next to **More settings**, select **Convert to shared mailbox**.
-
-::: moniker-end
-
-::: moniker range="o365-21vianet"
-
-1. In the admin center, go to the **Users** \> <a href="https://go.microsoft.com/fwlink/p/?linkid=850628" target="_blank">Active users</a> page.
-
-2. Select the user whose mailbox you want to convert.
-
-3. In the right pane, expand **Mail Settings**. Next to **More settings**, select **Convert to shared mailbox**.
-
-::: moniker-end
-
+> [!NOTE]
+> It's not required to reset the user's password during mailbox conversion. However, if the password is not reset, **the original username and password continue to work** after the mailbox conversion is finished.
 
-If the mailbox is smaller than 50 GB, you can [remove the license from the user](../manage/remove-licenses-from-users.md), and stop paying for it. Don't delete the user's old mailbox. The shared mailbox needs it there as an anchor. If you are converting the mailbox of an employee that is leaving your organization, you should take additional steps to make sure that they cannot log in anymore. See [Remove a former employee from Microsoft 365](../add-users/remove-former-employee.md).
-
 For everything else you need to know about shared mailboxes, see [About shared mailboxes](about-shared-mailboxes.md) and [Create a shared mailbox](create-a-shared-mailbox.md).
 
 > [!NOTE]

microsoft-365/admin/get-help-with-domains/transfer-a-domain-from-microsoft-to-another-host.md

@@ -50,13 +50,16 @@ Follow these steps to get a code at Microsoft 365, and then go to the other doma
 
 7. Copy the authorization code and wait about 30 minutes for your domain transfer status to change to **Unlocked for transfer** on the **Registration** tab before you proceed with next steps.
 
-8. Go to the website of the domain registrar you want to manage your domain name going forward. Follow directions for transferring a domain (search for help on their website).
+8. Go to the website of the domain registrar you want to manage your domain name going forward. Follow directions for transferring a domain (search for help on their website). This usually means paying transfer fees and giving the Authcode to the new registrar so they can initiate the transfer. Microsoft will email you to confirm we’ve received the transfer request, and the domain will transfer within 5 days.
 
-You can find the authorization code **Registration** tab on the  **Domains** page in Microsoft 365.
+    You can find the authorization code **Registration** tab on the  **Domains** page in Microsoft 365.
+
+    > [!TIP]
+    > .uk domains require a different procedure. Contact Microsoft Support and request an **IPS Tag change** to match the registrar you want to manage your domain going forward. Once the tag changes, the domain immediately transfers to the new registrar. You will then need to work with the new registrar to complete the transfer, likely paying transfer fees and adding the transferred domain to your account with your new registrar.
 
 9. After the transfer is complete, you'll renew your domain at the new domain registrar.
 
-10. To finish the process, go back to the **Domains** page in the admin center, and then select  **Complete domain transfer**.
+10. To finish the process, go back to the **Domains** page in the admin center, and then select  **Complete domain transfer**. This will mark the domain as no longer purchased from Microsoft 365, and will disable the domain subscription. It will not remove the domain from the tenant, and will not affect existing users and mailboxes on the domain.
 
 > [!NOTE]
 > Microsoft 365 purchased domains are not eligible for nameserver changes or transferring the domain between Microsoft 365 organizations. If either of these are required, the domain registration must be transferred to another registrar.

microsoft-365/admin/manage/change-address-contact-and-more.md

@@ -65,7 +65,7 @@ To change other information on your company's profile page:
 
 ## Change your alternate email address
 
-As an admin, you can change your your alternate email address for resetting passwords.
+As an admin, you can change your alternate email address for resetting passwords.
 
 1. Go to the <a href="https://go.microsoft.com/fwlink/p/?linkid=2024339" target="_blank">Microsoft 365 admin center</a>.
 

microsoft-365/admin/productivity/productivity-score.md

@@ -24,7 +24,7 @@ description: "Overview of Microsoft productivity score."
 
 # Microsoft Productivity Score (Preview)
 
-Productivity Score helps organizations transform how work gets done with insights about how people use Microsoft 365 and the technology experiences that support them. The score reflects your organization’s performance against employee and technology experience measures and compares your score with organizations like yours.
+Productivity Score helps organizations transform how work gets done with insights about how people use Microsoft 365 and the technology experiences that support them. The score reflects your organization’s performance against people and technology experiences measures and compares your score with organizations like yours.
 
 The score includes:
 
@@ -34,18 +34,18 @@ The score includes:
 
 We provide data, insights, and recommendations in two areas: 
 
-- **Employee experience:** We measure how people collaborate on content, how they use Microsoft 365 products to communicate, and whether they use Microsoft 365 across platforms. 
+- **People experiences:** We measure how people collaborate on content, how they use Microsoft 365 products to communicate, and whether they use Microsoft 365 across platforms. 
 
     We provide these insights because when people collaborate online, they save time. With the freedom to work on any device, they are more productive and satisfied. Communicating in a flexible way makes people more efficient, form better relationships, and your organization is more unified. For evidence, see [Forrester report](https://vc2prod.blob.core.windows.net/vc-resources/TEIStudies/TEI%20of%20Microsoft%20365%20E5%20-%20Oct%202018.pdf).
 
-- **Technology experience:** Productivity depends on reliable and performant technology as well as the efficient use of Microsoft 365. We provide [endpoint analytics](https://aka.ms/endpointanalytics), which helps you understand how your users’ productivity can be impacted by performance and health issues with your endpoint hardware and software. We also provide recommended actions to remediate them as well as Microsoft 365 network connectivity insights for your organization.
+- **Technology experiences:** Productivity depends on reliable and performant technology as well as the efficient use of Microsoft 365. We provide [endpoint analytics](https://aka.ms/endpointanalytics), which helps you understand how your users’ productivity can be impacted by performance and health issues with your endpoint hardware and software. We also provide recommended actions to remediate them as well as Microsoft 365 network connectivity insights for your organization.
 
 See [What is Endpoint Analytics](https://docs.microsoft.com/mem/analytics/overview) for an overview and prerequisite details. To learn more about Microsoft 365 network connectivity insights, read [the network connectivity overview](https://docs.microsoft.com/microsoft-365/enterprise/microsoft-365-networking-overview).
 
 
 ## How the score is calculated
 
-Your Productivity Score is based on the combined scores of your employee and technology experience categories. Each category is weighted equally, with a total of 100 points per category. The total possible points for Productivity Score are 500.
+Your Productivity Score is based on the combined scores of your people and technology experiences categories. Each category is weighted equally, with a total of 100 points per category. The total possible points for Productivity Score are 500.
 
 ### Score categories 
 
@@ -67,7 +67,7 @@ Your score is updated daily and reflects user actions completed in the last 28 (
 
 ## Pre-requisites 
 
-You need a Microsoft 365 for business or Office 365 for enterprise subscription to get employee experience data, and you need to be using multi-tenant cloud services. To get endpoint analytics data for your tenant, you need to add Microsoft Intune to your subscription. Intune helps you protect your organization’s data by managing devices and apps.       Once you have Intune, you can turn on endpoint analytics within the Intune experience. Learn more about Microsoft Intune. 
+You need a Microsoft 365 for business or Office 365 for enterprise subscription to get people experiences data, and you need to be using multi-tenant cloud services. To get endpoint analytics data for your tenant, you need to add Microsoft Intune to your subscription. Intune helps you protect your organization’s data by managing devices and apps.       Once you have Intune, you can turn on endpoint analytics within the Intune experience. Learn more about Microsoft Intune. 
 
 To view the Productivity Score for your organization, you must have of one of the following roles: 
 
@@ -89,17 +89,17 @@ The Productivity Score home page shows your total score and score history as wel
 
 **Your score** is shown as a percent value as well as in points so you can see your points (numerator) and maximum possible points (denominator).
 
-**Peer benchmarks** allow you to compare your score with organizations like yours. For the employee experience categories, the peer benchmark measure is calculated as the average of measures within a set of similar organizations. The set is composed of organizations in your region with a similar number of licensed users, types of licenses, industry, and tenure with Microsoft 365. 
+**Peer benchmarks** allow you to compare your score with organizations like yours. For the people experiences categories, the peer benchmark measure is calculated as the average of measures within a set of similar organizations. The set is composed of organizations in your region with a similar number of licensed users, types of licenses, industry, and tenure with Microsoft 365. 
 
 The endpoint analytics peer benchmark includes targets for device startup performance and recommended software configuration based on aggregated median values across all tenants.
 
 For network connectivity, the recommended benchmark is 80 points.
 
-The **Score breakdown** section provides a breakdown of your Productivity Score with benchmarks by employee and technology experience areas.
+The **Score breakdown** section provides a breakdown of your Productivity Score with benchmarks by people and technology experience areas.
 
 Score history displays how your score in each category has changed in the past 6 months.
 
-The **Employee experience** and **Technology experience** areas contain the primary insights for the categories in those areas. You can click on each category to see deeper insights.
+The **People experiences** and **Technology experiences** areas contain the primary insights for the categories in those areas. You can click on each category to see deeper insights.
 
 ## Category details pages
 

microsoft-365/admin/setup/plan-your-setup.md

@@ -2,9 +2,9 @@
 title: "Plan your setup of Microsoft 365 for business"
 f1.keywords:
 - NOCSH
-ms.author: cmcatee
-author: cmcatee-MSFT
-manager: mnirkhe
+ms.author: sirkkuw
+author: Sirkkuw
+manager: scotv
 audience: Admin
 ms.topic: article
 ms.service: o365-administration

microsoft-365/admin/setup/set-up-file-storage-and-sharing.md

@@ -4,7 +4,7 @@ f1.keywords:
 - NOCSH
 ms.author: cmcatee
 author: cmcatee-MSFT
-manager: mnirkhe
+manager: scotv
 audience: Admin
 ms.topic: article
 ms.service: o365-administration

microsoft-365/admin/setup/setup-apps-for-business.md

@@ -3,8 +3,8 @@ title: "Set up Microsoft 365 Apps for business"
 f1.keywords:
 - NOCSH
 ms.author: sirkkuw
-author: sirkkuw
-manager: mnirkhe
+author: Sirkkuw
+manager: scotv
 audience: Admin
 ms.topic: article
 ms.service: o365-administration

microsoft-365/admin/setup/setup-business-basic.md

@@ -3,8 +3,8 @@ title: "Set up Microsoft 365 Business Basic"
 f1.keywords:
 - NOCSH
 ms.author: sirkkuw
-author: sirkkuw
-manager: mnirkhe
+author: Sirkkuw
+manager: scotv
 audience: Admin
 ms.topic: article
 ms.service: o365-administration

microsoft-365/bookings/TOC.yml

@@ -9,6 +9,8 @@
       href: enter-business-information.md
     - name: Define your service offerings
       href: define-service-offerings.md
+    - name: Add staff to Bookings
+      href: add-staff.md
     - name: Schedule business closures and time off
       href: schedule-closures-time-off-vacation.md
     - name: Set your scheduling policies