Merge branch 'master' into gutenberg

OneDrive/One-Drive-Quickstart-Small-Business.md

@@ -29,11 +29,11 @@ To get started with OneDrive, follow these steps:
 
 When you’ve completed these tasks, you’re ready to plan for, deploy, and configure the OneDrive sync client and applications. To do that, complete these three simple steps:
 
-1.  **Plan for adoption.** For small businesses, planning for user adoption can be as simple as individually showing your users how to use OneDrive. Often, small business customers don’t consider this step for new applications, and that can negatively affect the application’s success. The section [Adopt OneDrive](#_Adopt_OneDrive) provides helpful resources for OneDrive adoption.
+1.  **Plan for adoption.** For small businesses, planning for user adoption can be as simple as individually showing your users how to use OneDrive. Often, small business customers don’t consider this step for new applications, and that can negatively affect the application’s success. The section [Adopt OneDrive](#adopt-onedrive) provides helpful resources for OneDrive adoption.
 
-2.  **Install and configure.** Sync clients are available for the Windows and macOS operating systems that provide a seamless experience for users interacting with their files. Most small businesses start by installing the sync client on their users’ devices, and then consider the OneDrive mobile apps later. In fact, you may already have the OneDrive client on your devices. Devices running the Windows 10 operating system and devices running Windows or macOS with Microsoft Office 2016 or later will have the OneDrive sync client already. For information about how to install and configure the OneDrive sync client and apps, see the section [Install and configure OneDrive](#_Install_and_configure).
+2.  **Install and configure.** Sync clients are available for the Windows and macOS operating systems that provide a seamless experience for users interacting with their files. Most small businesses start by installing the sync client on their users’ devices, and then consider the OneDrive mobile apps later. In fact, you may already have the OneDrive client on your devices. Devices running the Windows 10 operating system and devices running Windows or macOS with Microsoft Office 2016 or later will have the OneDrive sync client already. For information about how to install and configure the OneDrive sync client and apps, see the section [Install and configure OneDrive](#install-and-set-up-onedrive-apps).
 
-3.  **Manage OneDrive.** For many small businesses, managing OneDrive is optional. You could simply install and configure OneDrive and leave it at that. If you want to use advanced features of OneDrive or add device sharing or access restrictions, however, you can easily manage those and other settings in the OneDrive admin center. For more information about managing OneDrive, see the section [Manage OneDrive](#_Manage_OneDrive).
+3.  **Manage OneDrive.** For many small businesses, managing OneDrive is optional. You could simply install and configure OneDrive and leave it at that. If you want to use advanced features of OneDrive or add device sharing or access restrictions, however, you can easily manage those and other settings in the OneDrive admin center. For more information about managing OneDrive, see the section [Manage OneDrive](#manage-onedrive).
 
 ## Key OneDrive features for small businesses
 

OneDrive/deploy-on-windows.md

@@ -29,7 +29,7 @@ You can use System Center Configuration Manager (SCCM) to deploy the new OneDriv
 
  The OneDrive sync client (OneDrive.exe) can be installed on Windows 7 and later. It can also be installed on macOS. For info about deploying the OneDrive sync client on macOS, see [Configure the new OneDrive sync client on macOS](deploy-and-configure-on-macos.md)
 
-The new OneDrive sync client can be used with SharePoint Server 2019, but not earlier versions of SharePoint Server. For more information about the restrictions and limitations of the OneDrive sync client, see [Restrictions and limitations when you sync files and folders using the new OneDrive sync client](http://go.microsoft.com/fwlink/p/?LinkId=717734).
+The new OneDrive sync client can be used with SharePoint Server 2019, but not earlier versions of SharePoint Server. For more information about the restrictions and limitations of the OneDrive sync client, see [Invalid file names and file types in OneDrive, OneDrive for Business, and SharePoint](https://support.office.com/article/64883a5d-228e-48f5-b3d2-eb39e07630fa).
 
 > [!IMPORTANT]
 > If your users are currently using the OneDrive for Business sync client (Groove.exe), and you want to move them to the OneDrive sync client, see [Transition from the previous OneDrive for Business sync client](transition-from-previous-sync-client.md) before proceeding.  
@@ -56,13 +56,16 @@ To set registry keys on computers in your domain, install OneDrive and copy the
 
 
 4. Copy the installer to a folder in the SCCM source content share. 
+
 5. In SCCM, select the **Software Library** workspace. Under **Application Management**, right-click **Applications**, and then select **Import Application**. 
 
 ![](media/deploy-onedrive-enterprise_image6.png)
 
-7. Select the sample package.
-8. Select the **Deployment Types** tab on the bottom of SCCM, right-click the deployment, and edit the properties to update the **Content location**.
-9. Right-click the package, select **Deploy**, and follow the steps in the Deploy Software Wizard.
+6. Select the sample package.
+
+7. Select the **Deployment Types** tab on the bottom of SCCM, right-click the deployment, and edit the properties to update the **Content location**.
+
+8. Right-click the package, select **Deploy**, and follow the steps in the Deploy Software Wizard.
 
 
 If you don't use the sample package, run the following command using System Center Configuration Manager:
@@ -142,9 +145,12 @@ You can use System Center Configuration Manager to deploy apps to mobile devices
 ### Deploy the OneDrive app for iOS
 
 1. In SCCM, on the Home ribbon, select **Create Application**.
+
 2. In the **Type** box, select **App Package for iOS from App Store**.
+
 3. In the **Location** box, enter the app store URL, https://itunes.apple.com/us/app/onedrive/id823766827?mt=12.
- ![](media/deploy-onedrive-enterprise_image4.png)
+
+![](media/deploy-onedrive-enterprise_image4.png)
 
 4. Target the app to users. 
 
@@ -153,19 +159,22 @@ For more info, see [Create iOS applications with System Center Configuration Man
 ### Deploy the OneDrive app for Android
 
 1. In SCCM, on the Home ribbon, select **Create Application**.
+
 2. In the **Type** box, select **App Package for Android on Google Play**.
+
 3. In the **Location** box, enter the app store URL, https://play.google.com/store/apps/details?id=com.microsoft.skydrive&hl=en
 
 ![](media/deploy-onedrive-enterprise_image5.png)
+
 4. Target the app to users.
 
-For more info, see [Create Android applications with System Center Configuration Manager](/sccm/mdm/deploy-use/creating-android-applications/), 
+For more info, see [Create Android applications with System Center Configuration Manager](/sccm/mdm/deploy-use/creating-android-applications/). 
 
 
 ## See also
 <a name="cad"> </a>
 
-[Restrictions and limitations when you sync files and folders using the new OneDrive sync client](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)
 
 
 

OneDrive/exclude-or-uninstall-previous-sync-client.md

@@ -3,7 +3,6 @@ title: "Changes to OneDrive sync client deployment in Office Click-to-Run"
 ms.author: kaarins
 author: kaarins
 manager: pamgreen
-ms.date: 10/31/2017
 ms.audience: Admin
 ms.topic: article
 ms.service: one-drive

OneDrive/files-on-demand-mac.md

@@ -0,0 +1,60 @@
+---
+title: "Configure Files On-Demand for Mac"
+ms.author: kaarins
+author: kaarins
+manager: pamgreen
+ms.audience: Admin
+ms.topic: article
+ms.service: one-drive
+localization_priority: Normal
+ms.collection: Strat_OD_sync
+search.appverid:
+- ODB160
+- OFF160
+- ODB150
+- MET150
+ms.assetid: 3eff17b9-c709-462f-946c-17719af68aca
+description: "Learn how to configure Files On-Demand for Mac."
+---
+
+# Configure Files On-Demand for Mac
+
+This article describes the preferences and scriptable commands you can use to set up OneDrive Files On-Demand for Mac. For more info about using Files On-Demand on a Mac, see [Try Files On-Demand for Mac](https://support.office.com/article/529f6d53-e572-4922-a585-e7a318c135f0).
+
+> [!NOTE]
+> The following configurations are subject to change. 
+
+## Preferences  
+
+PList Location 
+- ~/Library/Preferences/com.microsoft.OneDrive.plist
+
+Domain
+- com.microsoft.OneDrive
+
+|**Setting**|**Description**|**Parameters**|**Example Plist Entry**|
+|:-----|:-----|:-----|:-----|
+|FilesOnDemandPolicy  <br/> |This setting determines whether Files On-Demand should be enabled based on the OneDrive controlled rollout or the FilesOnDemandEnabled setting.  <br/> |FilesOnDemandPolicy (Bool): When set to true, Files On-Demand will be enabled or disabled based on FilesOnDemandEnabled.  <br/> |\<key\>FilesOnDemandPolicy\</key\>  <br/> \<(Bool)/\>  <br/> |
+|FilesOnDemandEnabled  <br/> |This setting determines whether Files On-Demand should be enabled.    <br/> |FilesOnDemandEnabled (Bool): When set to true, Files On-Demand will be enabled or disabled.  <br/> |\<key\>FilesOnDemandEnabled\</key\>  <br/> \<(Bool)/\>  <br/> |
+|IsHydrationToastAllowed  <br/> |This setting determines if a toast should appear when an application causes file contents to be downloaded.   <br/> |IsHydrationToastAllowed (Bool): When set to false, toasts will not appear when applications trigger the download of file contents.  <br/> |\<key\>IsHydrationToastAllowed\</key\>  <br/> \<(Bool)/\>  <br/> |
+|HydrationDisallowedApps  <br/> |Applications will not be allowed to trigger the download of cloud-only files. You can use this setting to lock down applications that don't work correctly with your deployment of Files On-Demand.   <br/> |HydrationDisallowedApps (String): Json in the following format <br/>'[{"ApplicationId":"appId","MaxBundleVersion":"1.1","MaxBuildVersion":"1.0"}]'<br/> AppID can be either the BSD process name or the bundle display name. <br/> MaxBuildVersion denotes the maximum build version of the application that will be blocked <br/> MaxBundleVersion denotes the maximum bundle version of the application that will be blocked  <br/> |\<key\>HydrationDisallowedApps \</key\>  <br/> \<string> [{"ApplicationId":"appId","MaxBundleVersion":"1.1","MaxBuildVersion":"1.0"}, {"ApplicationId":"appId2","MaxBundleVersion":"3.2","MaxBuildVersion":"2.0"},]] 
+</string>   <br/> |
+
+## Scriptable commands
+
+To query and set the file and folder status, use:
+
+Query file status 
+
+/Applications/OneDrive.app/Contents/MacOS/OneDrive /getpin <path> 
+
+Set file status  
+
+/Applications/OneDrive.app/Contents/MacOS/OneDrive /pin <path> 
+/Applications/OneDrive.app/Contents/MacOS/OneDrive /unpin <path> 
+/Applications/OneDrive.app/Contents/MacOS/OneDrive /clearpin <path> 
+
+(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.
+

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. 
 

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 ![The app launcher icon in Office 365](media/e5aee650-c566-4100-aaad-4cc2355d909f.png) 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 ![The app launcher icon in Office 365](media/e5aee650-c566-4100-aaad-4cc2355d909f.png) 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**.
 

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
 <a name="defaultlink"> </a>

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)
 

OneDrive/onedrive.md

@@ -168,7 +168,7 @@ Help your users store, sync, and share work files in the cloud with OneDrive.
 <p>The OneDrive admin center helps you quickly and easily manage your organization's OneDrive for Business settings in one place.</p>
 <p>To access the OneDrive admin center:</p>
 
-- 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**.

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