+
+(where "pin" sets the file to always available on the device, "unpin" to locally available, and "clearpin" to online-only)
+
+For folders, add the /r parameter to set the status for all items within the folder.
+
diff --git a/OneDrive/help-users-use-discover-view.md b/OneDrive/help-users-use-discover-view.md
index 3ebd9f5eb1..b998945992 100644
--- a/OneDrive/help-users-use-discover-view.md
+++ b/OneDrive/help-users-use-discover-view.md
@@ -94,7 +94,7 @@ If users don't have any recently modified or viewed content in these content sou
- Check the permission settings on the SharePoint Online sites and site collections to make sure that the user has access to the correct sites and their content.
-- Check that the user is in the Active Directory and that he or she is a member of the correct Active Directory groups. To verify, go to **Office 365 admin center** \> **Users** \> **Active Users**.
+- Check that the user is in the Active Directory and that he or she is a member of the correct Active Directory groups. To verify, go to **Microsoft 365 admin center** \> **Users** \> **Active Users**.
- As an admin, you can allow your organization to access the Office Graph. This makes sure the Discover view shows the most relevant content to users. See [Control access to the Office Graph](https://support.office.com/article/54f87a42-15a4-44b4-9df0-d36287d9531b#BKMK_DelveOnOff) for more information.
diff --git a/OneDrive/list-onedrive-urls.md b/OneDrive/list-onedrive-urls.md
index 3fec897880..4403e77e92 100644
--- a/OneDrive/list-onedrive-urls.md
+++ b/OneDrive/list-onedrive-urls.md
@@ -27,7 +27,7 @@ This article is for global admins and SharePoint admins in Office 365.
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, select **Reports**, and then select **Usage**.
diff --git a/OneDrive/manage-sharing.md b/OneDrive/manage-sharing.md
index bf89ca1304..4b193a2d53 100644
--- a/OneDrive/manage-sharing.md
+++ b/OneDrive/manage-sharing.md
@@ -23,7 +23,7 @@ As a global admin or SharePoint admin in Office 365, you can use the OneDrive ad
To learn how to change the external sharing setting of an individual user's OneDrive, see [Change the external sharing setting for a user's OneDrive](user-external-sharing-settings.md). For info about how to share a file or folder in OneDrive, see [Share OneDrive files and folders](https://support.office.com/article/9fcc2f7d-de0c-4cec-93b0-a82024800c07#BKMK_BusinessTab).
> [!NOTE]
-> Some sharing settings exist in multiple admin centers. When you change them in one place, the other admin centers will reflect the change. If you have multiple admins in your organization, make sure you communicate the changes you're making. In the Office 365 admin center, under **Settings** \> **Services & add-ins**\> **Sites**, the External sharing setting is the same as the SharePoint external sharing setting in the OneDrive admin center. The Sharing page in the OneDrive admin center and the [in the classic SharePoint admin center](https://support.office.com/article/6288296a-b6b7-4ea4-b4ed-c297bf833e30#ID0EAABAAA=Tenant_%28global%29) control the same settings.
+> Some sharing settings exist in multiple admin centers. When you change them in one place, the other admin centers will reflect the change. If you have multiple admins in your organization, make sure you communicate the changes you're making. In the Microsoft 365 admin center, under **Settings** \> **Services & add-ins**\> **Sites**, the External sharing setting is the same as the SharePoint external sharing setting in the OneDrive admin center. The Sharing page in the OneDrive admin center and the [in the classic SharePoint admin center](https://support.office.com/article/6288296a-b6b7-4ea4-b4ed-c297bf833e30#ID0EAABAAA=Tenant_%28global%29) control the same settings.
## Change your sharing link settings
diff --git a/OneDrive/one-drive-sync.md b/OneDrive/one-drive-sync.md
index 5e6b4cfdb3..041bfaf246 100644
--- a/OneDrive/one-drive-sync.md
+++ b/OneDrive/one-drive-sync.md
@@ -22,7 +22,7 @@ Windows 10 devices come with the OneDrive sync client installed. Office 2016
[How the OneDrive sync client works (poster)](https://go.microsoft.com/fwlink/p/?LinkId=829044)
-[Restrictions and limitations](http://go.microsoft.com/fwlink/?LinkId=717734)
+[Invalid file names and file types in OneDrive, OneDrive for Business, and SharePoint](https://support.office.com/article/64883a5d-228e-48f5-b3d2-eb39e07630fa)
[Fix sync problems](https://support.office.com/article/83ab0d8a-8400-45b0-8dcf-dc8aa8a6bcf8)
diff --git a/OneDrive/onedrive-updates.md b/OneDrive/onedrive-updates.md
new file mode 100644
index 0000000000..aa4ef501aa
Binary files /dev/null and b/OneDrive/onedrive-updates.md differ
diff --git a/OneDrive/onedrive.md b/OneDrive/onedrive.md
index b3dbbd15be..fca34bc528 100644
--- a/OneDrive/onedrive.md
+++ b/OneDrive/onedrive.md
@@ -168,7 +168,7 @@ Help your users store, sync, and share work files in the cloud with OneDrive.
The OneDrive admin center helps you quickly and easily manage your organization's OneDrive for Business settings in one place.
To access the OneDrive admin center:
-- From the Office 365 admin center, click **Admin centers** in the left pane, and then click **OneDrive**.
+- From the Microsoft 365 admin center, click **Admin centers** in the left pane, and then click **OneDrive**.
- From your own OneDrive, click **OneDrive Admin** in the lower-left corner
@@ -179,4 +179,4 @@ Help your users store, sync, and share work files in the cloud with OneDrive.
> [!IMPORTANT]
> To use the OneDrive admin center, you must allow access to onedrive.com. You must also be a global admin for your organization, or a custom admin with the SharePoint administrator role.
> [!TIP]
-> To access a user's OneDrive, open the Office 365 admin center, go to **Active users**, select the user, expand **OneDrive Settings** in the user details pane, and then click **Access files**.
+> To access a user's OneDrive, open the Microsoft 365 admin center, go to **Active users**, select the user, expand **OneDrive Settings** in the user details pane, and then click **Access files**.
diff --git a/OneDrive/plan-onedrive-enterprise.md b/OneDrive/plan-onedrive-enterprise.md
index 0422159fc2..97603f4aeb 100644
--- a/OneDrive/plan-onedrive-enterprise.md
+++ b/OneDrive/plan-onedrive-enterprise.md
@@ -207,7 +207,7 @@ You deploy, manage, and secure OneDrive based on the tools you chose in the prev
## OneDrive limitations
-Because OneDrive provides access to files on many kinds of devices, it restricts the use of certain characters, file names, and folder names. In addition, certain features are available only in the Windows operating system. For a full list of these and other limitations of OneDrive, see [Restrictions and limitations when you sync files and folders](https://support.microsoft.com/en-us/help/3125202/restrictions-and-limitations-when-you-sync-files-and-folders).
+Because OneDrive provides access to files on many kinds of devices, it restricts the use of certain characters, file names, and folder names. In addition, certain features are available only in the Windows operating system. For a full list of these and other limitations of OneDrive, see [Invalid file names and file types in OneDrive, OneDrive for Business, and SharePoint](https://support.office.com/article/64883a5d-228e-48f5-b3d2-eb39e07630fa).
## Feature releases and requests
diff --git a/OneDrive/redirect-known-folders.md b/OneDrive/redirect-known-folders.md
index 5398dce086..8bf4756470 100644
--- a/OneDrive/redirect-known-folders.md
+++ b/OneDrive/redirect-known-folders.md
@@ -32,32 +32,35 @@ For these reasons, we recommend moving or redirecting known folders to OneDrive
## About the Known Folder Move Group Policy objects
-The following Known Folder Move policies are rolling out. If you don't see them yet, you will soon. To see them, you need the OneDrive sync build 18.111.0603.0004 or greater. You can see your build number in the About tab in OneDrive settings.
+To use the following Group Policy objects, you need the OneDrive sync build 18.111.0603.0004 or later. You can see your build number in the About tab in OneDrive settings.
+
+ > [!NOTE]
+ > Sync client features are rolled out gradually. To try the latest features, join the [Windows Insider program](https://insider.windows.com/) or the [Office Insider](https://products.office.com/office-insider) program.
- [Prompt users to move Windows known folders to OneDrive](use-group-policy.md#OptInWithWizard)
Use this policy to give users a call to action to move their Windows known folders.
- 
+ 
If users dismiss the prompt, a reminder notification will appear in the activity center until they move all known folders.
- 
+ 
If a user has already redirected their known folders to a different OneDrive account, they'll be prompted to direct the folders to the account for your organization (leaving existing files behind).
- > [!NOTE]
- > Locally created OneNote files can't be moved to OneDrive using this policy. To learn how to move OneNote notebooks, see [Move a OneNote notebook to OneDrive](https://support.office.com/article/0af0a141-0bdf-49ab-9e50-45dbcca44082).
+ > [!NOTE]
+ > Locally created OneNote files can't be moved to OneDrive using this policy. To learn how to move OneNote notebooks, see [Move a OneNote notebook to OneDrive](https://support.office.com/article/0af0a141-0bdf-49ab-9e50-45dbcca44082).
+
-- [Silently redirect Windows known folders to OneDrive](use-group-policy.md#OptInNoWizard)
-
- Use this policy to redirect your users' known folders to OneDrive without user interaction. (You can choose to display a notification to users after their folders have been redirected.) This policy works when all known folders on the local PC are empty, and on folders redirected to a different OneDrive account. We recommend using this policy together with "Prompt users to move Windows known folders to OneDrive."
-
- When you enable this policy, future releases will no longer check for empty known folders. Instead, known folders will be redirected and content within them will be moved.
+- [Silently move Windows known folders to OneDrive](use-group-policy.md#OptInNoWizard)
+ Use this policy to redirect known folders to OneDrive without any user interaction. Before sync client build 18.171.0823.0001, this policy redirected only empty known folders to OneDrive. Now, it redirects known folders that contain content and moves the content to OneDrive.
+
> [!NOTE]
- > Redirecting a folder points the folder to OneDrive but doesn't move any content. Moving a known folder points the folder to OneDrive and also moves the content. It should be used on PCs that have content in the Windows known folders.
-
+ > You can choose to display a notification to users after their folders have been redirected.
+
+
- [Prevent users from redirecting their Windows known folders to their PC](use-group-policy.md#OptInNoWizardToast)
Use this policy to force users to keep their known folders directed to OneDrive.
diff --git a/OneDrive/restore-deleted-onedrive.md b/OneDrive/restore-deleted-onedrive.md
index c6ab5dae75..8700c7b4d4 100644
--- a/OneDrive/restore-deleted-onedrive.md
+++ b/OneDrive/restore-deleted-onedrive.md
@@ -12,16 +12,16 @@ search.appverid:
- ODB160
- MET150
ms.assetid: e487f40d-5321-46a8-9504-92b600b65cb9
-description: "Learn how to restore a deleted user's OneDrive when the deleted user no longer appears in the Office 365 admin center."
+description: "Learn how to restore a deleted user's OneDrive when the deleted user no longer appears in the Microsoft 365 admin center."
---
# Restore a deleted OneDrive
-When you delete a user in the Office 365 admin center (or when a user is removed through Active Directory synchronization), the user's OneDrive will be retained for the number of days you specify in the OneDrive admin center. (For info, see [Set the default file retention for deleted OneDrive users](set-retention.md).) The default is 30 days. During this time, shared content can still be accessed by other users. At the end of the time, the OneDrive will be in a deleted state for 93 days and can only be restored by a global or SharePoint admin.
+When you delete a user in the Microsoft 365 admin center (or when a user is removed through Active Directory synchronization), the user's OneDrive will be retained for the number of days you specify in the OneDrive admin center. (For info, see [Set the default file retention for deleted OneDrive users](set-retention.md).) The default is 30 days. During this time, shared content can still be accessed by other users. At the end of the time, the OneDrive will be in a deleted state for 93 days and can only be restored by a global or SharePoint admin.
-## Restore a deleted OneDrive when the deleted user no longer appears in the Office 365 admin center
+## Restore a deleted OneDrive when the deleted user no longer appears in the Microsoft 365 admin center
-If the user was deleted within 30 days, you can restore the user and all their data from the Office 365 admin center. To learn how, see [Restore a user in Office 365](https://support.office.com/article/2c261e42-5dd1-48b0-845f-2a016d29cfc1). If you deleted the user more than 30 days ago, the user will no longer appear in the Office 365 admin center, and you'll need to use PowerShell to restore the OneDrive.
+If the user was deleted within 30 days, you can restore the user and all their data from the Microsoft 365 admin center. To learn how, see [Restore a user in Office 365](https://support.office.com/article/2c261e42-5dd1-48b0-845f-2a016d29cfc1). If you deleted the user more than 30 days ago, the user will no longer appear in the Microsoft 365 admin center, and you'll need to use PowerShell to restore the OneDrive.
1. [Download the latest SharePoint Online Management Shell](https://go.microsoft.com/fwlink/p/?LinkId=255251).
diff --git a/OneDrive/retention-and-deletion.md b/OneDrive/retention-and-deletion.md
index bc28406e82..d638b18f34 100644
--- a/OneDrive/retention-and-deletion.md
+++ b/OneDrive/retention-and-deletion.md
@@ -3,7 +3,6 @@ title: "OneDrive retention and deletion"
ms.author: kaarins
author: kaarins
manager: pamgreen
-ms.date: 05/21/2018
ms.audience: Admin
ms.topic: article
ms.service: one-drive
@@ -21,7 +20,7 @@ This article describes what happens to a user's OneDrive when you delete the use
## Give another user access to a deleted user's OneDrive
-When you delete a user in the Office 365 admin center, you can choose what you want to do with the user's product licenses, email, and OneDrive. If you give another user access to the OneDrive, that user will have 30 days by default to access and download the files they want to keep. (To change the retention time, see [Set the OneDrive retention for deleted users](set-retention.md).) They'll receive an email with a link to these instructions for accessing the deleted user's OneDrive: [Copy files from another user's OneDrive](https://support.office.com/article/7eb33f7d-6540-488f-afaf-56043828e47b.aspx).
+When you delete a user in the Microsoft 365 admin center, you can choose what you want to do with the user's product licenses, email, and OneDrive. For more info, see [Delete a user from your organization](https://support.office.com/article/D5155593-3BAC-4D8D-9D8B-F4513A81479E). If you give another user access to the OneDrive, that user will have 30 days by default to access and download the files they want to keep. (To change the retention time, see [Set the OneDrive retention for deleted users](set-retention.md).) They'll receive an email with a link to these instructions for accessing the deleted user's OneDrive: [Copy files from another user's OneDrive](https://support.office.com/article/7eb33f7d-6540-488f-afaf-56043828e47b.aspx).
## Configure automatic access delegation
@@ -29,7 +28,7 @@ By default, when you delete a user, ownership of the OneDrive is transferred to
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -47,11 +46,11 @@ If a manager or secondary owner isn't set for the user, or if access delegation
## The OneDrive deletion process
-1. A user is deleted from the Office 365 admin center or is removed through Active Directory synchronization.
+1. A user is deleted from the Microsoft 365 admin center or is removed through Active Directory synchronization.
2. The account deletion is synchronized to SharePoint Online.
-3. The OneDrive Clean Up Job runs, and the OneDrive is marked for deletion. The deleted user will appear in the Office 365 admin center for 30 days. The default retention period for OneDrive is also 30 days, but you can change this in the OneDrive admin center (see [Set the OneDrive retention for deleted users](set-retention.md)) or by using the **-OrphanedPersonalSitesRetentionPeriod** parameter for the **Set-SPOTenant** cmdlet in the SharePoint Online Management Shell. For more information about using this cmdlet, see [Set-SPOTenant](https://go.microsoft.com/fwlink/?linkid=872571).
+3. The OneDrive Clean Up Job runs, and the OneDrive is marked for deletion. The deleted user will appear in the Microsoft 365 admin center for 30 days. The default retention period for OneDrive is also 30 days, but you can change this in the OneDrive admin center (see [Set the OneDrive retention for deleted users](set-retention.md)) or by using the **-OrphanedPersonalSitesRetentionPeriod** parameter for the **Set-SPOTenant** cmdlet in the SharePoint Online Management Shell. For more information about using this cmdlet, see [Set-SPOTenant](https://go.microsoft.com/fwlink/?linkid=872571).
4. If a manager is specified for the deleted account, the manager will receive an email telling them they have access to the OneDrive, and that the OneDrive will be deleted at the end of the retention period.
diff --git a/OneDrive/set-retention.md b/OneDrive/set-retention.md
index fcb9ad16ff..da0499de8d 100644
--- a/OneDrive/set-retention.md
+++ b/OneDrive/set-retention.md
@@ -3,7 +3,6 @@ title: "Set the OneDrive retention for deleted users"
ms.author: kaarins
author: kaarins
manager: pamgreen
-ms.date: 06/21/2018
ms.audience: Admin
ms.topic: article
f1_keywords:
@@ -31,13 +30,13 @@ If a user's Office 365 account is deleted, their OneDrive for Business files are
2. Enter the number of days you want to retain OneDrive files in the **Days to retain files in OneDrive after a user account is marked for deletion** box.
- The count begins as soon as you delete the user account in the Office 365 admin center, even though the deletion process takes time. The maximum value is 3650 days (ten years).
+ The count begins as soon as you delete the user account in the Microsoft 365 admin center, even though the deletion process takes time. The maximum value is 3650 days (ten years).
3. Click **Save**.
## See also
-[Remove a former employee from Office 365](https://support.office.com/article/44d96212-4d90-4027-9aa9-a95eddb367d1)
+[Delete a user from your organization](https://support.office.com/article/D5155593-3BAC-4D8D-9D8B-F4513A81479E)
[Set up OneDrive to alert managers and delegate access automatically when users leave your organization](http://go.microsoft.com/fwlink/p/?LinkId=798417&clcid=0x409)
diff --git a/OneDrive/sync-client-update-process.md b/OneDrive/sync-client-update-process.md
index 1830d8ee26..da309e3a0d 100644
--- a/OneDrive/sync-client-update-process.md
+++ b/OneDrive/sync-client-update-process.md
@@ -24,7 +24,7 @@ This article is for IT admins who manage the new OneDrive sync client in an ente
## How we release updates through multiple rings
-After we validate updates through rings within Microsoft, we release them to organizations in the default update ring, Production. We roll them out to a small percentage of users in the ring at first, and slowly roll them out to everyone in the ring. This typically takes one to two weeks. At each increase along the way, we monitor telemetry for quality assurance purposes. In the rare case we detect an issue, we suspend the release, address the issue, and release a new update to users in the same order. After updates have completely rolled out within the Production ring, we release them to the next ring, Enterprise.
+After we validate updates through rings within Microsoft, we release them to the first public ring, Insiders. To try these latest features, join the [Windows Insider program](https://insider.windows.com/) or the [Office Insider](https://products.office.com/office-insider) program. It takes about 3 days to roll out to this ring. Later, we release to organizations in the default update ring, Production. We roll them out to a small percentage of users in the ring at first, and slowly roll them out to everyone in the ring. This typically takes one to two weeks. At each increase along the way, we monitor telemetry for quality assurance purposes. In the rare case we detect an issue, we suspend the release, address the issue, and release a new update to users in the same order. After updates have completely rolled out within the Production ring, we release them to the next ring, Enterprise.
diff --git a/OneDrive/toc.md b/OneDrive/toc.md
index bdef39e7a8..f470d86ff2 100644
--- a/OneDrive/toc.md
+++ b/OneDrive/toc.md
@@ -8,6 +8,7 @@
### [Deploy using SCCM](deploy-on-windows.md)
### [Deploy using Intune](deploy-intune.md)
### [Deploy and configure on macOS](deploy-and-configure-on-macos.md)
+### [Files On-Demand for Mac](files-on-demand-mac.md)
### [Use silent account configuration](use-silent-account-configuration.md)
### [Transition from previous sync client](transition-from-previous-sync-client.md)
### [Network utilization planning](network-utilization-planning.md)
diff --git a/OneDrive/transition-from-previous-sync-client.md b/OneDrive/transition-from-previous-sync-client.md
index c3a03f9f70..d83c3f9040 100644
--- a/OneDrive/transition-from-previous-sync-client.md
+++ b/OneDrive/transition-from-previous-sync-client.md
@@ -107,5 +107,5 @@ For more information, see [Get-SPOTenantSyncClientRestriction](https://go.micros
[Use Group Policy to control OneDrive sync client settings](use-group-policy.md)
-[Restrictions and limitations when you use the new OneDrive sync client to sync OneDrive for Business libraries](https://go.microsoft.com/fwlink/?LinkId=717734)
+[Invalid file names and file types in OneDrive, OneDrive for Business, and SharePoint](https://support.office.com/article/64883a5d-228e-48f5-b3d2-eb39e07630fa)
diff --git a/OneDrive/use-group-policy.md b/OneDrive/use-group-policy.md
index 443e3e19d9..a1a1a3d4d1 100644
--- a/OneDrive/use-group-policy.md
+++ b/OneDrive/use-group-policy.md
@@ -25,9 +25,9 @@ This article is for IT admins managing the new OneDrive sync client in a Windows
> [!NOTE]
> If you're not an IT admin, see [Sync files with the new OneDrive sync client in Windows](https://support.office.com/article/615391c4-2bd3-4aae-a42a-858262e42a49) for info about OneDrive sync settings.
-
+
> [!VIDEO https://videoplayercdn.osi.office.net/hub/?csid=ux-cms-en-us-msoffice&uuid=RE2CnSx&AutoPlayVideo=false]
-
+
## Manage OneDrive using Group Policy
1. Install the latest OneDrive sync client on a PC running Windows 10. This downloads the .adml and .admx files.
@@ -80,7 +80,7 @@ The following Computer Configuration policies are available:
- [Prompt users to move Windows known folders to OneDrive](use-group-policy.md#OptInWithWizard)
-- [Silently redirect Windows known folders to OneDrive](use-group-policy.md#OptInNoWizard)
+- [Silently move Windows known folders to OneDrive](use-group-policy.md#OptInNoWizard)
- [Prevent users from redirecting their Windows known folders to their PC](use-group-policy.md#OptInNoWizardToast)
@@ -213,6 +213,9 @@ Enabling this policy sets the following registry key.
This setting displays the "Set up protection of important folders" window that prompts users to move their Documents, Pictures, and Desktop folders to OneDrive.
+
+> [!NOTE]
+> This setting is available in the OneDrive sync client build 18.111.0603.0004 or later.
@@ -226,12 +229,13 @@ Enabling this policy sets the following registry key:
(where "1111-2222-3333-4444" is the [tenant ID](find-your-office-365-tenant-id.md))
-### Silently redirect Windows known folders to OneDrive
+### Silently move Windows known folders to OneDrive
-This setting lets you redirect your users' Documents, Pictures, and Desktop folders to OneDrive without user interaction. This policy works when all known folders are empty, and on folders redirected to a different OneDrive account. We recommend using this policy together with "Prompt users to move Windows known folders to OneDrive."
-
-When you enable this policy, future releases will no longer check for empty known folders. Instead, known folders will be redirected and content within them will be moved.
+Use this policy to redirect your users' Documents, Pictures, and Desktop folders to OneDrive without any user interaction. This setting is available in the OneDrive sync client build 18.111.0603.0004 or later. Before sync client build 18.171.0823.0001, this policy redirected only empty known folders to OneDrive. Now, it redirects known folders that contain content and moves the content to OneDrive.
+
+> [!NOTE]
+> If you're using this setting with a build earlier than 18.171.0823.0001, we recommend also enabling "Prompt users to move Windows known folders to OneDrive."
Sync client features are rolled out gradually. To try the latest features, join the [Windows Insider program](https://insider.windows.com/) or the [Office Insider](https://products.office.com/office-insider) program.
If you enable this setting and provide your tenant ID, you can choose whether to display a notification to users after their folders have been redirected.
@@ -253,6 +257,9 @@ Setting this value to 1 displays a notification after successful redirection.
This setting forces users to keep their Documents, Pictures, and Desktop folders directed to OneDrive.
+
+> [!NOTE]
+> This setting is available in the OneDrive sync client build 18.111.0603.0004 or later.
If you enable this setting, the "Stop protecting" button in the "Set up protection of important folders" window will be disabled and users will receive an error if they try to stop syncing a known folder.
@@ -377,7 +384,7 @@ For info about estimating the network bandwidth you need for the sync client and
### Coauthoring and in-app sharing for Office files
-This policy enables users to collaborate on documents in real time and share them from the Office 2016 and Office 2103 desktop apps. Enabling this policy sets the following registry key value to 1:
+This policy enables users to collaborate on documents in real time and share them from the Office 2016 desktop apps. Enabling this policy sets the following registry key value to 1:
[HKCU\SOFTWARE\Policies\Microsoft\OneDrive] "EnableAllOcsiClients"="dword:00000001"
diff --git a/OneDrive/user-external-sharing-settings.md b/OneDrive/user-external-sharing-settings.md
index 60806125ee..a2e7c6ffc2 100644
--- a/OneDrive/user-external-sharing-settings.md
+++ b/OneDrive/user-external-sharing-settings.md
@@ -24,7 +24,7 @@ After you set the organization-wide sharing settings for SharePoint and OneDrive
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, select **Users** > **Active users**.
@@ -34,6 +34,7 @@ After you set the organization-wide sharing settings for SharePoint and OneDrive
6. Select a new external sharing level, and then click **Save**.
-
+> [!NOTE]
+> You can also change the external sharing setting for a specific OneDrive user by using Microsoft PowerShell and running the cmdlet Set-SPOSite with the parameter -SharingCapability. For more info, see [Set-SPOSite](/powershell/module/sharepoint-online/set-sposite).
diff --git a/SharePoint/SharePointOnline/add-and-edit-user-profile-properties.md b/SharePoint/SharePointOnline/add-and-edit-user-profile-properties.md
index 28afaf2de7..1c14b359eb 100644
--- a/SharePoint/SharePointOnline/add-and-edit-user-profile-properties.md
+++ b/SharePoint/SharePointOnline/add-and-edit-user-profile-properties.md
@@ -19,14 +19,14 @@ description: "Learn how to add and edit properties on SharePoint User profiles t
# Add and edit user profile properties in SharePoint Online
-If your organization uses the cloud identity model, your Office 365 user accounts are stored in Azure AD and you can manage most user profile info in the Office 365 admin center. For info, see [Edit or change a user in Office 365](https://support.office.com/article/42bb3f17-8f9d-4182-b434-5f1c8024e614). You can also manage user profiles (including adding user pictures and defining user managers) in the Azure AD admin center. For info, see [Add or change profile information for a user in Azure Active Directory](https://go.microsoft.com/fwlink/?linkid=864809). If you need to create custom user profile properties, such as languages spoken, emergency contact info, or sales account, you can use user properties in SharePoint Online. Note that these properties are NOT synced back to Azure AD.
+If your organization uses the cloud identity model, your Office 365 user accounts are stored in Azure AD and you can manage most user profile info in the Microsoft 365 admin center. For info, see [Edit or change a user in Office 365](https://support.office.com/article/42bb3f17-8f9d-4182-b434-5f1c8024e614). You can also manage user profiles (including adding user pictures and defining user managers) in the Azure AD admin center. For info, see [Add or change profile information for a user in Azure Active Directory](https://go.microsoft.com/fwlink/?linkid=864809). If you need to create custom user profile properties, such as languages spoken, emergency contact info, or sales account, you can use user properties in SharePoint Online. Note that these properties are NOT synced back to Azure AD.
## Add a property for a user profile
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/allow-or-prevent-custom-script.md b/SharePoint/SharePointOnline/allow-or-prevent-custom-script.md
index eafd32a0ef..c86ff50cbf 100644
--- a/SharePoint/SharePointOnline/allow-or-prevent-custom-script.md
+++ b/SharePoint/SharePointOnline/allow-or-prevent-custom-script.md
@@ -44,7 +44,7 @@ In the SharePoint admin center, you can choose to allow users to run custom scri
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/change-default-list-and-library-experience.md b/SharePoint/SharePointOnline/change-default-list-and-library-experience.md
index e46c647c65..94e961f90b 100644
--- a/SharePoint/SharePointOnline/change-default-list-and-library-experience.md
+++ b/SharePoint/SharePointOnline/change-default-list-and-library-experience.md
@@ -27,7 +27,7 @@ As a global administrator or SharePoint administrator in Office 365, you may wan
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/change-default-sharing-link.md b/SharePoint/SharePointOnline/change-default-sharing-link.md
index 33ef2c2cfd..9a39648681 100644
--- a/SharePoint/SharePointOnline/change-default-sharing-link.md
+++ b/SharePoint/SharePointOnline/change-default-sharing-link.md
@@ -37,7 +37,7 @@ To change the setting, navigate to the SharePoint Online admin center:
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/change-version-and-upgrade-settings.md b/SharePoint/SharePointOnline/change-version-and-upgrade-settings.md
index d4fab9cd05..38176e1224 100644
--- a/SharePoint/SharePointOnline/change-version-and-upgrade-settings.md
+++ b/SharePoint/SharePointOnline/change-version-and-upgrade-settings.md
@@ -40,7 +40,7 @@ You can choose whether to allow versions in your subscription and decide how use
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -57,7 +57,7 @@ You can choose whether to allow versions in your subscription and decide how use
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/configure-infopath-forms-services.md b/SharePoint/SharePointOnline/configure-infopath-forms-services.md
index 26f8da4b02..e5358fcf19 100644
--- a/SharePoint/SharePointOnline/configure-infopath-forms-services.md
+++ b/SharePoint/SharePointOnline/configure-infopath-forms-services.md
@@ -50,7 +50,7 @@ To configure browser-enabled user form templates
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -80,7 +80,7 @@ To make indexing InfoPath forms faster and easier, you can specify which user ag
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/configure-sharepoint-store-settings.md b/SharePoint/SharePointOnline/configure-sharepoint-store-settings.md
index d984dd43d4..e7c8c3339c 100644
--- a/SharePoint/SharePointOnline/configure-sharepoint-store-settings.md
+++ b/SharePoint/SharePointOnline/configure-sharepoint-store-settings.md
@@ -32,7 +32,7 @@ Even if you choose not to allow users to buy apps from the SharePoint Store, the
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -51,7 +51,7 @@ When users request an app, they are requesting that an admin buys that app on th
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -80,7 +80,7 @@ Documents stored on sites may contain apps for Office from several sources. You
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/control-access-based-on-network-location.md b/SharePoint/SharePointOnline/control-access-based-on-network-location.md
index e640859625..2613c34ab2 100644
--- a/SharePoint/SharePointOnline/control-access-based-on-network-location.md
+++ b/SharePoint/SharePointOnline/control-access-based-on-network-location.md
@@ -44,7 +44,7 @@ Here are some important considerations for setting a location-based policy:
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/control-access-from-unmanaged-devices.md b/SharePoint/SharePointOnline/control-access-from-unmanaged-devices.md
index 7c148b865d..763b314ce5 100644
--- a/SharePoint/SharePointOnline/control-access-from-unmanaged-devices.md
+++ b/SharePoint/SharePointOnline/control-access-from-unmanaged-devices.md
@@ -37,7 +37,7 @@ Blocking access helps provide security but comes at the cost of usability and pr
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -64,7 +64,7 @@ Blocking access helps provide security but comes at the cost of usability and pr
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/create-external-business-sharing-site.md b/SharePoint/SharePointOnline/create-external-business-sharing-site.md
index 43ae93edbf..b43029c7ee 100644
--- a/SharePoint/SharePointOnline/create-external-business-sharing-site.md
+++ b/SharePoint/SharePointOnline/create-external-business-sharing-site.md
@@ -52,7 +52,7 @@ To begin, create a site collection in SharePoint Online.
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/create-hub-site.md b/SharePoint/SharePointOnline/create-hub-site.md
index 278768e08c..604fc6dcab 100644
--- a/SharePoint/SharePointOnline/create-hub-site.md
+++ b/SharePoint/SharePointOnline/create-hub-site.md
@@ -44,7 +44,7 @@ If you're a global or SharePoint admin in Office 365, you can convert any existi
6. Notify the hub site owners that their site has been converted to a hub site.
-7. Optionally, use a site design that gets applied when sites join the hub. For info, see [Set up a site design for your hub site](set-up-site-design-hub-site.md). For more info about site designs and site scripts, see [SharePoint site design and site script overview](/sharepoint/dev/declarative-customization/site-design-overview.md).
+7. Optionally, use a site design that gets applied when sites join the hub. For info, see [Set up a site design for your hub site](set-up-site-design-hub-site.md). For more info about site designs and site scripts, see [SharePoint site design and site script overview](/sharepoint/dev/declarative-customization/site-design-overview).
## More info
diff --git a/SharePoint/SharePointOnline/create-or-edit-secure-store-target-application.md b/SharePoint/SharePointOnline/create-or-edit-secure-store-target-application.md
index 20a6924c0c..1178b704ab 100644
--- a/SharePoint/SharePointOnline/create-or-edit-secure-store-target-application.md
+++ b/SharePoint/SharePointOnline/create-or-edit-secure-store-target-application.md
@@ -39,7 +39,7 @@ Another benefit of the Secure Store Service is that it eliminates authentication
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -72,7 +72,7 @@ Another benefit of the Secure Store Service is that it eliminates authentication
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -102,7 +102,7 @@ Another benefit of the Secure Store Service is that it eliminates authentication
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/create-site-collection.md b/SharePoint/SharePointOnline/create-site-collection.md
index 75577f4f5b..ee53c56a91 100644
--- a/SharePoint/SharePointOnline/create-site-collection.md
+++ b/SharePoint/SharePointOnline/create-site-collection.md
@@ -27,7 +27,7 @@ description: "Learn how to create and delete SharePoint Online site collections
# Create a site collection
-This article shows how Office 365 global admins and SharePoint admins can create classic SharePoint Online site collections from the Office 365 admin center.
+This article shows how Office 365 global admins and SharePoint admins can create classic SharePoint Online site collections from the Microsoft 365 admin center.
> [!NOTE]
> For info about creating new team sites that are connected to Office 365 groups and communication sites in the new SharePoint admin center preview, see [Manage sites in the new SharePoint admin center](manage-sites-in-new-admin-center.md).
@@ -39,7 +39,7 @@ SharePoint Online has several templates for classic site collections. For exampl
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, select **Resources**, and then select **Sites**.
@@ -47,7 +47,7 @@ SharePoint Online has several templates for classic site collections. For exampl
4. Select **Add a site**.
- 
+ 
> [!NOTE]
> If you don't see the options above, select **Admin centers** \> **SharePoint** and then select **New** \> **Private Site Collection**. > 
diff --git a/SharePoint/SharePointOnline/delete-site-collection.md b/SharePoint/SharePointOnline/delete-site-collection.md
index 76954313e6..422170835f 100644
--- a/SharePoint/SharePointOnline/delete-site-collection.md
+++ b/SharePoint/SharePointOnline/delete-site-collection.md
@@ -32,7 +32,7 @@ You should notify the site collection owners and subsite owners before you delet
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/delve-for-office-365-admins.md b/SharePoint/SharePointOnline/delve-for-office-365-admins.md
index e639f0194d..9c97f89ff5 100644
--- a/SharePoint/SharePointOnline/delve-for-office-365-admins.md
+++ b/SharePoint/SharePointOnline/delve-for-office-365-admins.md
@@ -43,7 +43,7 @@ If you want to receive new functionality in Delve before it's made available in
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. Go to **Settings** \> **Organization profile**.
@@ -65,7 +65,7 @@ If you don't allow access to the Office Graph, you disable the functionality in
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** > **SharePoint**.
@@ -131,7 +131,7 @@ There are a few things you should check if one or more users in your organizatio
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. Go to **Settings** \> **Office Graph** and make sure that you've selected **Allow access to the Office Graph**.
@@ -143,7 +143,7 @@ There are a few things you should check if one or more users in your organizatio
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. Go to **Billing** \> **Subscriptions**.
@@ -164,7 +164,7 @@ There are a few things you should check if one or more users in your organizatio
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. Go to **Users** \> **Active Users**.
@@ -234,7 +234,7 @@ If users don't have any recently modified or viewed content in these content sou
- Check the permission settings on the SharePoint Online sites and site collections to make sure that the user has access to the correct sites and their content.
-- Check that the user is in the Active Directory and that he or she is a member of the correct Active Directory groups. To verify, go to **Office 365 admin center** \> **Users** \> **Active Users**.
+- Check that the user is in the Active Directory and that he or she is a member of the correct Active Directory groups. To verify, go to **Microsoft 365 admin center** \> **Users** \> **Active Users**.
- Make sure that the user allows Delve to show documents. To verify, have the user go to **Office 365** \> **Delve** \> ** Feature settings ** and make sure that **Documents in Delve** isn't turned off.
diff --git a/SharePoint/SharePointOnline/enable-or-disable-preview-features.md b/SharePoint/SharePointOnline/enable-or-disable-preview-features.md
index c06c70f78f..e95c529756 100644
--- a/SharePoint/SharePointOnline/enable-or-disable-preview-features.md
+++ b/SharePoint/SharePointOnline/enable-or-disable-preview-features.md
@@ -41,7 +41,7 @@ When you use Power BI, your data is sent to the Power BI service. If you have im
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/export-and-import-search-settings.md b/SharePoint/SharePointOnline/export-and-import-search-settings.md
index ce440f3f93..56eb6bed45 100644
--- a/SharePoint/SharePointOnline/export-and-import-search-settings.md
+++ b/SharePoint/SharePointOnline/export-and-import-search-settings.md
@@ -65,7 +65,7 @@ If the import fails, remove the condition that caused the failure and reimport t
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -98,7 +98,7 @@ If the import fails, remove the condition that caused the failure and reimport t
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/external-sharing-overview.md b/SharePoint/SharePointOnline/external-sharing-overview.md
index 4c3bfd25b3..2862ad17dc 100644
--- a/SharePoint/SharePointOnline/external-sharing-overview.md
+++ b/SharePoint/SharePointOnline/external-sharing-overview.md
@@ -74,7 +74,7 @@ Because external users with Microsoft accounts do not have a license to your Off
- They will be able to see other types of content on sites, depending on the permissions you give them. For example, they can navigate to different subsites within the site collection to which they were invited. They will also be able to do things like view site feeds.
-If your authenticated external users need greater capability, you must assign them an appropriate Office 365 license. To do this, go to the Active users page of the Office 365 admin center, select the external user, click **More**, and then click **Edit product licenses**.
+If your authenticated external users need greater capability, you must assign them an appropriate Office 365 license. To do this, go to the Active users page of the Microsoft 365 admin center, select the external user, click **More**, and then click **Edit product licenses**.
**Authenticated users without Microsoft accounts**
diff --git a/SharePoint/SharePointOnline/get-started-new-admin-center.md b/SharePoint/SharePointOnline/get-started-new-admin-center.md
index 26da90320e..8690c62b15 100644
--- a/SharePoint/SharePointOnline/get-started-new-admin-center.md
+++ b/SharePoint/SharePointOnline/get-started-new-admin-center.md
@@ -3,7 +3,6 @@ title: "Get started with the new SharePoint admin center"
ms.author: kaarins
author: kaarins
manager: pamgreen
-ms.date: 6/20/2018
ms.audience: Admin
ms.topic: overview
ms.service: sharepoint-online
@@ -19,16 +18,14 @@ description: "Learn about the cards on the Home page of the new SharePoint admin
# Get started with the new SharePoint admin center
-As a global or SharePoint admin in Office 365, you can try the new SharePoint admin center (preview). To access it, go to the current SharePoint admin center and click **Try the preview** in the upper right.
-
-
+As a global or SharePoint admin in Office 365, you can try the new SharePoint admin center (preview). To access it, go to the classic SharePoint admin center and click **Try the preview** in the upper right.
> [!NOTE]
-> Some functionality is introduced gradually to organizations that have opted in to the [Set up the Standard or Targeted release options in Office 365](https://support.office.com/article/3b3adfa4-1777-4ff0-b606-fb8732101f47). This means that you may not yet see this feature or it may look different than what is described in the help articles.
+> Some functionality is introduced gradually to organizations that have opted in to the [Targeted release option in Office 365](https://support.office.com/article/3b3adfa4-1777-4ff0-b606-fb8732101f47). This means that you may not yet see some features or they may look different than what is described in this article.
## Schedule for releasing the new SharePoint admin center
-The new SharePoint admin center (preview) is now available worldwide to customers who have selected the standard release option. The classic SharePoint admin center will continue to be the default for several months. You'll need to switch back to it to perform some tasks. You'll be able to continue using the classic SharePoint admin center for several months before we begin retiring it.
+The new SharePoint admin center (preview) is now available worldwide to customers who have selected the standard release option. The classic SharePoint admin center will continue to be the default for several weeks. You'll need to switch back to it to perform some tasks. You'll be able to continue using the classic SharePoint admin center for several months before we begin retiring it.
To switch back to the classic SharePoint admin center:
@@ -50,20 +47,20 @@ On the Home page, you can see at a glance:
> [!TIP]
-> To filter a report, click an item in the legend. For example, on the Files by activity type chart, click "Viewed or edited."
> To see values for a specific day, point to that day on the report.
To see more details about a report, click **Details** to open the report in the Office 365 admin center. Here, you can see tables of activity by site or users, change the reporting period, pivot the report, export the report data into a .csv file that you can open in Excel, and more. For more info about the SharePoint reports in the Office 365 admin center, see [Office 365 Reports in the Admin Center - SharePoint activity](https://support.office.com/article/a91c958f-1279-499d-9959-12f0de08dc8f) and [Office 365 Reports in the Admin Center - SharePoint site usage](https://support.office.com/article/4ecfb843-e5d5-464d-8bf6-7ed512a9b213).
+> To filter a report, click an item in the legend. For example, on the Files by activity type chart, click "Viewed or edited."
To see values for a specific day, point to that day on the report. To see more details about a report, click **Details** to open the report in the Microsoft 365 admin center. Here, you can see tables of activity by site or users, change the reporting period, pivot the report, export the report data into a .csv file that you can open in Excel, and more. For more info about the SharePoint reports in the Microsoft 365 admin center, see [Office 365 Reports in the Admin Center - SharePoint activity](https://support.office.com/article/a91c958f-1279-499d-9959-12f0de08dc8f) and [Office 365 Reports in the Admin Center - SharePoint site usage](https://support.office.com/article/4ecfb843-e5d5-464d-8bf6-7ed512a9b213).
> [!NOTE]
> Reports typically don't include activity from the last 24 to 48 hours.
## View Message center posts
-In the Message center section of the home page, you can read official announcements about new and changed SharePoint features to help you manage upcoming changes. Each post gives you an overview of a change and how it may affect your users. Click a post to open it in the Office 365 admin center (where you can dismiss it if you want to hide it from the list), or click **All active messages** to sort and filter the list of messages across all Office 365 services. [Message center in Office 365](https://support.office.com/article/38fb3333-bfcc-4340-a37b-deda509c2093)
+In the Message center section of the home page, you can read official announcements about new and changed SharePoint features to help you manage upcoming changes. Each post gives you an overview of a change and how it may affect your users. Click a post to open it in the Microsoft 365 admin center (where you can dismiss it if you want to hide it from the list), or click **All active messages** to sort and filter the list of messages across all Office 365 services. [Message center in Office 365](https://support.office.com/article/38fb3333-bfcc-4340-a37b-deda509c2093)
## Service health
-In the Service health section of the home page, you can see whether the SharePoint Online service is healthy, or if it's experiencing an active advisory or incident. For more info about an advisory or incident, click it to open the Service health page of the Office 365 admin center.
+In the Service health section of the home page, you can see whether the SharePoint Online service is healthy, or if it's experiencing an active advisory or incident. For more info about an advisory or incident, click it to open the Service health page of the Microsoft 365 admin center.
diff --git a/SharePoint/SharePointOnline/hide-app-tiles-on-app-launcher.md b/SharePoint/SharePointOnline/hide-app-tiles-on-app-launcher.md
index 37adfd0f1f..bb3fff6bf2 100644
--- a/SharePoint/SharePointOnline/hide-app-tiles-on-app-launcher.md
+++ b/SharePoint/SharePointOnline/hide-app-tiles-on-app-launcher.md
@@ -36,7 +36,7 @@ By default, the OneDrive and SharePoint app tiles appear in the app launcher and
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/let-users-connect-classic-sites-to-groups.md b/SharePoint/SharePointOnline/let-users-connect-classic-sites-to-groups.md
index 03fb03d86d..bf1af4195d 100644
--- a/SharePoint/SharePointOnline/let-users-connect-classic-sites-to-groups.md
+++ b/SharePoint/SharePointOnline/let-users-connect-classic-sites-to-groups.md
@@ -23,7 +23,7 @@ As a global or SharePoint admin in Office 365, you can allow or prevent site col
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/let-users-create-modern-site-pages.md b/SharePoint/SharePointOnline/let-users-create-modern-site-pages.md
index 9f876c3fed..8048acb6c0 100644
--- a/SharePoint/SharePointOnline/let-users-create-modern-site-pages.md
+++ b/SharePoint/SharePointOnline/let-users-create-modern-site-pages.md
@@ -25,12 +25,14 @@ If you're a global or SharePoint admin in Office 365, you can allow or prevent t
> [!NOTE]
> The following procedures are for SharePoint pages only. When you allow creation of site pages, the **Add a page** command in the **Settings** menu creates new site pages. If you turn off the ability to create site pages, users can still add a SharePoint page from the **New** menu on the Home page and add from the classic page to a Wiki library using the same command.
+>
+> If instead you want to disallow the ability for members to create or modify any kind of SharePoint page, you can change the permissions on the Site Pages library to disallow editing for users in the Members group of the site.
## Allow or prevent creation of site pages at the organization level in the SharePoint admin center
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/let-users-use-new-onedrive-sync-client.md b/SharePoint/SharePointOnline/let-users-use-new-onedrive-sync-client.md
index 3f5d5ffdd2..f1c346a29f 100644
--- a/SharePoint/SharePointOnline/let-users-use-new-onedrive-sync-client.md
+++ b/SharePoint/SharePointOnline/let-users-use-new-onedrive-sync-client.md
@@ -100,7 +100,7 @@ See [Deploy and configure the new OneDrive sync client for Mac](https://support.
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/make-external-list.md b/SharePoint/SharePointOnline/make-external-list.md
index fb21a7eb92..9701f3f2ab 100644
--- a/SharePoint/SharePointOnline/make-external-list.md
+++ b/SharePoint/SharePointOnline/make-external-list.md
@@ -92,7 +92,7 @@ To create a Secure Store Target Application, follow these steps.
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -118,7 +118,7 @@ To create a Secure Store Target Application, follow these steps.
9. In the **Members** section, in the **Members** field enter the name of the group that will use the Target Application. Generally, this is a group from the Microsoft Online Directory Service (MSODS).
- If you are a global administrator, you can create groups in MSODS in the Office 365 admin center.
+ If you are a global administrator, you can create groups in MSODS in the Microsoft 365 admin center.
10. Click **OK** to create the Target Application and return to the Secure Store Service page.
@@ -129,7 +129,7 @@ After you create the Target Application, you are ready to enter the credentials
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -266,7 +266,7 @@ To finish setting up the External List, you have to grant permissions to the peo
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/manage-app-licenses.md b/SharePoint/SharePointOnline/manage-app-licenses.md
index 53ec2b447b..545b8616d0 100644
--- a/SharePoint/SharePointOnline/manage-app-licenses.md
+++ b/SharePoint/SharePointOnline/manage-app-licenses.md
@@ -28,7 +28,7 @@ From the admin center, you can also add users to an app, or delegate management
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. Select **Apps** on the left, and then select **Manage Licenses**.
diff --git a/SharePoint/SharePointOnline/manage-authoritative-pages.md b/SharePoint/SharePointOnline/manage-authoritative-pages.md
index c92a31e2bf..6a3d1c335f 100644
--- a/SharePoint/SharePointOnline/manage-authoritative-pages.md
+++ b/SharePoint/SharePointOnline/manage-authoritative-pages.md
@@ -28,7 +28,7 @@ In the same way, you can also add non-authoritative pages. A typical example of
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/manage-business-connectivity-service-applications.md b/SharePoint/SharePointOnline/manage-business-connectivity-service-applications.md
index fb1a414075..51d6f71039 100644
--- a/SharePoint/SharePointOnline/manage-business-connectivity-service-applications.md
+++ b/SharePoint/SharePointOnline/manage-business-connectivity-service-applications.md
@@ -12,7 +12,7 @@ search.appverid:
- SPO160
- MET150
ms.assetid: 2ced10aa-db9a-4828-a7a5-e47a57c3a823
-description: "In SharePoint Online, you can create Business Connectivity Services (BCS) connections to data sources, such as SQL Azure databases or Windows Communication Foundation (WCF) web services, that are outside the SharePoint site. Once you've created these connections, you can manage or edit BCS information on the SharePoint admin center site. You can log on to the SharePoint admin center site directly, or log on to the Office 365 admin center and then move to the SharePoint admin center."
+description: "In SharePoint Online, you can create Business Connectivity Services (BCS) connections to data sources, such as SQL Azure databases or Windows Communication Foundation (WCF) web services, that are outside the SharePoint site. Once you've created these connections, you can manage or edit BCS information in the SharePoint admin center."
---
# Manage Business Connectivity Service Applications
@@ -39,7 +39,7 @@ To set object permissions for an object, follow these steps.
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -79,7 +79,7 @@ To set Metadata Store permissions, follow these steps.
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -127,7 +127,7 @@ To import a BDC Model, follow these steps:
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -164,7 +164,7 @@ To export a BDC Model or Resource file, follow these steps:
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -208,7 +208,7 @@ To add an action to an ECT, follow these steps.
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/manage-query-rules.md b/SharePoint/SharePointOnline/manage-query-rules.md
index 78a4ffea55..513598e828 100644
--- a/SharePoint/SharePointOnline/manage-query-rules.md
+++ b/SharePoint/SharePointOnline/manage-query-rules.md
@@ -39,7 +39,7 @@ You can create query rules at different levels: for the whole tenant, for a site
- Sign in to Office 365 as a global admin or SharePoint admin.
- - Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+ - Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
- In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/manage-query-suggestions.md b/SharePoint/SharePointOnline/manage-query-suggestions.md
index f9b31463d2..165ad2e0ca 100644
--- a/SharePoint/SharePointOnline/manage-query-suggestions.md
+++ b/SharePoint/SharePointOnline/manage-query-suggestions.md
@@ -32,7 +32,7 @@ Query suggestions are turned on by default. To turn them off, go to **Search Sug
## To create query suggestions in SharePoint search
-1. Sign in to the Office 365 Admin Center as a search administrator.
+1. Sign in to the Microsoft 365 Admin Center as a search administrator.
2. Choose **Admin** \> **SharePoint** \> **search** \> **Query Suggestion Settings**.
diff --git a/SharePoint/SharePointOnline/manage-result-sources.md b/SharePoint/SharePointOnline/manage-result-sources.md
index 181125a982..e05301db0a 100644
--- a/SharePoint/SharePointOnline/manage-result-sources.md
+++ b/SharePoint/SharePointOnline/manage-result-sources.md
@@ -36,7 +36,7 @@ For the classic search experience, you can create your own result sources, or us
Log in to Office 365.
- Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+ Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -116,7 +116,7 @@ The default result source is **Local SharePoint Results**, but you can choose to
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/manage-search-dictionaries.md b/SharePoint/SharePointOnline/manage-search-dictionaries.md
index 5724a769b6..f4dbf3333c 100644
--- a/SharePoint/SharePointOnline/manage-search-dictionaries.md
+++ b/SharePoint/SharePointOnline/manage-search-dictionaries.md
@@ -33,7 +33,7 @@ Once you have done this, you can then use the managed property **companies** to
## Include company names
-1. Sign in to the Office 365 Admin Center as a search administrator.
+1. Sign in to the Microsoft 365 admin center as a search administrator.
2. Choose **Admin** \> **SharePoint**. You're now in the **SharePoint admin center**.
@@ -52,7 +52,7 @@ Once you have done this, you can then use the managed property **companies** to
## Exclude company names
-1. Sign in to the Office 365 Admin Center as a search administrator.
+1. Sign in to the Microsoft 365 admin center as a search administrator.
2. Choose **Admin** \> **SharePoint**. You're now in the **SharePoint admin center**.
@@ -78,7 +78,7 @@ For example, if you enter a query that contains the word "ampitheater", the quer
## Include a term in query spelling corrections
-1. Sign in to the Office 365 Admin Center as a search administrator.
+1. Sign in to the Microsoft 365 admin center as a search administrator.
2. Choose **Admin** \> **SharePoint**. You're now in the **SharePoint admin center**.
@@ -97,7 +97,7 @@ For example, if you enter a query that contains the word "ampitheater", the quer
## Exclude a term from query spelling corrections
-1. Sign in to the Office 365 Admin Center as a search administrator.
+1. Sign in to the Microsoft 365 admin center as a search administrator.
2. Choose **Admin** \> **SharePoint**. You're now in the **SharePoint admin center**.
@@ -116,7 +116,7 @@ For example, if you enter a query that contains the word "ampitheater", the quer
## Edit query spelling corrections or company names
-1. Sign in to the Office 365 Admin Center as a search administrator.
+1. Sign in to the Microsoft 365 admin center as a search administrator.
2. Choose **Admin** \> **SharePoint**. You're now in the **SharePoint admin center**.
diff --git a/SharePoint/SharePointOnline/manage-search-the-admin-center.md b/SharePoint/SharePointOnline/manage-search-the-admin-center.md
index 2875312254..fd16bf390d 100644
--- a/SharePoint/SharePointOnline/manage-search-the-admin-center.md
+++ b/SharePoint/SharePointOnline/manage-search-the-admin-center.md
@@ -26,7 +26,7 @@ The changes you make from the search administration page are valid for the whole
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/manage-site-collection-administrators.md b/SharePoint/SharePointOnline/manage-site-collection-administrators.md
index c0d7247f15..ff7cdc92d6 100644
--- a/SharePoint/SharePointOnline/manage-site-collection-administrators.md
+++ b/SharePoint/SharePointOnline/manage-site-collection-administrators.md
@@ -28,7 +28,7 @@ This article describes how global admins and SharePoint admins in Office 365 can
## Add or remove site collection admins
-If a site belongs to an Office 365 group, you can add or remove group members in the Office 365 admin center. For info, see [Add or remove members from Office 365 groups using the Office 365 admin center](https://support.office.com/article/e186d224-a324-4afa-8300-0e4fc0c3000a).
+If a site belongs to an Office 365 group, you can add or remove group members in the Microsoft 365 admin center. For info, see [Add or remove members from Office 365 groups using the Office 365 admin center](https://support.office.com/article/e186d224-a324-4afa-8300-0e4fc0c3000a).
If you want to change the admins for a communication site or a site that belongs to an Office 365 group, and you as the global or SharePoint admin are also an owner of the site, see [Manage your SharePoint site settings](https://support.office.com/article/8376034d-d0c7-446e-9178-6ab51c58df42#__BKMKMngSitePermissions). If you aren't a site owner, you need to use PowerShell to add or remove site owners. For info, see [Add-PnPSiteCollectionAdmin](https://go.microsoft.com/fwlink/?linkid=872301) and [Remove-PnPSiteCollectionAdmin](https://go.microsoft.com/fwlink/?linkid=872302).
@@ -36,7 +36,7 @@ To add or remove site collection admins on classic sites, use the SharePoint adm
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/manage-site-collection-storage-limits.md b/SharePoint/SharePointOnline/manage-site-collection-storage-limits.md
index 12c0de1c28..b47e3f5405 100644
--- a/SharePoint/SharePointOnline/manage-site-collection-storage-limits.md
+++ b/SharePoint/SharePointOnline/manage-site-collection-storage-limits.md
@@ -31,7 +31,7 @@ By default, your SharePoint storage is available in a central pool from which al
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -55,7 +55,7 @@ If you prefer to fine tune the storage space allocated to each site collection,
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -69,7 +69,7 @@ If you prefer to fine tune the storage space allocated to each site collection,
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/manage-site-creation.md b/SharePoint/SharePointOnline/manage-site-creation.md
index 0600c91eb8..8765efd8db 100644
--- a/SharePoint/SharePointOnline/manage-site-creation.md
+++ b/SharePoint/SharePointOnline/manage-site-creation.md
@@ -27,7 +27,7 @@ Some functionality is introduced gradually to organizations that have signed up
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/manage-sites-in-new-admin-center.md b/SharePoint/SharePointOnline/manage-sites-in-new-admin-center.md
index 12135ab2f8..4cfaab5661 100644
--- a/SharePoint/SharePointOnline/manage-sites-in-new-admin-center.md
+++ b/SharePoint/SharePointOnline/manage-sites-in-new-admin-center.md
@@ -41,7 +41,7 @@ You as a SharePoint or global admin in your organization can create new sites fr
## Delete a site
-On the Site management page, you can delete the communication sites you created, as well as all classic sites. (To delete sites that belong to an Office 365 group, you need to delete all the group resources by going to the Office 365 admin center and deleting the group.)
+On the Site management page, you can delete the communication sites you created, as well as all classic sites. (To delete sites that belong to an Office 365 group, you need to delete all the group resources by going to the Microsoft 365 admin center and deleting the group.)
1. In the left column, click to select a site.
diff --git a/SharePoint/SharePointOnline/manage-user-profiles.md b/SharePoint/SharePointOnline/manage-user-profiles.md
index 88d54d9921..9c3cb418ea 100644
--- a/SharePoint/SharePointOnline/manage-user-profiles.md
+++ b/SharePoint/SharePointOnline/manage-user-profiles.md
@@ -35,7 +35,7 @@ Most organizations don't need to change any user profile settings in the SharePo
In Office 365, identity is managed by Azure Active Directory. For info about this, see [Understanding Office 365 identity and Azure Active Directory](https://support.office.com/article/06a189e7-5ec6-4af2-94bf-a22ea225a7a9). SharePoint Online receives this profile information. If you need to store additional info about your users, you can create custom properties in the SharePoint admin center. For info about doing this, see [Add and edit user profile properties in SharePoint Online](add-and-edit-user-profile-properties.md).
> [!NOTE]
-> Instead of creating user sub-types in the SharePoint Online admin center, we recommend using the Office 365 admin center to [Compare groups](https://support.office.com/article/758759ad-63ee-4ea9-90a3-39f941897b7d) or using the Azure AD admin center to [create groups with dynamic membership](https://go.microsoft.com/fwlink/?linkid=865398).
+> Instead of creating user sub-types in the SharePoint Online admin center, we recommend using the Microsoft 365 admin center to [Compare groups](https://support.office.com/article/758759ad-63ee-4ea9-90a3-39f941897b7d) or using the Azure AD admin center to [create groups with dynamic membership](https://go.microsoft.com/fwlink/?linkid=865398).
## Add and remove admins on a OneDrive account
@@ -44,7 +44,7 @@ In some cases, you might want to transfer ownership of a OneDrive account to a d
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -79,7 +79,7 @@ To add, edit, or delete and audience or an audience rule, go to the Manage Audie
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -106,7 +106,7 @@ If some users are licensed to use OneDrive, but you don't want them to create a
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/media/b195b8c7-ee2b-4a02-92cb-ed61899edd24.png b/SharePoint/SharePointOnline/media/b195b8c7-ee2b-4a02-92cb-ed61899edd24.png
index 082a2762f0..2b37d0f98d 100644
Binary files a/SharePoint/SharePointOnline/media/b195b8c7-ee2b-4a02-92cb-ed61899edd24.png and b/SharePoint/SharePointOnline/media/b195b8c7-ee2b-4a02-92cb-ed61899edd24.png differ
diff --git a/SharePoint/SharePointOnline/monitor-apps.md b/SharePoint/SharePointOnline/monitor-apps.md
index 27b55d9dac..c967bd9005 100644
--- a/SharePoint/SharePointOnline/monitor-apps.md
+++ b/SharePoint/SharePointOnline/monitor-apps.md
@@ -12,7 +12,7 @@ search.appverid:
- SPO160
- MET150
ms.assetid: 81daca87-ef0c-4602-af89-9a749dbef377
-description: "This article explains how the SharePoint Online admin can monitor thigns like app usage and error information for the apps that are in use in a SharePoint Online environment."
+description: "This article explains how a SharePoint admin can monitor things like app usage and error information for the apps that are in use in a SharePoint Online environment."
---
# Monitor apps for your SharePoint Online environment
@@ -24,7 +24,7 @@ As a SharePoint or global admin in Office 365, you can monitor information such
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. Select **Apps** on the left, and then select **Monitor Apps**.
@@ -37,7 +37,7 @@ As a SharePoint or global admin in Office 365, you can monitor information such
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. Select **Apps** on the left, and then select **Monitor Apps**.
diff --git a/SharePoint/SharePointOnline/open-term-store-management-tool.md b/SharePoint/SharePointOnline/open-term-store-management-tool.md
index 2a9d1f271a..45c3a670bb 100644
--- a/SharePoint/SharePointOnline/open-term-store-management-tool.md
+++ b/SharePoint/SharePointOnline/open-term-store-management-tool.md
@@ -29,7 +29,7 @@ If you're a global or SharePoint admin in Office 365, you can access the Term St
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/plan-navigation-modern-experience.md b/SharePoint/SharePointOnline/plan-navigation-modern-experience.md
index a32101d301..7a51cc8986 100644
--- a/SharePoint/SharePointOnline/plan-navigation-modern-experience.md
+++ b/SharePoint/SharePointOnline/plan-navigation-modern-experience.md
@@ -17,7 +17,7 @@ The fundamental principles and good practices for site and page navigation are e
-*“When we’re observing customers carrying out tasks on websites we notice certain common patterns. For example, we find that when people arrive at a particular site they start by **navigating about 70% of the time**. When people get stuck navigating they may resort to using site search.”*
+*“When we’re observing customers carrying out tasks on websites we notice certain common patterns. For example, we find that when people arrive at a particular site they start by **navigating about 70% of the time**. When people get stuck navigating they may resort to using site search.”* -- Gerry McGovern, 31 January 2016
No matter which framework you are using, you can use the guidance in this document to help make good decisions for navigation.
diff --git a/SharePoint/SharePointOnline/planning-hub-sites.md b/SharePoint/SharePointOnline/planning-hub-sites.md
index 6e52055cb2..41af41ffc1 100644
--- a/SharePoint/SharePointOnline/planning-hub-sites.md
+++ b/SharePoint/SharePointOnline/planning-hub-sites.md
@@ -212,4 +212,5 @@ Your audience might consume SharePoint hub sites via the SharePoint home in Offi
Use hub sites when they align with your business outcomes and solve a need for your users. The capabilities of hub sites are evolving, and we're working to implement some of the most requested features as soon as we can, such as the ability to target the navigation links in hub sites to specific groups of people.
+**Principal author: Susan Hanley, MVP
LinkedIn: [http://www.linkedin.com/in/susanhanley](http://www.linkedin.com/in/susanhanley)
Website: [www.susanhanley.com](http://http://www.susanhanley.com)
Blog: [http://www.computerworld.com/blog/essential-sharepoint](http://www.computerworld.com/blog/essential-sharepoint)**
diff --git a/SharePoint/SharePointOnline/query-throttling.md b/SharePoint/SharePointOnline/query-throttling.md
index 6c7d4f0649..46ec9f9289 100644
--- a/SharePoint/SharePointOnline/query-throttling.md
+++ b/SharePoint/SharePointOnline/query-throttling.md
@@ -35,7 +35,7 @@ The client sets the client type as a label in the query. The administrator confi
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -61,7 +61,7 @@ You can use throttling tiers to prioritize query processing. When the resource l
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/remove-search-results.md b/SharePoint/SharePointOnline/remove-search-results.md
index e812d5722c..b27593eab1 100644
--- a/SharePoint/SharePointOnline/remove-search-results.md
+++ b/SharePoint/SharePointOnline/remove-search-results.md
@@ -24,7 +24,7 @@ If you're a a SharePoint Online administrator, you can temporarily remove items
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/restore-deleted-site-collection.md b/SharePoint/SharePointOnline/restore-deleted-site-collection.md
index 31bb58f29f..9590c3de04 100644
--- a/SharePoint/SharePointOnline/restore-deleted-site-collection.md
+++ b/SharePoint/SharePointOnline/restore-deleted-site-collection.md
@@ -38,7 +38,7 @@ To create a new site collection that uses the same URL as a site collection that
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/restricted-domains-sharing.md b/SharePoint/SharePointOnline/restricted-domains-sharing.md
index 4ebcbea5e3..57d5492ca4 100644
--- a/SharePoint/SharePointOnline/restricted-domains-sharing.md
+++ b/SharePoint/SharePointOnline/restricted-domains-sharing.md
@@ -35,7 +35,7 @@ Organization-wide settings affect all SharePoint Online site collections, includ
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -68,7 +68,7 @@ You can also use restricted domains at the site collection level. Note the follo
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/safeguarding-your-data.md b/SharePoint/SharePointOnline/safeguarding-your-data.md
index 7e310190b3..6a75454748 100644
--- a/SharePoint/SharePointOnline/safeguarding-your-data.md
+++ b/SharePoint/SharePointOnline/safeguarding-your-data.md
@@ -24,7 +24,7 @@ You control your data. When you put your data in SharePoint Online and OneDrive,
Microsoft engineers administer SharePoint Online and OneDrive using a Windows PowerShell console that requires two-factor authentication. We perform day-to-day tasks by running workflows so we can rapidly respond to new situations. Check-ins to the service require code review and management approval.
-No engineer has standing access to the service. When engineers need access, they must request it. Eligibility is checked, and if engineer access is approved, it's only for a limited time. In the rare cases where Microsoft engineers need access to content, (for example if you submit a support ticket because a user can't access an important file that we believe is damaged), the engineers must check in a special workflow that requires business justification and manager approval. An audit event is generated that you can view in the Office 365 admin center. You can also turn on a feature called Customer Lockbox so you need to grant approval. The engineer gets access only to the file in question. Learn how to turn on or off Customer Lockbox and approve and deny requests: [Office 365 Customer Lockbox Requests](https://support.office.com/en-us/article/Office-365-Customer-Lockbox-Requests-36f9cdd1-e64c-421b-a7e4-4a54d16440a2).
+No engineer has standing access to the service. When engineers need access, they must request it. Eligibility is checked, and if engineer access is approved, it's only for a limited time. In the rare cases where Microsoft engineers need access to content, (for example if you submit a support ticket because a user can't access an important file that we believe is damaged), the engineers must check in a special workflow that requires business justification and manager approval. An audit event is generated that you can view in the Microsoft 365 admin center. You can also turn on a feature called Customer Lockbox so you need to grant approval. The engineer gets access only to the file in question. Learn how to turn on or off Customer Lockbox and approve and deny requests: [Office 365 Customer Lockbox Requests](https://support.office.com/en-us/article/Office-365-Customer-Lockbox-Requests-36f9cdd1-e64c-421b-a7e4-4a54d16440a2).
## How you can safeguard your data
diff --git a/SharePoint/SharePointOnline/set-crawl-log-permissions.md b/SharePoint/SharePointOnline/set-crawl-log-permissions.md
index 53b2784656..48a9210b24 100644
--- a/SharePoint/SharePointOnline/set-crawl-log-permissions.md
+++ b/SharePoint/SharePointOnline/set-crawl-log-permissions.md
@@ -28,7 +28,7 @@ A typical use case is in eDiscovery, where you can grant a security group permis
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/sharepoint-admin-role.md b/SharePoint/SharePointOnline/sharepoint-admin-role.md
index 8b57148537..5d3f18c15c 100644
--- a/SharePoint/SharePointOnline/sharepoint-admin-role.md
+++ b/SharePoint/SharePointOnline/sharepoint-admin-role.md
@@ -52,7 +52,7 @@ Here are some of the key tasks users can do when they are assigned to the ShareP
- [Manage SharePoint Online user profiles](manage-user-profiles.md)
> [!TIP]
-> When you assign someone the SharePoint admin role, you may also want to assign them to Service administrator role. This way they can see important information in the Office 365 admin center, such as the health of the SharePoint Online service, and change and release notifications.
+> When you assign someone the SharePoint admin role, you may also want to assign them to Service administrator role. This way they can see important information in the Microsoft 365 admin center, such as the health of the SharePoint Online service, and change and release notifications.
## See also
diff --git a/SharePoint/SharePointOnline/sharepoint-online.md b/SharePoint/SharePointOnline/sharepoint-online.md
index 629064715e..1a8e3a3bb4 100644
--- a/SharePoint/SharePointOnline/sharepoint-online.md
+++ b/SharePoint/SharePointOnline/sharepoint-online.md
@@ -137,7 +137,7 @@ Help your users share, organize, and discover information with SharePoint.
diff --git a/SharePoint/SharePointOnline/sharepoint-sync.md b/SharePoint/SharePointOnline/sharepoint-sync.md
index dcdaba7764..52cce32f5e 100644
--- a/SharePoint/SharePointOnline/sharepoint-sync.md
+++ b/SharePoint/SharePointOnline/sharepoint-sync.md
@@ -20,7 +20,7 @@ Windows 10 devices come with the OneDrive sync client installed. Office 2016
[Read the release notes and install the latest fully released versions](https://support.office.com/article/845dcf18-f921-435e-bf28-4e24b95e5fc0)
-[Restrictions and limitations](http://go.microsoft.com/fwlink/?LinkId=717734)
+[Invalid file names and file types in OneDrive, OneDrive for Business, and SharePoint](https://support.office.com/article/64883a5d-228e-48f5-b3d2-eb39e07630fa)
[Fix sync problems](https://support.office.com/article/aaa2d172-8d45-4e94-9c04-5364d04ca2f4)
diff --git a/SharePoint/SharePointOnline/sharing-permissions-modern-experience.md b/SharePoint/SharePointOnline/sharing-permissions-modern-experience.md
index cc8b76447c..4d8c354eb1 100644
--- a/SharePoint/SharePointOnline/sharing-permissions-modern-experience.md
+++ b/SharePoint/SharePointOnline/sharing-permissions-modern-experience.md
@@ -49,7 +49,7 @@ Office 365 Groups may be added in Office 365, Outlook, Azure Active Directory, a
SharePoint groups and security groups do not have associated group email addresses, nor do they include group calendars, notebooks, Planner, or a default SharePoint site as is the case with Office 365 Groups.
-### When and why to add users to a type of group or directly to a Site
+## When and why to add users to a type of group or directly to a Site
A given user may be provided access to a SharePoint site by granting specific access to a given user account, or by adding the given user account to an Office 365 Group, a security group, or a SharePoint group. It is considered best practice to add users to one of the three available group types when a user requires access to a SharePoint site to increase general performance and data responsiveness.
@@ -73,7 +73,7 @@ SharePoint groups are provided by default by all SharePoint sites including mode
With modern team sites, the underlying Office 365 Group should be favored for providing access to a given site. Communication sites may utilize Office 365 Groups although the underlying grouping is handled by SharePoint groups.
-### Sharing permissions across a group of sites – sites within a Hub
+## Sharing permissions across a group of sites – sites within a Hub
SharePoint hub sites offer an important mechanism to provide cohesion with a SharePoint implementation strategy. [Learn more about hub sites](https://docs.microsoft.com/en-us/sharepoint/dev/features/hub-site/hub-site-overview).
@@ -81,7 +81,7 @@ Associated a site to a hub site does not change or unify the permissions of eith
In a scenario where common permissions may want to be applied across all or a sub-section of sites associated with a hub site, an Office 365 Group or security group could be created and then added as a member of each joined site.
-### Permission comparison between team sites and communication sites
+## Permission comparison between team sites and communication sites
Modern SharePoint Team sites and Communication sites are built on the same foundation yet have important differences that should be considered.
@@ -93,7 +93,7 @@ Communication sites look to “Share” a site, sharing a given site to individu
Communication sites are not tied to an Office 365 Group. Advanced permissions options are also available to communication sites via the Sharing or Site permissions panels. It is important to note that underlying sharing and general permissions of communication sites also driven by SharePoint groups. Communication sites include three default SharePoint groups, Owners, Members, and Visitors, just as provided by traditional SharePoint sites.
-### Internal and external sharing within SharePoint Online
+## Internal and external sharing within SharePoint Online
Sharing a site or asset within a site such as a library or document is essentially the same a granting permission for a particular person, user, or group to the shared asset. When sharing within SharePoint, you are also provided the ability to email the user directly with the UI as well.
@@ -105,7 +105,7 @@ By default, external sharing is enabled at both the tenant level and site collec
When sharing a team site, you may invite users, Office 365 Groups, and security groups to be a member of the site. When shared via the site permissions interface on the site itself, be aware that inviting a new member will not join that member to the connected Office 365 Group. You can invite new members to the Office 365 Group, which will automatically provide that member the proper access to the team site.
-### Configuration options for sharing within SharePoint Online
+## Configuration options for sharing within SharePoint Online
By default, internal sharing is available on all SharePoint sites including team sites and communication sites. By default, external sharing is also allowed.
@@ -117,7 +117,7 @@ Changing external sharing on a site by site basis requires a tenant administrato
When sharing a document such as a Microsoft Word, Microsoft Excel, or Microsoft PowerPoint document, the shared asset may be opened within the browser for a rich viewing or authoring experience.
-### Different types of sharing links
+## Different types of sharing links
When sharing a SharePoint file or folder, different types of links may be generated and either automatically or manually sent to the end user(s).
@@ -151,4 +151,4 @@ Anyone links can be configured to expire after a certain date or to never expire
[Turn external sharing on or off for SharePoint Online](turn-external-sharing-on-or-off.md)
-[Share SharePoint files or folders](https://support.office.com/article/1fe37332-0f9a-4719-970e-d2578da4941c)
\ No newline at end of file
+[Share SharePoint files or folders](https://support.office.com/article/1fe37332-0f9a-4719-970e-d2578da4941c)
diff --git a/SharePoint/SharePointOnline/specify-default-search-center.md b/SharePoint/SharePointOnline/specify-default-search-center.md
index 6f95342d15..839b76c883 100644
--- a/SharePoint/SharePointOnline/specify-default-search-center.md
+++ b/SharePoint/SharePointOnline/specify-default-search-center.md
@@ -24,7 +24,7 @@ As a SharePoint Online administrator, you can specify where searches should go b
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/turn-external-sharing-on-or-off.md b/SharePoint/SharePointOnline/turn-external-sharing-on-or-off.md
index 8c37ff414b..a3743d29a6 100644
--- a/SharePoint/SharePointOnline/turn-external-sharing-on-or-off.md
+++ b/SharePoint/SharePointOnline/turn-external-sharing-on-or-off.md
@@ -32,7 +32,7 @@ Turning external sharing on at the organization level means that site collection
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
@@ -104,7 +104,7 @@ Note that this procedure applies to both classic sites and Office 365 Group-conn
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/use-app-catalog.md b/SharePoint/SharePointOnline/use-app-catalog.md
index 20c20e6f41..cb55d18677 100644
--- a/SharePoint/SharePointOnline/use-app-catalog.md
+++ b/SharePoint/SharePointOnline/use-app-catalog.md
@@ -36,7 +36,7 @@ Even if you don't plan to make internal custom apps available, you will not be a
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/view-and-restore-deleted-sites-in-new-admin-center.md b/SharePoint/SharePointOnline/view-and-restore-deleted-sites-in-new-admin-center.md
index 7eb213cabd..a5d58e1062 100644
--- a/SharePoint/SharePointOnline/view-and-restore-deleted-sites-in-new-admin-center.md
+++ b/SharePoint/SharePointOnline/view-and-restore-deleted-sites-in-new-admin-center.md
@@ -3,7 +3,6 @@ title: "View and restore deleted sites in the new SharePoint admin center"
ms.author: kaarins
author: kaarins
manager: pamgreen
-ms.date: 6/1/2018
ms.audience: Admin
ms.topic: article
ms.service: sharepoint-online
@@ -18,22 +17,25 @@ description: "Learn about viewing and restoring sites on the Recycle bin page of
# View and restore deleted sites in the new SharePoint admin center
-Deleted sites move to the recycle bin and are retained for 93 days. After 93 days, sites and all their content and settings are permanently deleted, including document libraries and files, lists and data, and any subsites.
+Deleted sites are retained for 93 days. After 93 days, sites and all their content and settings are permanently deleted, including document libraries and files, lists and data, and any subsites.
> [!NOTE]
> If you need to retain content for a minimum period of time to comply with industry regulations or internal policies, you can create a retention policy to keep a copy of it in the Preservation Hold library. For info, see [Overview of retention policies](https://support.office.com/article/5e377752-700d-4870-9b6d-12bfc12d2423).
To view deleted sites in the new SharePoint admin center (preview), go to the current SharePoint admin center, click "Try the preview" in the upper right, and then select **Deleted sites**.
-
+
+> [!NOTE]
+> The new SharePoint admin center does not yet support deleting or restoring sites that belong to an Office 365 group. To delete or restore Office 365 groups (and the sites connected to them), go to the Microsoft 365 admin center. It might take a while for deleted group-connected team sites to appear on the Deleted sites page.
+
You can sort and filter deleted sites the same way you sort and filter sites on the Site management page. You can also sort and filter deleted sites by Time deleted.
## Restore a deleted site
-1. Select the site.
+1. Select the site.
-2. Click **Restore**.
+2. Click **Restore**. (If you don't see the Restore button, make sure only one site is selected. The button won't appear if multiple sites are selected, or if a group-connected team site is selected.)
For more info about the new SharePoint admin center, see [Get started with the new SharePoint admin center](get-started-new-admin-center.md).
diff --git a/SharePoint/SharePointOnline/view-search-usage-reports.md b/SharePoint/SharePointOnline/view-search-usage-reports.md
index 62d807a7ad..9769dab259 100644
--- a/SharePoint/SharePointOnline/view-search-usage-reports.md
+++ b/SharePoint/SharePointOnline/view-search-usage-reports.md
@@ -34,7 +34,7 @@ This article describes how you can use search reports in the SharePoint admin ce
1. Sign in to Office 365 as a global admin or SharePoint admin.
-2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Office 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
+2. Select the app launcher icon  in the upper-left and choose **Admin** to open the Microsoft 365 admin center. (If you don't see the Admin tile, you don't have Office 365 administrator permissions in your organization.)
3. In the left pane, choose **Admin centers** \> **SharePoint**.
diff --git a/SharePoint/SharePointOnline/what-s-new-in-admin-center.md b/SharePoint/SharePointOnline/what-s-new-in-admin-center.md
index f13054f882..b64a4e1e81 100644
--- a/SharePoint/SharePointOnline/what-s-new-in-admin-center.md
+++ b/SharePoint/SharePointOnline/what-s-new-in-admin-center.md
@@ -3,7 +3,6 @@ title: "What's new in the SharePoint admin center"
ms.author: kaarins
author: kaarins
manager: pamgreen
-ms.date: 6/1/2018
ms.audience: Admin
ms.topic: reference
ms.service: sharepoint-online
@@ -14,7 +13,7 @@ search.appverid:
- BSA160
- MET150
ms.assetid: 317eed2b-d266-4c4c-9a37-1aceed9db567
-description: "We're continuously adding new features to the new SharePoint admin center (preview) and fixing issues we learn about. Here's a summary of what's included, and what's coming up. You can help us improve the admin center by sending us your suggestions and reporting bugs you encounter. In the lower-right corner of the admin center, click the Feedback button."
+description: "Learn about the features currently in the new SharePoint admin center, and those coming soon."
---
# What's new in the SharePoint admin center
@@ -30,13 +29,13 @@ We're continuously adding new features to the new SharePoint admin center (previ
- Two charts, along with messages and service health filtered to SharePoint Online
-- Links to the Office 365 admin center for detailed reports, message center posts, and service health info
+- Links to the Microsoft 365 admin center for detailed reports, message center posts, and service health info
-- Links to the OneDrive admin center and classic SharePoint admin center
+- Links to the OneDrive admin center, SharePoint Migration Tool, and classic SharePoint admin center
- A geo location selector for organizations that have set up Multi-Geo in OneDrive and SharePoint
- **Site management page**
+ **Active sites page**
- A list that includes the new types of sites that users create: team sites that belong to Office 365 groups and communication sites
@@ -45,6 +44,8 @@ We're continuously adding new features to the new SharePoint admin center (previ
- Extensive site info and insights such as site name, template, file and sharing info, and date created and modified
- The ability to sort, filter, and customize columns, as well as search by all text fields
+
+- The ability to view and filter by hub site association
- Built-in views and the ability to create custom views
@@ -56,15 +57,19 @@ We're continuously adding new features to the new SharePoint admin center (previ
- The ability to select multiple sites and email site admins
- **Recycle bin page**
+ **Deleted sites page**
- A list of deleted sites with time deleted
-- The ability to restore sites individually
+- The ability to restore sites (except those connected to an Office 365 group) individually
**Settings page**
- Settings for list and library experience, sync (if your organization used the previous sync client), and notifications
+
+ **API management page**
+
+- The ability to view pending and approved web API permissions and approve or reject access requests
## Coming soon
@@ -74,25 +79,21 @@ Here's a short list of some of the larger features we're working on. Use the Fee
- Improved design for mobile
- **Site management page**
+ **Active sites page**
- Grouping
- More batch operations
-- The ability to specify the primary admin when creating communication sites and sites that belong to an Office 365 group
-
- The ability to view and update Office 365 group owners, and delete sites that belong to an Office 365 group
-- The ability to delete sites created by another admin
-
- **Recycle bin page**
+ **Deleted sites page**
- Batch restore
-- The ability to delete (purge)
+- The ability to permanently delete sites
- **Sharing and device access**
+ **Sharing and Access control**
- New pages for organization-wide settings
diff --git a/SharePoint/SharePointServer/administration/configure-object-cache-user-accounts.md b/SharePoint/SharePointServer/administration/configure-object-cache-user-accounts.md
index a38c1aefee..e749d14352 100644
--- a/SharePoint/SharePointServer/administration/configure-object-cache-user-accounts.md
+++ b/SharePoint/SharePointServer/administration/configure-object-cache-user-accounts.md
@@ -94,9 +94,9 @@ You can configure the user accounts for the object cache by the the SharePoint C
- _\_ is the name of the web application to which the accounts will be added.
- - _\_ is the account to use for the Portal Super User account as you saw it displayed in the **User Column** field mentioned in Step 11 of the previous procedure.
+ - _\_ is the account to use for the Portal Super User account as you saw it displayed in the **User Name** column mentioned in Step 11 of the previous procedure.
- - _\_ is account to use for the Portal Super Reader account as you saw it displayed in the **User Column** field mentioned in Step 11 of the previous procedure.
+ - _\_ is account to use for the Portal Super Reader account as you saw it displayed in the **User Name** column mentioned in Step 11 of the previous procedure.
4. Save the file, naming it SetUsers.ps1.
diff --git a/SharePoint/SharePointServer/administration/configure-server-to-server-authentication-in-sharepoint.md b/SharePoint/SharePointServer/administration/configure-server-to-server-authentication-in-sharepoint.md
index 13e59ebca2..300374436e 100644
--- a/SharePoint/SharePointServer/administration/configure-server-to-server-authentication-in-sharepoint.md
+++ b/SharePoint/SharePointServer/administration/configure-server-to-server-authentication-in-sharepoint.md
@@ -3,152 +3,107 @@ title: "Configure server-to-server authentication between publishing and consumi
ms.author: stevhord
author: bentoncity
manager: pamgreen
-ms.date: 9/6/2017
+ms.date: 8/10/2018
ms.audience: ITPro
ms.topic: article
ms.prod: sharepoint-server-itpro
localization_priority: Normal
ms.collection: IT_Sharepoint_Server_Top
ms.assetid: c77f5006-d023-463f-8256-e4570d32dd1e
-description: "Summary: Learn how to configure server-to-server authentication when you share service applications across SharePoint Server 2016 and SharePoint 2013 publishing and consuming farms."
+description: "Summary: Learn how to configure server-to-server authentication when you share User Profile service application across SharePoint Server 2016 and SharePoint 2013 publishing and consuming farms."
---
-# Configure server-to-server authentication between publishing and consuming farms
+# Configure Server-to-Server authentication between publishing and consuming farms
- **Summary:** Learn how to configure server-to-server authentication when you share service applications across SharePoint Server 2016 and SharePoint 2013 publishing and consuming farms.
+ **Summary:** Learn how to configure Server-to-Server authentication when you share the User Profile service application across SharePoint Server 2016 and SharePoint 2013 publishing and consuming farms.
-To enable a web application or an application service to request a resource from a web application on another farm on behalf of a user, you must configure server-to-server authentication between the farms. A few examples of SharePoint Server processes that use server-to-server authentication are as follows:
+When a farm consumes the User Profile service application of a publishing farm, SharePoint issues requests using Server-to-Server authentication on behalf of the user for some features:
-- Follow a document on a Team Sites web application when a user's personal site is located on a My Sites web application. The Team Sites web application makes a request of the My Sites web application on behalf of the user.
-
-- Create or reply to a site feed post for a site that is located on a Team Sites web application but performed through the user's My Site Newsfeed on the My Sites web application. The My Sites web application will make a request of the Team Sites web application on behalf of the user to write the post or the reply.
-
-- A User Profile Service application task to repopulate the feed cache has to read from the personal site or team site. If the User Profile Service application is running in a different farm, the User Profile Service application sends a request to the My Sites web application or Team Sites web application to read the user or site feed data into the cache.
-
-> [!NOTE]
-> Web applications or application services that request resources from an application service on another farm do not require server-to-server authentication.
+- Follow a document on a content web application when a user's personal site is located on a web application in an external farm. The content web application makes a OAuth request to the My Sites web application on behalf of the user.
+
+- Create or reply to a site feed post for a site that is located on a content web application but performed through the user's My Site Newsfeed on the My Sites web application. The My Sites web application will make a request of the content web application on behalf of the user to write the post or the reply.
+
+- A User Profile service application task to repopulate the feed cache has to read from the personal site or content site. If the User Profile Service application is running in a different farm, it sends a OAuth request to the My Sites web application or content web application to read the user or site feed data into the cache.
## Before you begin
-To understand the procedures in this article, you should be familiar with the basic concepts in the following articles:
-
-[Authentication overview for SharePoint Server](../security-for-sharepoint-server/authentication-overview.md)
-
-[Plan for server-to-server authentication in SharePoint Server](../security-for-sharepoint-server/plan-server-to-server-authentication.md)
+The procedure in this article requires that you already configured the following:
-> [!IMPORTANT]
-> If your consuming farm has web applications that are configured or registered to a Workflow Manager, when you set a Realm value, you will need to register the Workflow Manager with the SharePoint farm. Use the PowerShell [Register-SPWorkflowService](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/register-spworkflowservice?view=sharepoint-ps) cmdlet to do this.
+- Shared the User Profile service application between a consuming and a publishing farm as documented in [Share service applications across farms in SharePoint Server](share-service-applications-across-farms.md).
+- Configured the Subscription Settings and App Management service applications on both publishing and consuming farms as documented in [section "Configure the Subscription Settings and App Management service applications" of this article](https://docs.microsoft.com/en-us/sharepoint/administration/configure-an-environment-for-apps-for-sharepoint#configure-the-subscription-settings-and-app-management-service-applications)
-> For more information about setting a Realm value and registering a Workflow Manager with a SharePoint farm, see [Fix the HTTP 401 error with provider-hosted add-ins and issues with workflow and cross farm trust scenarios in SharePoint](https://support.microsoft.com/en-us/help/4010011/provider-hosted-add-ins-stop-working-and-http-401-error) and [Move Workflow Manager to a new farm in a new domain](https://sharepoint.stackexchange.com/questions/132524/move-workflow-manager-to-new-farm-in-a-new-domain).
-
-## Configure server-to-server authentication between publishing and consuming farms
-
+Verify that you have the following memberships:
-The following procedure describes how to configure server-to-server authentication between the publishing and consuming farms.
-
- **To configure server-to-server authentication between publishing and consuming farms**
-
-1. Choose a realm name that will be common to both farms.
-
-2. Verify that you are a member of the Administrators group on the server on which you are running PowerShell cmdlets.
-
- - **Securityadmin** fixed server role on the SQL Server instance.
-
- - **db_owner** fixed database role on all databases that are to be updated.
-
- An administrator can use the **Add-SPShellAdmin** cmdlet to grant permissions to use SharePoint Server cmdlets.
-
+ - **Securityadmin** fixed server role on the SQL Server instance.
+ - **db_owner** fixed database role on all databases that are to be updated.
+ - Member of built-in Administrators group on the server on which you are running the PowerShell cmdlets.
+ An administrator can use the **Add-SPShellAdmin** cmdlet to grant permissions to use SharePoint Server cmdlets.
> [!NOTE]
> If you do not have permissions, contact your Setup administrator or SQL Server administrator to request permissions. For additional information about PowerShell permissions, see [Add-SPShellAdmin](http://technet.microsoft.com/library/2ddfad84-7ca8-409e-878b-d09cb35ed4aa.aspx).
-
-3. In the SharePoint Server environment on both the publishing and consuming farms, start the SharePoint Management Shell.
-
-4. To configure the publishing farm for the common realm name, type the following command at the PowerShell command prompt on a server in the publishing farm:
-
- ```
- Set-SPAuthenticationRealm -realm
- ```
-
- Where:
-
- _RealmName_ is the name that you chose in step 1.
-
-5. To configure the Name ID for the SharePoint Security Token Service (STS) on the publishing farm to include the common realm name, type the following commands at the PowerShell command prompt on a server in the publishing farm:
-
- ```
- $sts=Get-SPSecurityTokenServiceConfig
- $Realm=Get-SpAuthenticationRealm
- $nameId = "00000003-0000-0ff1-ce00-000000000000@$Realm"
- Write-Host "Setting STS NameId to $nameId"
- $sts.NameIdentifier = $nameId
- $sts.Update()
- ```
-
-6. To configure the consuming farm for the common realm name, type the following command at the PowerShell command prompt on a server in the consuming farm:
-
- ```
- Set-SPAuthenticationRealm -realm
- ```
-
- Where:
-
- _RealmName_ is the name that you chose in step 1.
-
-7. To configure the Name ID for the SharePoint STS on the consuming farm to include the common realm name, type the following commands at the PowerShell command prompt on a server in the consuming farm:
-
- ```
- $sts=Get-SPSecurityTokenServiceConfig
- $Realm=Get-SpAuthenticationRealm
- $nameId = "00000003-0000-0ff1-ce00-000000000000@$Realm"
- Write-Host "Setting STS NameId to $nameId"
- $sts.NameIdentifier = $nameId
- $sts.Update()
- ```
-
-8. To configure the publishing farm for server-to-server authentication with the consuming farm, type the following command at the PowerShell command prompt on a server in the publishing farm:
-
- ```
- New-SPTrustedSecurityTokenIssuer -MetadataEndpoint "https:///_layouts/<15or16>/metadata/json/1" -Name ""
- ```
-
- Where:
-
- - _ConsumeHostName_ is the name and port of any SSL-enabled web application of the consuming farm.
-
- - _15or16_ is the directory for the SharePoint Server version.
-
- - _ConsumeFriendlyName_ is a friendly name for the consuming farm.
-
- This creates the server-to-server authentication trust with the consuming farm.
-
-9. To configure the consuming farm for server-to-server authentication with the publishing farm, type the following command at the PowerShell command prompt on a server in the consuming farm:
-
- ```
- New-SPTrustedSecurityTokenIssuer -MetadataEndpoint "https:///_layouts/<15or16>/metadata/json/1" -Name ""
- ```
-
- Where:
-
- - _PublishHostName_ is the name and port of any SSL-enabled web application of the publishing farm.
-
- - _15or16_ is the directory for the SharePoint Server version.
-
- - _PublishFriendlyName_ is a friendly name for the publishing farm.
-
- This creates the server-to-server authentication trust with the publishing farm.
-
+
+## Configure server-to-server authentication between publishing and consuming farms
+
+
+The following procedure describes how to configure server-to-server authentication between publishing and consuming farms, and grant just the necessary permissions to allow social features to work. Each farm keeps its own, unique authentication realm.
+
+### Authorize consuming farm to send OAuth requests to the farm hosting the MySites web application
+
+In a SharePoint server in the **farm running the MySites web application** (which might not be the publishing farm), start the SharePoint Management Shell and run this PowerShell script to register the consuming farm as a trusted issuer, get its app principal and grant it the required authorizations:
+
+```powershell
+# Register the consuming farm as a trusted issuer using information in its metadata file
+$trustedIssuer = New-SPTrustedSecurityTokenIssuer -MetadataEndpoint "https:///_layouts/15/metadata/json/1" -Name ""
+
+# Get the app principal and set required authorizations
+$mySiteHost = Get-SPWeb "http:///_layouts/15/metadata/json/1" -Name ""
+
+# Get the app principal
+$centralAdminWeb = Get-SPWeb "http://
-#### Concepts
+### Concepts
[Share service applications across farms in SharePoint Server](share-service-applications-across-farms.md)
-#### Other Resources
-[Get-SPAuthenticationRealm](http://technet.microsoft.com/library/7ec6c10c-283e-4533-addf-6bdd2d804c28.aspx)
-
-[Set-SPAuthenticationRealm](http://technet.microsoft.com/library/d3d60059-4883-4591-a3a7-d3002c999e68.aspx)
+[Authentication overview for SharePoint Server](../security-for-sharepoint-server/authentication-overview.md)
+
+[Plan for server-to-server authentication in SharePoint Server](../security-for-sharepoint-server/plan-server-to-server-authentication.md)
+
+### Other Resources
-[New-SPTrustedSecurityTokenIssuer](http://technet.microsoft.com/library/9ab7aac9-4c9a-4cba-8dd6-ffead217c2fa.aspx)
+[New-SPTrustedSecurityTokenIssuer](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/new-sptrustedsecuritytokenissuer?view=sharepoint-ps)
+[Set-SPAppPrincipalPermission](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/set-spappprincipalpermission?view=sharepoint-ps)
diff --git a/SharePoint/SharePointServer/administration/move-all-databases.md b/SharePoint/SharePointServer/administration/move-all-databases.md
index 591191b6aa..5d622a0018 100644
--- a/SharePoint/SharePointServer/administration/move-all-databases.md
+++ b/SharePoint/SharePointServer/administration/move-all-databases.md
@@ -93,7 +93,7 @@ Before you begin this operation, review the steps in this process:
- [Scenario 1](#PS): Use this procedure to update the database connections if you use SharePoint Server and SQL Server AlwaysOn Availability Groups for high availability or disaster recovery.
- - [Scenario 2](#Man): Use this procedure if you must use manual steps or if you move the databases from a SharePoint Server Single-server farm role installation to a new Single-server farm role installation.
+ - [Scenario 2](#MAN): Use this procedure if you must use manual steps or if you move the databases from a SharePoint Server Single-server farm role installation to a new Single-server farm role installation.
9. Restart all services that you stopped in step 3.
@@ -370,7 +370,7 @@ Use the next procedure for the following scenarios:
[Database types and descriptions in SharePoint Server](../technical-reference/database-types-and-descriptions.md)
#### Other Resources
-[Quick reference guide: SharePoint Server 2016 databases](https://doc.co/qrafhS)
+[Quick reference guide: SharePoint Server 2016 databases](https://download.microsoft.com/download/D/5/D/D5DC1121-8BC5-4953-834F-1B5BB03EB691/DBrefguideSPS2016_tabloid.pdf)
[Databases that support SharePoint 2013](https://go.microsoft.com/fwlink/p/?LinkId=257370)
diff --git a/SharePoint/SharePointServer/administration/overview-of-sql-server-in-a-sharepoint-server-2016-environment.md b/SharePoint/SharePointServer/administration/overview-of-sql-server-in-a-sharepoint-server-2016-environment.md
index 886c03cb3f..cfb9bfd02e 100644
--- a/SharePoint/SharePointServer/administration/overview-of-sql-server-in-a-sharepoint-server-2016-environment.md
+++ b/SharePoint/SharePointServer/administration/overview-of-sql-server-in-a-sharepoint-server-2016-environment.md
@@ -58,8 +58,8 @@ The SharePoint Server 2016 application is built on the SQL Server database engin
|Content
| Content databases store all site content:
Site documents, such as files in document libraries
List data
Web Part properties
Data for apps for SharePoint
Data and objects for Project Server 2016
User names and permissions
Each web application can contain many content databases. Each site collection can be associated with only one content database, although a content database can be associated with many site collections.
|
|Service application
|Databases for service applications store the data that service applications use.
|
-For a full list of all of the databases that support SharePoint Server 2016, see [Database types and descriptions in SharePoint Server](../technical-reference/database-types-and-descriptions.md). For a graphical representation of these databases, download the SharePoint Server 2016 database poster, as either a [PDF](https://download.microsoft.com/download/D/5/D/D5DC1121-8BC5-4953-834F-1B5BB03EB691/DBrefguideSPS2016_tabloid.pdf) or [Visio](https://download.microsoft.com/download/D/5/D/D5DC1121-8BC5-4953-834F-1B5BB03EB691/DBrefguideSPS2016_tabloid.vsdx)file.
-
+For a full list of all of the databases that support SharePoint Server 2016, see [Database types and descriptions in SharePoint Server](../technical-reference/database-types-and-descriptions.md). For a graphical representation of the databases that support SharePoint Server 2016, see the SharePoint Server 2016 database poster as either a [PDF](https://download.microsoft.com/download/D/5/D/D5DC1121-8BC5-4953-834F-1B5BB03EB691/DBrefguideSPS2016_tabloid.pdf) or [Visio](https://download.microsoft.com/download/D/5/D/D5DC1121-8BC5-4953-834F-1B5BB03EB691/DBrefguideSPS2016_tabloid.vsdx) file.
+
## Working with the SQL Server databases that support SharePoint Server 2016
diff --git a/SharePoint/SharePointServer/administration/storage-and-sql-server-capacity-planning-and-configuration.md b/SharePoint/SharePointServer/administration/storage-and-sql-server-capacity-planning-and-configuration.md
index f6d655c457..6e3ddf162b 100644
--- a/SharePoint/SharePointServer/administration/storage-and-sql-server-capacity-planning-and-configuration.md
+++ b/SharePoint/SharePointServer/administration/storage-and-sql-server-capacity-planning-and-configuration.md
@@ -75,7 +75,7 @@ In this section:
The databases that are installed with SharePoint Server 2016 depend on the service applications that are used in the environment. All SharePoint Server 2016 environments rely on the SQL Server system databases. This section provides a summary of the databases installed with SharePoint Server 2016. For detailed database information, see [Database types and descriptions in SharePoint Server](../technical-reference/database-types-and-descriptions.md).
-For a graphical overview of the databases that support SharePoint Server 2016, see [Quick reference guide: SharePoint Server 2016 databases](https://doc.co/qrafhS). You can also download this SharePoint Server 2016 database poster, as either a [PDF](https://download.microsoft.com/download/D/5/D/D5DC1121-8BC5-4953-834F-1B5BB03EB691/DBrefguideSPS2016_tabloid.pdf) or [Visio](https://download.microsoft.com/download/D/5/D/D5DC1121-8BC5-4953-834F-1B5BB03EB691/DBrefguideSPS2016_tabloid.vsdx) file.
+For a graphical overview of the databases that support SharePoint Server 2016, see [Quick reference guide: SharePoint Server 2016 databases](https://download.microsoft.com/download/D/5/D/D5DC1121-8BC5-4953-834F-1B5BB03EB691/DBrefguideSPS2016_tabloid.pdf). You can also download this SharePoint Server 2016 database poster, as either a [PDF](https://download.microsoft.com/download/D/5/D/D5DC1121-8BC5-4953-834F-1B5BB03EB691/DBrefguideSPS2016_tabloid.pdf) or [Visio](https://download.microsoft.com/download/D/5/D/D5DC1121-8BC5-4953-834F-1B5BB03EB691/DBrefguideSPS2016_tabloid.vsdx) file.
> [!NOTE]
> Some SharePoint Server, SQL Server Database Engine, and SQL Server Reporting Services (SSRS) databases have specific location recommendations or requirements. For information about these database locations, see [Database types and descriptions in SharePoint Server](../technical-reference/database-types-and-descriptions.md).
diff --git a/SharePoint/SharePointServer/administration/use-a-sample-mim-solution-in-sharepoint-server-2016.md b/SharePoint/SharePointServer/administration/use-a-sample-mim-solution-in-sharepoint-server-2016.md
index 39e6e4032f..e288bbea84 100644
--- a/SharePoint/SharePointServer/administration/use-a-sample-mim-solution-in-sharepoint-server-2016.md
+++ b/SharePoint/SharePointServer/administration/use-a-sample-mim-solution-in-sharepoint-server-2016.md
@@ -30,7 +30,7 @@ The article outlines a solution that will help you to install and synchronize ac
- [The Microsoft PowerShell to start the SharePoint Synchronization Configuration](use-a-sample-mim-solution-in-sharepoint-server-2016.md#BKMK_StartSyncConfig)
> [!IMPORTANT]
-> The solutions files referenced in this article are available for download [here](https://github.com/OfficeDev/PnP-Tools/tree/master/Solutions/UserProfile.MIMSync). You will need a GitHub account for access. See the section 'Download the solutions files that you need' for more details. > Microsoft Identity Manager 2016 is available for download from the [Microsoft Volume Licensing Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). (Log in and search on the product name.) > On your MIM server, be sure to install [KB3092179](https://support.microsoft.com/en-us/kb/3092179).
+> The solutions files referenced in this article are available for download [here](https://github.com/OfficeDev/PnP-Tools/tree/master/Solutions/UserProfile.MIMSync). You will need a GitHub account for access. See the section 'Download the solutions files that you need' for more details. > Microsoft Identity Manager 2016 is available for download from the [Microsoft Volume Licensing Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). (Log in and search on the product name.) > On your MIM server, be sure to install Service Pack 1 (https://aka.ms/mim2016sp1upgrade).
## Download the solutions files that you need
diff --git a/SharePoint/SharePointServer/install/account-permissions-and-security-settings-in-sharepoint-server-2016.md b/SharePoint/SharePointServer/install/account-permissions-and-security-settings-in-sharepoint-server-2016.md
index 827b2450f3..95e0666ec9 100644
--- a/SharePoint/SharePointServer/install/account-permissions-and-security-settings-in-sharepoint-server-2016.md
+++ b/SharePoint/SharePointServer/install/account-permissions-and-security-settings-in-sharepoint-server-2016.md
@@ -29,9 +29,30 @@ This article describes SharePoint administrative and services account permission
The SharePoint Products Configuration Wizard (Psconfig) and the Farm Configuration Wizard, both of which are run during a complete installation, configure many of the SharePoint baseline account permissions and security settings.
+
+## Service account recommendations
+
+
+Microsoft recommends using a minimal number of service accounts in the farm. This is to reduce memory usage and increase performance while maintaining the appropriate level of security.
+
+- Use an elevated, personally identifiable account for SharePoint installation, maintenance, and upgrades. This account will hold the roles required as outlined by the Setup user administrator account outlined below. Each SharePoint Administrator should use a separate account to clearly identify activity performed by the administrator on the farm.
+
+- With the exception of the Claims to Windows Token Service account, no service accounts should have Local Administrator access to any SharePoint server, nor any elevated SQL Server role, for example, the sysadmin fixed role. The SharePoint farm administrator account will require the dbcreator and securityadmin fixed roles unless you pre-provision SharePoint databases and manually assign permissions to each database.
+
+- Service accounts, with the exception of the account running the Claims to Windows Token Service, should have Deny logon locally and Deny logon through Remote Desktop Services in the Local Security Policy\User Rights Assignment. This is set via `secpol.msc`.
+
+- The SharePoint farm service account should only run the SharePoint Timer service, SharePoint Inights (if applicable), the IIS Application Pools for Central Administration, SharePoint Web Services System (used for the topology service), and SecurityTokenServiceApplicationPool (used for the Security Token Service).
+
+- A single account should be used for all Service Applications. This allows the administrator to use a single IIS Application Pool for all Service Applications. In addition, this account should run the following Windows Services: SharePoint Search Host Controller, SharePoint Server Search, and Distributed Cache (AppFabric Caching Service).
+
+- A single account should be used for all Web Applications. This allows the administrator to use a single IIS Application Pool for all Web Applications. The exception is the Central Administration Web Application, which as noted above, is run by the SharePoint farm service account.
+
+- Use separate accounts for the Content access accounts (Search crawler), Super Reader, Super User, and User Profile Service Application Synchronization, if applicable.
+
+- The Claims to Windows Token Service account is a highly privledged account on the farm. Prior to deploying this service, verify it is required. If required, use a separate account for this service.
## SharePoint administrative accounts
-
+
One of the following SharePoint components automatically configures most of the SharePoint administrative account permissions during the setup process:
@@ -103,7 +124,7 @@ After you run the configuration wizards, SQL Server and database permissions inc
- Membership in the WSS_CONTENT_APPLICATION_POOLS role for the SharePoint_Admin content database.
## SharePoint service application accounts
-
+
This section describes the service application accounts that are set up by default during installation.
@@ -181,7 +202,7 @@ The following SQL Server and database permissions are configured automatically:
- This account is assigned to the WSS_CONTENT_APPLICATION_POOLS role that is associated with the SharePoint_Admin content database.
## SharePoint database roles
-
+
This section describes the database roles that installation sets up by default or that you can configure optionally.
@@ -248,7 +269,7 @@ The SPDataAccess role will have the following permissions:
- Grant create table permission.
## Group permissions
-
+
This section describes permissions of groups that the SharePoint Servers 2016 and 2019 Public Preview setup and configuration tools create.
@@ -414,7 +435,7 @@ The following table shows the all SharePoint Server service accounts file system
|%COMMONPROGRAMFILES%\Microsoft Shared\Web Server Extensions\16\LOGS
|Modify
|No
|This directory contains setup and run-time tracing logs. If this directory is altered, diagnostic logging will not function correctly. All SharePoint Server service accounts must have write permission to this directory.
|
## See also
-
+
#### Concepts
diff --git a/SharePoint/SharePointServer/install/hardware-and-software-requirements.md b/SharePoint/SharePointServer/install/hardware-and-software-requirements.md
index 665f7d2f08..17f47ab966 100644
--- a/SharePoint/SharePointServer/install/hardware-and-software-requirements.md
+++ b/SharePoint/SharePointServer/install/hardware-and-software-requirements.md
@@ -42,21 +42,21 @@ Note:
The intra-farm latency of \<1 ms one way, 99,9% of the time over a period of ten minutes is also required for SharePoint environments with servers that are located in the same datacenter. The bandwidth speed should also be in this case at least 1 gigabit per second.
-## Hardware requirements: Web servers, application servers, and MinRole installations
+## Hardware requirements: SharePoint server installations
-The values in the following table are minimum values for installations on a web and application servers that are running SharePoint Server 2016 in a multiple server farm installation.
+The following table lists minimum hardware requirements for installing and running SharePoint Server 2016 in a multiple server farm installation.
For all installation scenarios, you must have sufficient hard disk space for the base installation and sufficient space for diagnostics such as logging, debugging, creating memory dumps, and so on. For production use, you must also have additional free disk space for day-to-day operations. In addition, maintain two times as much free space as you have RAM for production environments.
-For information about hardware and software requirements for Microsoft SQL Server 2014, see [Hardware and Software Requirements for Installing SQL Server 2014](https://technet.microsoft.com/en-us/library/ms143506%28v=sql.120%29.aspx).
+For information about hardware and software requirements for Microsoft SQL Server 2014, see [Hardware and Software Requirements for Installing SQL Server 2014](https://technet.microsoft.com/library/ms143506%28v=sql.120%29.aspx).
|**Installation scenario**|**Deployment type and scale**|**RAM**|**Processor**|**Hard disk space**|
|:-----|:-----|:-----|:-----|:-----|
|Single server role that uses SQL Server
|Development or evaluation installation of SharePoint Server 2016 with the minimum recommended services for development environments. Use the Single-Server farm role that will let you choose which service applications to provision. For additional information on Single-Server farm role, see [Overview of MinRole Server Roles in SharePoint Server 2016](overview-of-minrole-server-roles-in-sharepoint-server.md)
|16 GB
|64-bit, 4 cores
|80 GB for system drive
100 GB for second drive
|
|Single server role that uses SQL Server
|Pilot or user acceptance test installation of SharePoint Server 2016 running all available services for development environments.
|24 GB
|64-bit, 4 cores
|80 GB for system drive
100 GB for second drive and additional drives
|
-|Web server or application server in a three-tier farm
|Development or evaluation installation of SharePoint Server 2016 with a minimum number of services.
|12 GB
|64-bit, 4 cores
|80 GB for system drive
80 GB for second drive
|
-|Web server or application server in a three-tier farm
|Pilot, user acceptance test, or production deployment of SharePoint Server 2016 running all available services.
|16 GB
|64-bit, 4 cores
|80 GB for system drive
80 GB for second drive and additional drives
|
+|SharePoint server in a multiple server farm
|Development or evaluation installation of SharePoint Server 2016 with a minimum number of services.
|12 GB
|64-bit, 4 cores
|80 GB for system drive
80 GB for second drive
|
+|SharePoint server in a multiple server farm
|Pilot, user acceptance test, or production deployment of SharePoint Server 2016 running all available services.
|16 GB
|64-bit, 4 cores
|80 GB for system drive
80 GB for second drive and additional drives
|
## Deployment requirements: Farm Topology
@@ -73,7 +73,7 @@ The requirements in the following section apply to the following installations:
- Server farm with multiple servers in the farm
> [!NOTE]
-> Before you install the prerequisite installer, you need to install [Windows RT 8.1, Windows 8.1, and Windows Server 2012 R2 update: April 2014](https://support.microsoft.com/en-us/kb/2919355). The SharePoint prerequisite installer does not install this update for you.
+> Before you run the SharePoint prerequisite installer on Windows Server 2012 R2, you need to install [Windows RT 8.1, Windows 8.1, and Windows Server 2012 R2 update: April 2014](https://support.microsoft.com/kb/2919355). The SharePoint prerequisite installer does not install this update for you.
> [!NOTE]
> SharePoint Server 2016 supports drives that are formatted with the Resilient File System (ReFS). For additional information about ReFs, see [Resilient File System Overview](https://go.microsoft.com/fwlink/p/?LinkId=618431) and [Resilient File System](https://go.microsoft.com/fwlink/p/?LinkId=618432)
@@ -104,7 +104,7 @@ One of the following:
> To take advantage of any BI scenarios, you must have the latest Powerview and PowerPivot add-ins for Microsoft SQL Server 2016 RTM. To download the PowerPivot add-ins see, [Microsoft® SQL Server® 2016 PowerPivot® for Microsoft SharePoint® 2016](https://go.microsoft.com/fwlink/?LinkID=716860)
> [!NOTE]
-> SQL Server Express is not supported. SQL Azure (the SaaS service) is also not supported for any SharePoint databases
+> SQL Server Express is not supported. SQL Azure (the SaaS service) is also not supported for any SharePoint databases.
One of the following server operating systems:
@@ -112,6 +112,8 @@ One of the following server operating systems:
- Windows Server 2016 Standard or Datacenter
+- Windows Server 2019 Standard or Datacenter
+
#### Minimum requirements for SharePoint servers in a farm
One of the following server operating systems:
@@ -119,13 +121,18 @@ One of the following server operating systems:
- Windows Server 2012 R2 Standard or Datacenter
- Windows Server 2016 Standard or Datacenter
+
+- Windows Server 2019 Standard or Datacenter
> [!NOTE]
-> We don't support installing the Office 2016 client and SharePoint Server 2016 on the same computer.
+> Installing the Office 2016 client and SharePoint Server 2016 on the same computer is not supported.
> [!NOTE]
-> SharePoint Server 2016 only supports the "Server with Desktop Experience" installation option of Windows Server 2016. For additional information about Windows Server offerings, see [Windows Server Semi-annual Channel Overview](https://docs.microsoft.com/en-us/windows-server/get-started/semi-annual-channel-overview)
-
+> SharePoint Server 2016 only supports the "Server with Desktop Experience" installation option of Windows Server 2016 and Windows Server 2019. For additional information about Windows Server offerings, see [Windows Server Semi-annual Channel Overview](https://docs.microsoft.com/windows-server/get-started/semi-annual-channel-overview)
+
+> [!NOTE]
+> SharePoint Server 2016 supports Windows Server 2019 starting with the [Security Update for Microsoft SharePoint Enterprise Server 2016 (KB4011244)](https://support.microsoft.com/help/4011244/descriptionofthesecurityupdateforsharepointserver2016november14-2017), also known as the November 2017 Public Update for SharePoint Server 2016. This update (or a newer Public Update for SharePoint Server 2016) must be installed before you can create a new SharePoint farm or join a server to an existing SharePoint farm using Windows Server 2019.
+
The Microsoft SharePoint Products Preparation Tool installs the following prerequisites on SharePoint servers in a farm:
- Web Server (IIS) role
diff --git a/SharePoint/SharePointServer/search/manage-the-search-topology.md b/SharePoint/SharePointServer/search/manage-the-search-topology.md
index 36ffaa0a18..4e5b508910 100644
--- a/SharePoint/SharePointServer/search/manage-the-search-topology.md
+++ b/SharePoint/SharePointServer/search/manage-the-search-topology.md
@@ -21,7 +21,7 @@ The following articles provide information about how you manage search component
Before you change the search topology, you must define, install and configure the required application servers and database servers that you want to use for search.
-For information about planning an initial enterprise search architecture, see [Plan enterprise search architecture in SharePoint Server 2016](plan-enterprise-search-architecture.md). To learn which approach to use to scale enterprise search architecture, see [Scale enterprise search in SharePoint Server](scale-enterprise-search.md). For information about planning an initial search architecture for cloud hybrid search, see [Plan your search architecture in SharePoint Server for cloud hybrid search](http://technet.microsoft.com/library/33926857-302c-424f-ba78-03286cf5ac30%28Office.14%29.aspx#BKMK_Plan_search_architecture).
+For information about planning an initial enterprise search architecture, see [Plan enterprise search architecture in SharePoint Server 2016](plan-enterprise-search-architecture.md). To learn which approach to use to scale enterprise search architecture, see [Scale enterprise search in SharePoint Server](scale-enterprise-search.md). For information about planning an initial search architecture for cloud hybrid search, see [Plan your search architecture in SharePoint Server for cloud hybrid search](../hybrid/plan-cloud-hybrid-search-for-sharepoint.md#BKMK_Plan_search_architecture).
For example farm architectures and search topologies for internet sites, see the technical diagrams [Internet sites search architectures for SharePoint Server 2013](https://www.microsoft.com/en-us/download/details.aspx?id=54296) and [Search architectures for SharePoint Server 2013](https://docs.com/officeitpro/3386/search-architectures-for-sharepoint-server-2016). You can also find these diagrams in [Technical diagrams for SharePoint Server](../technical-reference/technical-diagrams.md) . [Scale search for Internet sites in SharePoint Server](scale-search-for-internet-sites.md) gives guidance on scaling out search topology for Internet sites.
diff --git a/SharePoint/SharePointServer/upgrade-and-update/prepare-to-deploy-software-updates.md b/SharePoint/SharePointServer/upgrade-and-update/prepare-to-deploy-software-updates.md
index c9c99b7914..ee64931bc8 100644
--- a/SharePoint/SharePointServer/upgrade-and-update/prepare-to-deploy-software-updates.md
+++ b/SharePoint/SharePointServer/upgrade-and-update/prepare-to-deploy-software-updates.md
@@ -174,13 +174,12 @@ SharePoint farm deployments require that all servers have the same patch level w
* Within the extracted SharePoint installation folder, there is an Updates folder, C:\SharePointInstall\Updates. This is the folder where the slipstreamed packages will reside.
-* Download the two update packages for the particular month you wish to slipstream, for example, KB4022178 and KB4022173, the June 2018 Public Updates.
+* Download the necessary package(s) to bring the new server to the desired patch level.
-* Extract each update to the target location. This can be done via the Command Prompt/PowerShell using the following examples.
+* Extract each package to the target location. This can be done via the Command Prompt/PowerShell using the following example.
```
-PS C:\>sts2016-kb4022173-fullfile-x64-glb.exe /extract:C\SharePointInstall\Updates
-PS C:\>wssloc2016-kb4022178-fullfile-x64-glb.exe /extract:C\SharePointInstall\Updates
+PS C:\>ubersrv2013-kb4092476-fullfile-x64-glb.exe /extract:C\SharePointInstall\Updates
```
With the extraction complete, run the Setup from the installation location, `C:\SharePointInstall\setup.exe`. Setup will automatically apply the update during the installation process of SharePoint.
diff --git a/SharePoint/SharePointServer/upgrade-and-update/upgrade-service-applications-to-sharepoint-server-2019.md b/SharePoint/SharePointServer/upgrade-and-update/upgrade-service-applications-to-sharepoint-server-2019.md
index a47377baff..504d81af1b 100644
--- a/SharePoint/SharePointServer/upgrade-and-update/upgrade-service-applications-to-sharepoint-server-2019.md
+++ b/SharePoint/SharePointServer/upgrade-and-update/upgrade-service-applications-to-sharepoint-server-2019.md
@@ -160,11 +160,11 @@ To upgrade the Secure Store service application, you create the new service appl
$applicationPool = Get-SPServiceApplicationPool -Identity 'SharePoint Web Services default'
```
- Where:
+ Where:
- _SharePoint Web Services default_ is the name of the service application pool that will contain the new service applications. This is the default service application pool. You can specify a different service application pool.
- This cmdlet sets the service application pool as a variable that you can use again in the cmdlets that follow. If you have multiple application pools and have to use a different application pool for a particular service application, repeat this step in the procedure to create each service application to use the appropriate application pool.
+ This cmdlet sets the service application pool as a variable that you can use again in the cmdlets that follow. If you have multiple application pools and have to use a different application pool for a particular service application, repeat this step in the procedure to create each service application to use the appropriate application pool.
4. To upgrade the Secure Store service application, at the PowerShell command prompt, type the following command:
@@ -172,7 +172,7 @@ To upgrade the Secure Store service application, you create the new service appl
$sss = New-SPSecureStoreServiceApplication -Name 'Secure Store' -ApplicationPool $applicationPool -DatabaseName 'SecureStore_Upgrade_DB' -AuditingEnabled
```
- Where:
+ Where:
- _SecureStore_ is the name that you want to give the new Secure Store service application.
@@ -183,9 +183,9 @@ To upgrade the Secure Store service application, you create the new service appl
- _SecureStore_Upgrade_DB_ is the name of the service application database that you want to upgrade.
- This command sets a variable, $sss, that you use when you create the proxy later.
+ This command sets a variable, $sss, that you use when you create the proxy later.
- For more information, see [New-SPSecureStoreApplication](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPSecureStoreApplication?view=sharepoint-ps).
+ For more information, see [New-SPSecureStoreApplication](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPSecureStoreApplication?view=sharepoint-ps).
5. Type the following command to create a proxy for the Secure Store service application:
@@ -193,7 +193,7 @@ To upgrade the Secure Store service application, you create the new service appl
$sssp = New-SPSecureStoreServiceApplicationProxy -Name ProxyName -ServiceApplication $sss -DefaultProxyGroup
```
- Where:
+ Where:
- _ProxyName_ is the proxy name that you want to use.
@@ -204,11 +204,11 @@ To upgrade the Secure Store service application, you create the new service appl
- _DefaultProxyGroup_ adds the Secure Store service application proxy to the default proxy group for the local farm.
- This command sets a variable, $sssp, for the service application proxy that you use when you restore the passphrase.
+ This command sets a variable, $sssp, for the service application proxy that you use when you restore the passphrase.
- For more information, see [New-SPSecureStoreServiceApplicationProxy](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPSecureStoreServiceApplicationProxy?view=sharepoint-ps).
+ For more information, see [New-SPSecureStoreServiceApplicationProxy](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPSecureStoreServiceApplicationProxy?view=sharepoint-ps).
- After you create the Secure Store service application and the proxy, you have to refresh the encryption key. For information about how to refresh the encryption key, see [Refresh the Secure Store encryption key](../administration/configure-the-secure-store-service.md#refresh).
+ After you create the Secure Store service application and the proxy, you have to refresh the encryption key. For information about how to refresh the encryption key, see [Refresh the Secure Store encryption key](../administration/configure-the-secure-store-service.md#refresh).
6. Type the following command to restore the passphrase for the Secure Store service application:
@@ -216,7 +216,7 @@ To upgrade the Secure Store service application, you create the new service appl
Update-SPSecureStoreApplicationServerKey -Passphrase -ServiceApplicationProxy $sssp
```
- Where:
+ Where:
- _\_ is the Passphrase for the Secure Store service application from your previous environment.
@@ -256,11 +256,11 @@ To upgrade the Business Data Connectivity service application, you create the ne
$applicationPool = Get-SPServiceApplicationPool -Identity 'SharePoint Web Services default'
```
- Where:
+ Where:
- _SharePoint Web Services default_ is the name of the service application pool that will contain the new service applications.
- This cmdlet sets the service application pool as a variable that you can use again in the cmdlets that follow. If you have multiple application pools and have to use a different application pool for a particular service application, repeat this step in the procedure to create each service application to use the appropriate application pool.
+ This cmdlet sets the service application pool as a variable that you can use again in the cmdlets that follow. If you have multiple application pools and have to use a different application pool for a particular service application, repeat this step in the procedure to create each service application to use the appropriate application pool.
4. To upgrade the Business Data Connectivity service application, at the Microsoft PowerShell command prompt, type the following command:
@@ -268,7 +268,7 @@ To upgrade the Business Data Connectivity service application, you create the ne
New-SPBusinessDataCatalogServiceApplication -Name 'BDC Service' -ApplicationPool $applicationPool -DatabaseName 'BDC_Service_DB'
```
- Where:
+ Where:
- _BDC Service_ is the name that you want to give the new Business Data Connectivity service application.
@@ -279,7 +279,7 @@ To upgrade the Business Data Connectivity service application, you create the ne
- _BDC_Service_DB_ is name of the service application database that you want to upgrade.
- For more information, see [New-SPBusinessDataCatalogServiceApplication](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPBusinessDataCatalogServiceApplication?view=sharepoint-ps).
+ For more information, see [New-SPBusinessDataCatalogServiceApplication](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPBusinessDataCatalogServiceApplication?view=sharepoint-ps).
## Upgrade the Managed Metadata service application
@@ -309,11 +309,11 @@ To upgrade the Managed Metadata service application, you create the new service
$applicationPool = Get-SPServiceApplicationPool -Identity 'SharePoint Web Services default'
```
- Where:
+ Where:
- _SharePoint Web Services default_ is the name of the service application pool that will contain the new service applications.
- This cmdlet sets the service application pool as a variable that you can use again in the cmdlets that follow. If you have multiple application pools and have to use a different application pool for a particular service application, repeat this step in the procedure to create each service application to use the appropriate application pool.
+ This cmdlet sets the service application pool as a variable that you can use again in the cmdlets that follow. If you have multiple application pools and have to use a different application pool for a particular service application, repeat this step in the procedure to create each service application to use the appropriate application pool.
4. To upgrade the Managed Metadata service application, at the PowerShell command prompt, type the following command:
@@ -321,7 +321,7 @@ To upgrade the Managed Metadata service application, you create the new service
$mms = New-SPMetadataServiceApplication -Name 'Managed Metadata Service Application' -ApplicationPool $applicationPool -DatabaseName 'Managed Metadata Service_DB'
```
- Where:
+ Where:
- _Managed Metadata Service Application_ is the name that you want to give the new Managed Metadata service application.
@@ -332,9 +332,9 @@ To upgrade the Managed Metadata service application, you create the new service
- _Managed Metadata Service_DB_ is name of the service application database that you want to upgrade.
- This command sets a variable, $mms, that you use when you create the proxy later.
+ This command sets a variable, $mms, that you use when you create the proxy later.
- For more information, see [New-SPMetadataServiceApplication](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPMetadataServiceApplication?view=sharepoint-ps).
+ For more information, see [New-SPMetadataServiceApplication](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPMetadataServiceApplication?view=sharepoint-ps).
5. At the PowerShell command prompt, type the following command to create a proxy for the Managed Metadata service application:
@@ -342,7 +342,7 @@ To upgrade the Managed Metadata service application, you create the new service
New-SPMetadataServiceApplicationProxy -Name ProxyName -ServiceApplication $mms -DefaultProxyGroup
```
- Where:
+ Where:
- _ProxyName_ is the proxy name that you want to use.
@@ -353,7 +353,7 @@ To upgrade the Managed Metadata service application, you create the new service
- _DefaultProxyGroup_ adds the Managed Metadata service application proxy to the default proxy group for the local farm.
- For more information, see [New-SPMetadataServiceApplicationProxy](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPMetadataServiceApplicationProxy?view=sharepoint-ps).
+ For more information, see [New-SPMetadataServiceApplicationProxy](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPMetadataServiceApplicationProxy?view=sharepoint-ps).
## Upgrade the PerformancePoint Services service application
@@ -384,11 +384,11 @@ To upgrade the PerformancePoint Services service application, you create the new
$applicationPool = Get-SPServiceApplicationPool -Identity 'SharePoint Web Services default'
```
- Where:
+ Where:
- _SharePoint Web Services default_ is the name of the service application pool that will contain the new service applications.
- This cmdlet sets the service application pool as a variable that you can use again in the cmdlets that follow. If you have multiple application pools and have to use a different application pool for a particular service application, repeat this step in the procedure to create each service application to use the appropriate application pool.
+ This cmdlet sets the service application pool as a variable that you can use again in the cmdlets that follow. If you have multiple application pools and have to use a different application pool for a particular service application, repeat this step in the procedure to create each service application to use the appropriate application pool.
4. To upgrade the PerformancePoint Services service application, at the PowerShell command prompt, type the following command:
@@ -396,7 +396,7 @@ To upgrade the PerformancePoint Services service application, you create the new
$pps = New-SPPerformancePointServiceApplication -Name 'PerformancePoint Service' -ApplicationPool $applicationPool -DatabaseName 'PerformancePoint Service Application_DB'
```
- Where:
+ Where:
- _PerformancePoint Service_ is the name that you want to give the new PerformancePoint Services service application.
@@ -407,9 +407,9 @@ To upgrade the PerformancePoint Services service application, you create the new
- _PerformancePoint Service Application_DB_ is name of the PerformancePoint Services service application database that you want to upgrade.
- This command sets a variable, $pps, that you use when you create the proxy later.
+ This command sets a variable, $pps, that you use when you create the proxy later.
- For more information, see [New-SPProfileServiceApplication](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPProfileServiceApplication?view=sharepoint-ps).
+ For more information, see [New-SPProfileServiceApplication](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPProfileServiceApplication?view=sharepoint-ps).
5. Type the following command to create a proxy for the PerformancePoint Services service application:
@@ -417,7 +417,7 @@ To upgrade the PerformancePoint Services service application, you create the new
New-SPPerformancePointServiceApplicationProxy -Name ProxyName -ServiceApplication $pps -Default
```
- Where:
+ Where:
- _ProxyName_ is the proxy name that you want to use.
@@ -428,7 +428,7 @@ To upgrade the PerformancePoint Services service application, you create the new
- _Default_ adds the PerformancePoint Services service application proxy to the default proxy group for the local farm.
- For more information, see [New-SPPerformancePointServiceApplicationProxy](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPPerformancePointServiceApplicationProxy?view=sharepoint-ps).
+ For more information, see [New-SPPerformancePointServiceApplicationProxy](https://docs.microsoft.com/en-us/powershell/module/sharepoint-server/New-SPPerformancePointServiceApplicationProxy?view=sharepoint-ps).
## Upgrade the Search service application
@@ -481,7 +481,7 @@ SharePoint Server 2019 Public Preview normally creates a new search topology wit
Where:
- _SearchServiceApplicationName_ is the name of the Search service application you want to pause.
+ _SearchServiceApplicationName_ is the name of the Search service application you want to pause.
> [!NOTE]
> While the Search service application is paused, the index in the SharePoint Server 2016 environment isn't updated. This means that during the upgrade to SharePoint Server 2019 Public Preview, search results might be less fresh.
diff --git a/SharePoint/SharePointServer/what-s-new/new-and-improved-features-in-SharePoint-Server-2019.md b/SharePoint/SharePointServer/what-s-new/new-and-improved-features-in-SharePoint-Server-2019.md
index b33065804f..60ffc0eb4f 100644
--- a/SharePoint/SharePointServer/what-s-new/new-and-improved-features-in-SharePoint-Server-2019.md
+++ b/SharePoint/SharePointServer/what-s-new/new-and-improved-features-in-SharePoint-Server-2019.md
@@ -97,10 +97,6 @@ Modern team sites bring a fresh and responsive user experience to team collabora
SharePoint Server 2019 Public Preview will continue to support creating classic team sites.
-### PDF Viewer
-
-SharePoint Server 2019 Public Preview can now render PDF documents on the server. Users no longer need to rely on a PDF viewer client application.
-
### SharePoint using modern Internet Information Services (IIS) APIs
SharePoint has modernized its integration with IIS by removing all of our dependencies on the legacy IIS6 APIs. SharePoint now uses the IIS7+ APIs to manage IIS, which are the latest and best supported APIs from the IIS team. This allows us to more easily adopt new IIS features and stay compatible with future Windows Server releases.
@@ -119,7 +115,7 @@ The SharePoint home page is a modern UI experience that gives users unified acc
The SharePoint home page is also the launching point for users to create new, modern sites on a self-service basis.
-You can reach the SharePoint home page by clicking on the "Sites" icon in the SharePoint app launcher. The SharePoint home page replaces the old sites.aspx experience.
+You can reach the SharePoint home page by clicking on the "SharePoint" icon in the SharePoint app launcher. The SharePoint home page replaces the old sites.aspx experience.
### From the SharePoint home page, you can create sites in different web applications
@@ -252,4 +248,5 @@ Customers can opt in and opt out of the telemetry experience at any time.
## Related Topics
[What is SharePoint?](https://support.office.com/en-us/article/What-is-SharePoint-97b915e6-651b-43b2-827d-fb25777f446f?ui=en-US&rs=en-US&ad=US)
+
[New development capabilities for SharePoint 2019](https://docs.microsoft.com/en-us/sharepoint/dev/general-development/sharepoint-2019-development-platform)
diff --git a/SharePoint/docfx.json b/SharePoint/docfx.json
index c9d3cf8f02..783a661fe1 100644
--- a/SharePoint/docfx.json
+++ b/SharePoint/docfx.json
@@ -82,6 +82,7 @@
"searchScope": {
"SharePointOnline/*.md": ["SharePoint Online"] }},
"template": [],
- "dest": "OfficeDocs-SharePoint"
+ "dest": "OfficeDocs-SharePoint",
+ "markdownEngineName": "markdig"
}
}
\ No newline at end of file
diff --git a/migration/Box-to-OneDrive-and-SharePoint-migration-guide.md b/migration/Box-to-OneDrive-and-SharePoint-migration-guide.md
index 56ce7afc57..8ee8084096 100644
--- a/migration/Box-to-OneDrive-and-SharePoint-migration-guide.md
+++ b/migration/Box-to-OneDrive-and-SharePoint-migration-guide.md
@@ -76,7 +76,7 @@ All of the following recommended assessments can be performed using Box’s Fold
| |**Assess**|**Remediate**|
|:-----|:-----|:-----|
|**File extensions**|Find all files in the Folders and Files report whose Path ends in one of the extensions defined here: [Types of files that cannot be added to a list or library](https://support.office.com/en-us/article/Types-of-files-that-cannot-be-added-to-a-list-or-library-30BE234D-E551-4C2A-8DE8-F8546FFBF5B3)|If the blocked file types are scripting files, they are blocked because scripting capabilities are turned off by default in OneDrive.
If you want to allow these file types, turn on scripting capabilities as described here: [Allow or prevent custom script](https://support.office.com/en-us/article/allow-or-prevent-custom-script-1f2c515f-5d7e-448a-9fd7-835da935584f?ui=en-US&rs=en-001&ad=US).
Make sure you understand why these files are blocked by default as described here: [Security considerations of allowing custom script](https://support.office.com/en-us/article/security-considerations-of-allowing-custom-script-b0420ab0-aff2-4bbc-bf5e-03de9719627c)|
-|**File and folder name characters**|Find all items in the Folders and Files report whose name contains any of the characters detailed here: [Restrictions and limitations when you sync SharePoint libraries to your computer through OneDrive](https://support.microsoft.com/en-us/help/2933738/restrictions-and-limitations-when-you-sync-sharepoint-libraries-to-you)|Work with your migration vendor to substitute these characters in all file and folder names.
**Note:** The # and % characters are supported but not enabled by default. Follow these steps to enable them: [New support for # and % in SharePoint Online and OneDrive](https://techcommunity.microsoft.com/t5/Microsoft-SharePoint-Blog/New-support-for-and-in-SharePoint-Online-and-OneDrive-for/ba-p/60357)|
+|**File and folder name characters**|Find all items in the Folders and Files report whose name contains any of the characters detailed here: [Invalid file names and file types in OneDrive, OneDrive for Business, and SharePoint](https://support.office.com/article/64883a5d-228e-48f5-b3d2-eb39e07630fa)|Work with your migration vendor to substitute these characters in all file and folder names.
**Note:** The # and % characters are supported but not enabled by default. Follow these steps to enable them: [New support for # and % in SharePoint Online and OneDrive](https://techcommunity.microsoft.com/t5/Microsoft-SharePoint-Blog/New-support-for-and-in-SharePoint-Online-and-OneDrive-for/ba-p/60357)|
|**File and folder path length**|Find all items in the *Folders and Files* report whose Path exceeds the file path length described here: [SharePoint Online limits](https://support.office.com/en-us/article/SharePoint-Online-limits-8f34ff47-b749-408b-abc0-b605e1f6d498)|Work with your migration vendor to reorganize your file and folder structure such that it does not exceed this limit. Splitting large drives that serve several scenarios into multiple smaller, more focused drives may help here.|
|**Large drives and complex sharing**|Scan for any drives that have a very large amount of content, or many different unique sharing permissions – this is usually a sign that the drive should be broken down into smaller, more focused sites.
Specifically, any drive that has more than 50,000 documents shared with different users must be broken up. Use Box’s Folders and Files report and Shared Links report to identify such drives.|Identify sets of content within these drives that are conceptually similar (same project area, all shared with the same users, etc). Move these sets of content out and into new drives before starting migration.|
diff --git a/migration/TOC.md b/migration/TOC.md
index 8cd186a532..cf6656e184 100644
--- a/migration/TOC.md
+++ b/migration/TOC.md
@@ -11,6 +11,7 @@
## [SharePoint Online provided Azure containers and queues for SPO Migration API](sharepoint-online-provided-azure-containers-and-queues-for-spo-migration-api.md)
## [SharePoint Online and OneDrive Migration Speed](sharepoint-online-and-onedrive-migration-speed.md)
## [Migrate to SharePoint Online using PowerShell](overview-SPMT-PS-cmdlets.md)
+## [Migrate to SharePoint Online using the Azure Data Box](how-to-migrate-file-share-content-to-SPO-using-AzureDataBox.md)
## [Overview of the SharePoint Migration Assessment Tool](overview-of-the-sharepoint-migration-assessment-tool.md)
## [SharePoint Migration Assessment Tool: Scan Reports Roadmap](sharepoint-migration-assessment-toolscan-reports-roadmap.md)
### [Migration Assessment Scan: Apps](migration-assessment-scan-apps.md)
diff --git a/migration/how-to-migrate-file-share-content-to-SPO-using-AzureDataBox.md b/migration/how-to-migrate-file-share-content-to-SPO-using-AzureDataBox.md
new file mode 100644
index 0000000000..0e8fdd2411
--- /dev/null
+++ b/migration/how-to-migrate-file-share-content-to-SPO-using-AzureDataBox.md
@@ -0,0 +1,59 @@
+---
+title: "How to migrate your file share content to SharePoint Online using the Azure Data Box"
+ms.author: jhendr
+author: JoanneHendrickson
+manager: pamgreen
+ms.audience: ITPro
+ms.topic: article
+ms.prod: sharepoint-server-itpro
+localization_priority: Normal
+description: "Learn how to migrate your file share content to SharePoint Online using the Azure Data Box"
+---
+
+# Migrate your file share content to SharePoint Online using the Azure Data Box
+
+Use the Azure Data Box and the SharePoint Migration Tool to easily migrate your file share content to SharePoint Online and OneDrive. By using the Data Box, you can remove dependency on your WAN link to transfer the data.
+The Microsoft Azure Data Box is a service that lets you order a device from the Microsoft Azure portal. You can then copy terabytes of data from your servers to the device. After shipping it back to Microsoft, your data is copied into Azure.
+
+## Requirements and costs
+
+- Azure subscription: Data Box is only available for Enterprise Agreement (EA), Cloud solution provider (CSP), or Pay-as-you-go subscription offers. If your subscription does not fall in any of the above types, contact Microsoft Support to upgrade your subscription or see [Azure subscription pricing](https://azure.microsoft.com/en-us/pricing/).
+- The minimum requirements for the SharePoint Migration Tool are here: [How to use the SharePoint Migration Tool](https://docs.microsoft.com/en-us/sharepointmigration/how-to-use-the-sharepoint-migration-tool).
+- There is a nominal cost for the Azure Data Box. For more information on the cost, see [Azure Data Box pricing](https://azure.microsoft.com/en-us/pricing/details/storage/databox/).
+
+## Workflow overview
+
+1. Order Azure Data Box.
+2. Receive and configure Data Box.
+3. Copy your on-premises file share to Azure Data Box file share.
+4. Ship Data Box back per instructions and wait for the copy to complete.
+5. Create a VM in the Azure portal and mount the Azure file share on it.
+6. Install the SMPT tool on the Azure VM.
+7. Run the SPMT tool using the Azure file share as the SOURCE.
+8. Complete the final steps of the tool.
+9. Verify and confirm your data.
+
+
+## Using the Azure Data Box
+Once your receive your Azure Data Box, follow the instructions detailed here: [Quickstart: Deploy Azure Data Box using the Azure portal](https://docs.microsoft.com/azure/databox/data-box-quickstart-portal). They step you through how to set up and configure your Data Box and how to copy the content of your file shares to the device. Some things to keep in mind while doing this:
+- Only use the “StorageAccount_AzFile” share in the Data Box to copy the data. This is because you want the data to end up in an Azure file share, not in block blobs or page blobs.
+- The first level folder within this share corresponds to an Azure file share. Create a folder and then copy all your contents into it. This is the file share that you will mount on your VM in the next step.
+
+
+## Migrating your data to SharePoint Online using SPMT
+After you receive confirmation from the Azure data team that your data copy has completed, you can now proceed to migrate your data to SharePoint Online. For best performance and connectivity, we recommend that you create an Azure Virtual Machine (VM).
+
+1. Sign into the Azure portal, and then create a virtual machine. Learn how: [Quickstart: Create Windows virtual machine in the Azure portal](https://docs.microsoft.com/azure/virtual-machines/windows/quick-create-portal).
+2. [Mount the Azure file share onto that VM](https://docs.microsoft.com/en-us/azure/storage/files/storage-how-to-use-files-windows).
+3. Download the SharePoint Migration tool and install it on your Azure VM.
+Download here: [SharePoint Migration Tool](http://spmtreleasescus.blob.core.windows.net/install/default.htm).
+4. Start the SharePoint Migration Tool. Click Sign in and enter your Office 365 username and password.
+
+5. When prompted “Where is your data?” select File share. Enter the path to your Azure file share where your data is located.
+6. Follow the remaining prompts as normal, including your target location. For more info see: [How to use the SharePoint Migration Tool](https://docs.microsoft.com/en-us/sharepointmigration/how-to-use-the-sharepoint-migration-tool).
+
+
+> [!IMPORTANT]
+> - The speed at which data is ingested into SharePoint Online is impacted by several factors, regardless if you have your data already in Azure. Understanding these factors will help you plan and maximize the efficiency of your migration. For more info, read: [SharePoint Online and OneDrive Migration Speed](https://docs.microsoft.com/en-us/sharepointmigration/sharepoint-online-and-onedrive-migration-speed).
+> - There is a risk of losing existing permissions on files when migrating the data to SharePoint Online. You may also lose certain metadata, such as “Created by” and “Date modified by”.
+
diff --git a/migration/introducing-the-sharepoint-migration-tool.md b/migration/introducing-the-sharepoint-migration-tool.md
index 42ce49a6d0..80ee0c6a7b 100644
--- a/migration/introducing-the-sharepoint-migration-tool.md
+++ b/migration/introducing-the-sharepoint-migration-tool.md
@@ -22,6 +22,8 @@ description: ""
>[!NOTE]
>Version 2 is available for download here: [SharePoint Migration Tool Version 2](http://spmtreleasescus.blob.core.windows.net/install/default.htm). For more information on this release: [SharePoint Migration Tool new features](https://blogs.technet.microsoft.com/wbaer/2018/04/11/sharepoint-migration-tool-beta-adds-early-preview-capabilities).
+>Currently the SharePoint Migration Tool Version 2 only supports migrations from SharePoint Server 2013 to SharePoint Online.
+>
>If you prefer using PowerShell, all SPMT functionality is supported. For more information see: [Migrate to SharePoint Online using PowerShell](https://docs.microsoft.com/en-us/sharepointmigration/overview-spmt-ps-cmdlets).
>
>Currently the **SharePoint Migration Tool** is not available for users of Office 365 operated by 21Vianet in China or for users of Office 365 Germany.
diff --git a/migration/media/SPMT-Intro.png b/migration/media/SPMT-Intro.png
new file mode 100644
index 0000000000..45816a1afe
Binary files /dev/null and b/migration/media/SPMT-Intro.png differ
diff --git a/migration/new-and-improved-features-in-the-sharepoint-migration-tool.md b/migration/new-and-improved-features-in-the-sharepoint-migration-tool.md
index ab8eb7a76f..f820dfbab0 100644
--- a/migration/new-and-improved-features-in-the-sharepoint-migration-tool.md
+++ b/migration/new-and-improved-features-in-the-sharepoint-migration-tool.md
@@ -16,7 +16,25 @@ Learn about the new features and updates to existing features in SharePoint Migr
>[!NOTE]
>To install the current release download here: [SharePoint Migration Tool](http://spmtreleasescus.blob.core.windows.net/install/default.htm)
-
+
+### SPMT V2.1.102.0
+
+**New features**
+
+The following features were added to the SharePoint Migration Tool, Version V2.1.102.0
+
+|**Feature**|**Description**|
+|:-----|:-----|
+|Modern design|The SharePoint Migration tool has a new look and feel that is more closely aligned with the Sharepoint Online design for easier use. |
+
+**Improvements**
+
+In addition to several minor fixes, here are the primary improvements made in this release:
+
+|**Issue**|**Fix**|
+|:----|:-----|
+|Stability|General improvements have been made to remove some errors in tool.|
+
### SPMT V2.1.101.6
@@ -117,9 +135,6 @@ In addition to a number of minor fixes, here are the primary improvements made i
|Warnings when files are checked out
|Users will now have warning messages appear in the tool when attempting to migrate a file that was checked out.
|
|Report when performing only a scan
|The **FilesReport.csv** file will now show the correct results when only scanning option is turned on.
|
-## See also
-
-#### Other Resources
[Download SharePoint Migration Tool](http://spmtreleasescus.blob.core.windows.net/install/default.htm)