From 925360614525f2a200f1027040ace06301c527bd Mon Sep 17 00:00:00 2001 From: LizRoss Date: Thu, 13 Oct 2016 07:20:26 -0700 Subject: [PATCH 01/36] Updated the icon overlay section to reflect new behavior --- windows/keep-secure/create-wip-policy-using-intune.md | 6 +++--- windows/keep-secure/create-wip-policy-using-sccm.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/keep-secure/create-wip-policy-using-intune.md b/windows/keep-secure/create-wip-policy-using-intune.md index ed6a4793e9..697b91a142 100644 --- a/windows/keep-secure/create-wip-policy-using-intune.md +++ b/windows/keep-secure/create-wip-policy-using-intune.md @@ -457,11 +457,11 @@ After you've decided where your protected apps can access enterprise data on you - **No, or not configured (recommended).** Stops Windows Search from searching and indexing encrypted corporate data and Store apps. - - **Show the Windows Information Protection icon overlay.** Determines whether the Windows Information Protection icon overlay appears on corporate files or in the **Start** menu, on top of the tiles for your unenlightened protected apps. The options are: + - **Show the Windows Information Protection icon overlay.** Determines whether the Windows Information Protection icon overlay appears on corporate files in the Save As and File Explore views. The options are: - - **Yes (recommended).** Allows the Windows Information Protection icon overlay to appear for files or on top of the tiles for your unenlightened protected apps in the **Start** menu. + - **Yes (recommended).** Allows the Windows Information Protection icon overlay to appear on corporate files in the Save As and File Explore views. - - **No, or not configured.** Stops the Windows Information Protection icon overlay from appearing for files or on top of the tiles for your unenlightened protected apps in the **Start** menu. + - **No, or not configured.** Stops the Windows Information Protection icon overlay from appearing on corporate files in the Save As and File Explore views. 2. Click **Save Policy**. diff --git a/windows/keep-secure/create-wip-policy-using-sccm.md b/windows/keep-secure/create-wip-policy-using-sccm.md index 9c13f0506b..df5fe1770c 100644 --- a/windows/keep-secure/create-wip-policy-using-sccm.md +++ b/windows/keep-secure/create-wip-policy-using-sccm.md @@ -443,7 +443,7 @@ There are no default locations included with WIP, you must add each of your netw - **Enterprise IP Ranges list is authoritative (do not auto-detect).** Click this box if you want Windows to treat the IP ranges you specified in the network boundary definition as the complete list of IP ranges available on your network. If you clear this box, Windows will search for additional IP ranges on any domain-joined devices connected to your network. - - **Show the Windows Information Protection icon overlay on your allowed apps that are WIP-unaware in the Windows Start menu and on corporate file icons in the File Explorer.** Click this box if you want the Windows Information Protection icon overlay to appear on corporate files or in the Start menu, on top the tiles for your unenlightened protected apps. + - **Show the Windows Information Protection icon overlay on your allowed apps that are WIP-unaware on corporate file icons in the File Explorer.** Click this box if you want the Windows Information Protection icon overlay to appear on corporate files in the Save As and File Explore views. 5. In the required **Upload a Data Recovery Agent (DRA) certificate to allow recovery of encrypted data** box, click **Browse** to add a data recovery certificate for your policy. From dee90bfb13e61ca209f60c0e7fec475bc56c8885 Mon Sep 17 00:00:00 2001 From: Tommy N Date: Thu, 13 Oct 2016 16:21:11 -0700 Subject: [PATCH 02/36] Update uev-upgrade-uev-from-previous-releases.md --- .../manage/uev-upgrade-uev-from-previous-releases.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/windows/manage/uev-upgrade-uev-from-previous-releases.md b/windows/manage/uev-upgrade-uev-from-previous-releases.md index aa12c04977..2487df2e88 100644 --- a/windows/manage/uev-upgrade-uev-from-previous-releases.md +++ b/windows/manage/uev-upgrade-uev-from-previous-releases.md @@ -19,9 +19,11 @@ If you’re already using UE-V 2.x and you’re planning to upgrade user devices 2. Verify that UE-V settings were migrated correctly. -3. Enable the UE-V service on user devices. +3. Set the template storage path to your current template store. -4. Install the UE-V template generator if you want to synchronize application settings for custom applications. +4. Enable the UE-V service on user devices. + +5. Install the UE-V template generator if you want to synchronize application settings for custom applications. > **Important**  You can upgrade your existing UE-V installation to Windows 10, version 1607 from UE-V versions 2.1 or 2.0 only. If you are using a previous version of UE-V, you’ll need to upgrade from that version to UE-V 2.x before you upgrade to Windows 10, version 1607.. @@ -49,7 +51,11 @@ After upgrading a user device to Windows 10, version 1607, it’s important to v 2. Navigate to **HKEY_LOCAL_MACHINE\Software\Microsoft\UEV\Agent\Configuration.** -3. Verify that the settings storage path and the settings template catalog path are pointing to the same locations as before you upgraded the device to Windows 10. +3. Verify that the settings storage path and the settings template catalog path are pointing to the same locations as before you upgraded the device to Windows 10. + +## Set the template storage path to your current template store + +Template Settings Storage Path will not automatically migrate. Run Set-UEVConfiguration in PowerShell or use the settings storage path Group Policy to configure and point to your current settings storage folder. ## Enable the UE-V service on user devices From 257a10a7d55696bacfe72a5ec8ca6cae364a5d73 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Fri, 14 Oct 2016 11:25:40 -0700 Subject: [PATCH 03/36] nav and toc updates --- devices/surface-hub/TOC.md | 6 +++--- .../local-management-surface-hub-settings.md | 8 +------- devices/surface-hub/manage-surface-hub-settings.md | 3 ++- devices/surface-hub/manage-surface-hub.md | 14 +++++++++++--- .../surface-hub/remote-surface-hub-management.md | 2 +- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/devices/surface-hub/TOC.md b/devices/surface-hub/TOC.md index 88ffcd0f3e..bd9ea9ca66 100644 --- a/devices/surface-hub/TOC.md +++ b/devices/surface-hub/TOC.md @@ -17,12 +17,12 @@ #### [Setup worksheet](setup-worksheet-surface-hub.md) #### [First-run program](first-run-program-surface-hub.md) ### [Manage Microsoft Surface Hub](manage-surface-hub.md) -#### [Local management for Surface Hub settings](local-management-surface-hub-settings.md) -#### [Remote Surface Hub management]() +#### [Remote Surface Hub management](remote-surface-hub-management.md) ##### [Manage settings with an MDM provider](manage-settings-with-mdm-for-surface-hub.md) ##### [Monitor your Surface Hub](monitor-surface-hub.md) ##### [Windows updates](manage-windows-updates-for-surface-hub.md) -#### [Manage Surface Hub settings]() +#### [Manage Surface Hub settings](manage-surface-hub-settings.md) +##### [Local management for Surface Hub settings](local-management-surface-hub-settings.md) ##### [Accessibility](accessibility-surface-hub.md) ##### [Change the Surface Hub device account](change-surface-hub-device-account.md) ##### [Device reset](device-reset-surface-hub.md) diff --git a/devices/surface-hub/local-management-surface-hub-settings.md b/devices/surface-hub/local-management-surface-hub-settings.md index a7d25f970b..dea2a514bd 100644 --- a/devices/surface-hub/local-management-surface-hub-settings.md +++ b/devices/surface-hub/local-management-surface-hub-settings.md @@ -12,13 +12,7 @@ localizationpriority: medium # Local management for Surface Hub settings -After initial setup of Microsoft Surface Hub, the device’s settings and configuration can be modified or changed in a couple ways: - -- **Local management** - Every Surface Hub can be configured locally using the **Settings** app on the device. To prevent unauthorized users from changing settings, the Settings app requires admin credentials to open the app. -- **Remote management** - Surface Hub allow IT admins to manage settings and policies using a mobile device management (MDM) provider, such as Microsoft Intune, System Center Configuration Manager, and other third-party providers. Additionally, admins can monitor Surface Hubs using Microsoft Operations Management Suite (OMS). For more information, see [Manage settings with an MDM provider](manage-settings-with-mdm-for-surface-hub.md), and [Monitor your Microsoft Surface Hub](monitor-surface-hub.md). - -> [!NOTE] -> These management methods are not mutually exclusive. Devices can be both locally and remotely managed if you choose. However, MDM policies and settings will overwrite any local changes when the Surface Hub syncs with the management server. +After initial setup of Microsoft Surface Hub, the device’s settings can be locally managed through **Settings**. ## Surface Hub settings diff --git a/devices/surface-hub/manage-surface-hub-settings.md b/devices/surface-hub/manage-surface-hub-settings.md index 910128f5e3..bfb318be7b 100644 --- a/devices/surface-hub/manage-surface-hub-settings.md +++ b/devices/surface-hub/manage-surface-hub-settings.md @@ -16,8 +16,9 @@ localizationpriority: medium |Topic | Description| | ------ | --------------- | +| [Local management for Surface Hub settings](local-management-surface-hub-settings.md) | Learn about Surface Hub settings. | | [Accessibility](https://technet.microsoft.com/itpro/surface-hub/accessibility-surface-hub) | Accessibility settings for the Surface Hub can be changed by using the Settings app. You'll find them under Ease of Access. Your Surface Hub has the same accessibility options as Windows 10.| | [Change the Surface Hub device account](https://technet.microsoft.com/itpro/surface-hub/change-surface-hub-device-account) | You can change the device account in Settings to either add an account if one was not already provisioned, or to change any properties of an account that was already provisioned.| | [Device reset]( https://technet.microsoft.com/en-us/itpro/surface-hub/device-reset-suface-hub) | You may need to reset your Surface Hub.| -| [Windows updates](https://technet.microsoft.com/itpro/surface-hub/manage-windows-updates-for-surface-hub) | You can manage Windows updates on your Surface Hub by setting the maintenance window, deferring updates, or using WSUS.| +| [Use fully qualified domain name with Surface Hub]() | Options to configure domain name with Surface Hub. | | [Wireless network management](https://technet.microsoft.com/itpro/surface-hub/wireless-network-management-for-surface-hub) | Surface Hub offers two options for network connectivity to your corporate network and Internet: wireless, and wired. While both provide network access, we recommend you use a wired connection. | diff --git a/devices/surface-hub/manage-surface-hub.md b/devices/surface-hub/manage-surface-hub.md index d81ff17f67..b464c430f2 100644 --- a/devices/surface-hub/manage-surface-hub.md +++ b/devices/surface-hub/manage-surface-hub.md @@ -13,17 +13,25 @@ localizationpriority: medium # Manage Microsoft Surface Hub -Learn about managing and updating Surface Hub. +After initial setup of Microsoft Surface Hub, the device’s settings and configuration can be modified or changed in a couple ways: + +- **Local management** - Every Surface Hub can be configured locally using the **Settings** app on the device. To prevent unauthorized users from changing settings, the Settings app requires admin credentials to open the app. For more information, see [Local management for Surface Hub settings](local-management-surface-hub-settings.md). +- **Remote management** - Surface Hub allow IT admins to manage settings and policies using a mobile device management (MDM) provider, such as Microsoft Intune, System Center Configuration Manager, and other third-party providers. Additionally, admins can monitor Surface Hubs using Microsoft Operations Management Suite (OMS). For more information, see [Manage settings with an MDM provider](manage-settings-with-mdm-for-surface-hub.md), and [Monitor your Microsoft Surface Hub](monitor-surface-hub.md). + +> [!NOTE] +> These management methods are not mutually exclusive. Devices can be both locally and remotely managed if you choose. However, MDM policies and settings will overwrite any local changes when the Surface Hub syncs with the management server. ## In this section +Learn about managing and updating Surface Hub. + | Topic | Description | | ----- | ----------- | -| [Local management for Surface Hub settings](local-management-surface-hub-settings.md) | Settings specific to Surface Hub. | | [Remote Surface Hub management](remote-surface-hub-management.md) |Topics related to managing your Surface Hub remotely. Include install apps, managing settings with MDM and monitoring with Operations Management Suite. | | [Manage Surface Hub settings](manage-surface-hub-settings.md) |Topics related to managing Surface Hub settings: accessibility, device account, device reset, fully qualified domain name, Windows Update settings, and wireless network | -| [Save your BitLocker key](https://technet.microsoft.com/itpro/surface-hub/save-bitlocker-key-surface-hub) | Every Surface Hub is automatically set up with BitLocker drive encryption software. Microsoft strongly recommends that you make sure you back up your BitLocker recovery keys.| +| [Install apps on your Surface Hub]( https://technet.microsoft.com/itpro/surface-hub/install-apps-on-surface-hub) | Admins can install apps can from either the Windows Store or the Windows Store for Business.| | [End a meeting with I’m done](https://technet.microsoft.com/itpro/surface-hub/i-am-done-finishing-your-surface-hub-meeting) | At the end of a meeting, users can tap I'm Done to clean up any sensitive data and prepare the device for the next meeting.| +| [Save your BitLocker key](https://technet.microsoft.com/itpro/surface-hub/save-bitlocker-key-surface-hub) | Every Surface Hub is automatically set up with BitLocker drive encryption software. Microsoft strongly recommends that you make sure you back up your BitLocker recovery keys.| | [Connect other devices and display with Surface Hub](https://technet.microsoft.com/itpro/surface-hub/connect-and-display-with-surface-hub) | You can connect other device to your Surface Hub to display content.| | [Using a room control system]( https://technet.microsoft.com/itpro/surface-hub/use-room-control-system-with-surface-hub) | Room control systems can be used with your Microsoft Surface Hub.| diff --git a/devices/surface-hub/remote-surface-hub-management.md b/devices/surface-hub/remote-surface-hub-management.md index b877249137..9c15e50b34 100644 --- a/devices/surface-hub/remote-surface-hub-management.md +++ b/devices/surface-hub/remote-surface-hub-management.md @@ -16,6 +16,6 @@ localizationpriority: medium |Topic | Description| | ------ | --------------- | -| [Install apps on your Surface Hub]( https://technet.microsoft.com/itpro/surface-hub/install-apps-on-surface-hub) | Admins can install apps can from either the Windows Store or the Windows Store for Business.| +| [Windows updates](https://technet.microsoft.com/itpro/surface-hub/manage-windows-updates-for-surface-hub) | You can manage Windows updates on your Surface Hub by setting the maintenance window, deferring updates, or using WSUS.| | [Manage settings with an MDM provider]( https://technet.microsoft.com/itpro/surface-hub/manage-settings-with-mdm-for-surface-hub) | Surface Hub provides an enterprise management solution to help IT administrators manage policies and business applications on these devices using a mobile device management (MDM) solution.| | [Monitor your Surface Hub]( https://technet.microsoft.com/itpro/surface-hub/monitor-surface-hub) | Monitoring for Surface Hub devices is enabled through Microsoft Operations Management Suite.| From e36edce43c2d7b3027ce08709e7837380c50bd03 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Fri, 14 Oct 2016 11:45:18 -0700 Subject: [PATCH 04/36] Updated the EDU portal --- education/windows/index.md | 44 +++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/education/windows/index.md b/education/windows/index.md index f8d54749bf..72e13491b5 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -1,6 +1,7 @@ --- title: Windows 10 for Education (Windows 10) -description: Learn about using Windows 10 in schools. +description: Learn how to use Windows 10 in schools. +keywords: Windows 10, education ms.prod: w10 ms.mktglfcycl: deploy ms.sitesec: library @@ -9,24 +10,37 @@ author: jdeckerMS --- # Windows 10 for Education -[Windows 10 Education and Windows 10 Pro Education](https://www.microsoft.com/en-us/education/products/windows/default.aspx) empowers staff, administrators, teachers and students to do great things. + -[Find out how to get Windows 10 Education or Windows 10 Pro Education for your school](https://www.microsoft.com/en-us/education/buy-license/overview-of-how-to-buy/default.aspx?tabshow=schools) +[Windows 10 Education and Windows 10 Pro Education](https://www.microsoft.com/en-us/education/products/windows/default.aspx) empowers staff, administrators, teachers, and students to do great things. -[Learn more about what features and functionality are supported in each Windows edition](https://www.microsoft.com/en-us/WindowsForBusiness/Compare) +## Learn -## In this section +
+

+[Windows 10 editions for education customers](windows-editions-for-education-customers.md)
Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: Windows 10 Pro Education and Windows 10 Education. These editions provide education-specific default settings for the evolving landscape in K-12 education IT environments.

+[Get Windows 10 Education or Windows 10 Pro Education](https://www.microsoft.com/en-us/education/buy-license/overview-of-how-to-buy/default.aspx?tabshow=schools)
When you've made your decision, find out how to buy Windows for your school.

+

[Compare each Windows edition](https://www.microsoft.com/en-us/WindowsForBusiness/Compare)
Find out more about the features and functionality we support in each edition of Windows.

+
-|Topic |Description | -|------|------------| -| [Windows 10 editions for education customers](windows-editions-for-education-customers.md) | Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: Windows 10 Pro Education and Windows 10 Education. | -| [Provisioning options for Windows 10](set-up-windows-10.md) | Learn about your options for setting up Windows 10. | -| [Get Minecraft Education Edition](get-minecraft-for-education.md) | Learn how to get early access to **Minecraft Education Edition**. | -| [Take tests in Windows 10](take-tests-in-windows-10.md) | Learn how to configure and use the **Take a Test** app in Windows 10 | -| [Deployment recommendations for school IT administrators](edu-deployment-recommendations.md) | Learn how to customize the OS privacy settings, Skype, and Xbox for Windows-based devices used in schools so that you can choose what information is shared with Microsoft. | -| [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md) | Learn how to deploy Windows 10 in a school. | -| [Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md) |Learn how to deploy Windows 10 in a school district.| -| [Chromebook migration guide](chromebook-migration-guide.md) | Learn how to migrate a Google Chromebook-based learning environment to a Windows 10-based learning environment. | +## Plan + +
+

+[Provisioning options for Windows 10](set-up-windows-10.md)
Depending on your school's device management needs, Windows offers a variety of options that you can use to set up Windows 10 on your devices.

+[Get Minecraft Education Edition](get-minecraft-for-education.md)
Minecraft Education Edition is built for learning. Learn how to get early access and add it to your Microsoft Store for Business for distribution.

+

[Take tests in Windows 10](take-tests-in-windows-10.md)
Take a Test is a new app that lets you create the right environment for taking tests. Learn how to use and get it set up.

+

[Chromebook migration guide](chromebook-migration-guide.md)
Find out how you can migrate a Chromebook-based learning environment to a Windows 10-based learning environment.

+
+ + ## Deploy + +
+

+ [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
Get step-by-step guidance to help you deploy Windows 10 in a school environment.

+ [Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
Get step-by-step guidance on how to deploy Windows 10 to PCs and devices across a school district.

+

[Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)
Learn how to customize the OS privacy settings, Skype, and Xbox for Windows-based devices used in schools so that you can choose what information is shared with Microsoft.

+
## Related topics From 1d89b410a47a879e58137196b27398f2c35b9ea1 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Fri, 14 Oct 2016 11:45:36 -0700 Subject: [PATCH 05/36] nav fixes --- devices/surface-hub/manage-surface-hub-settings.md | 10 +++++----- devices/surface-hub/remote-surface-hub-management.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devices/surface-hub/manage-surface-hub-settings.md b/devices/surface-hub/manage-surface-hub-settings.md index bfb318be7b..5413d28a30 100644 --- a/devices/surface-hub/manage-surface-hub-settings.md +++ b/devices/surface-hub/manage-surface-hub-settings.md @@ -17,8 +17,8 @@ localizationpriority: medium |Topic | Description| | ------ | --------------- | | [Local management for Surface Hub settings](local-management-surface-hub-settings.md) | Learn about Surface Hub settings. | -| [Accessibility](https://technet.microsoft.com/itpro/surface-hub/accessibility-surface-hub) | Accessibility settings for the Surface Hub can be changed by using the Settings app. You'll find them under Ease of Access. Your Surface Hub has the same accessibility options as Windows 10.| -| [Change the Surface Hub device account](https://technet.microsoft.com/itpro/surface-hub/change-surface-hub-device-account) | You can change the device account in Settings to either add an account if one was not already provisioned, or to change any properties of an account that was already provisioned.| -| [Device reset]( https://technet.microsoft.com/en-us/itpro/surface-hub/device-reset-suface-hub) | You may need to reset your Surface Hub.| -| [Use fully qualified domain name with Surface Hub]() | Options to configure domain name with Surface Hub. | -| [Wireless network management](https://technet.microsoft.com/itpro/surface-hub/wireless-network-management-for-surface-hub) | Surface Hub offers two options for network connectivity to your corporate network and Internet: wireless, and wired. While both provide network access, we recommend you use a wired connection. | +| [Accessibility](accessibility-surface-hub.md) | Accessibility settings for the Surface Hub can be changed by using the Settings app. You'll find them under Ease of Access. Your Surface Hub has the same accessibility options as Windows 10.| +| [Change the Surface Hub device account](change-surface-hub-device-account.md) | You can change the device account in Settings to either add an account if one was not already provisioned, or to change any properties of an account that was already provisioned.| +| [Device reset](device-reset-surface-hub.md) | You may need to reset your Surface Hub.| +| [Use fully qualified domain name with Surface Hub](use-fully-qualified-domain-name-surface-hub.md) | Options to configure domain name with Surface Hub. | +| [Wireless network management](wireless-network-management-for-surface-hub.md) | Surface Hub offers two options for network connectivity to your corporate network and Internet: wireless, and wired. While both provide network access, we recommend you use a wired connection. | diff --git a/devices/surface-hub/remote-surface-hub-management.md b/devices/surface-hub/remote-surface-hub-management.md index 9c15e50b34..41588251fe 100644 --- a/devices/surface-hub/remote-surface-hub-management.md +++ b/devices/surface-hub/remote-surface-hub-management.md @@ -16,6 +16,6 @@ localizationpriority: medium |Topic | Description| | ------ | --------------- | -| [Windows updates](https://technet.microsoft.com/itpro/surface-hub/manage-windows-updates-for-surface-hub) | You can manage Windows updates on your Surface Hub by setting the maintenance window, deferring updates, or using WSUS.| | [Manage settings with an MDM provider]( https://technet.microsoft.com/itpro/surface-hub/manage-settings-with-mdm-for-surface-hub) | Surface Hub provides an enterprise management solution to help IT administrators manage policies and business applications on these devices using a mobile device management (MDM) solution.| | [Monitor your Surface Hub]( https://technet.microsoft.com/itpro/surface-hub/monitor-surface-hub) | Monitoring for Surface Hub devices is enabled through Microsoft Operations Management Suite.| +| [Windows updates](https://technet.microsoft.com/itpro/surface-hub/manage-windows-updates-for-surface-hub) | You can manage Windows updates on your Surface Hub by setting the maintenance window, deferring updates, or using WSUS.| From abfd447f1587a1d3450ef675838b3cd7d2274df3 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 14 Oct 2016 12:49:41 -0700 Subject: [PATCH 06/36] added note near top --- windows/deploy/resolve-windows-10-upgrade-errors.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/windows/deploy/resolve-windows-10-upgrade-errors.md b/windows/deploy/resolve-windows-10-upgrade-errors.md index 116daa7867..69dbde5aba 100644 --- a/windows/deploy/resolve-windows-10-upgrade-errors.md +++ b/windows/deploy/resolve-windows-10-upgrade-errors.md @@ -18,6 +18,8 @@ localizationpriority: high This topic provides a brief introduction to Windows 10 installation processes, and provides resolution procedures that IT administrators can use to resolve issues with Windows 10 upgrade. +If you are not an IT administrator, you can try the [quick fixes](#quick-fixes) listed in this topic. + ## In this topic The following sections and procedures are provided in this guide: @@ -63,6 +65,7 @@ WIM = Windows image (Microsoft) The following steps can resolve many Windows upgrade problems.
    +
  1. Remove nonessential external hardware, such as docks and USB devices.
  2. Check all hard drives for errors and attempt repairs. To automatically repair hard drives, open an elevated command prompt, switch to the drive you wish to repair, and type the following command. You will be required to reboot the computer if the hard drive being repaired is also the system drive.
    • chkdsk /F
      • @@ -81,14 +84,12 @@ The following steps can resolve many Windows upgrade problems.
    • Verify compatibility information and re-install antivirus applications after the upgrade.
  3. Uninstall all nonessential software.
    4. -
  4. Remove nonessential external hardware, such as docks and USB devices.
  5. Update firmware and drivers.
  6. Ensure that "Download and install updates (recommended)" is accepted at the start of the upgrade process.
  7. Verify at least 16 GB of free space is available to upgrade a 32-bit OS, or 20 GB for a 64-bit OS.
- ## Upgrade error codes If the upgrade process is not successful, Windows Setup will return two codes: From 1272d0c0f81f3102ed72ded6dc5b31eac32aa066 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Fri, 14 Oct 2016 13:30:22 -0700 Subject: [PATCH 07/36] Updated the EDU portal and added icons --- education/windows/index.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/education/windows/index.md b/education/windows/index.md index 72e13491b5..8f77973965 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -14,16 +14,16 @@ author: jdeckerMS [Windows 10 Education and Windows 10 Pro Education](https://www.microsoft.com/en-us/education/products/windows/default.aspx) empowers staff, administrators, teachers, and students to do great things. -## Learn +## ![Learn more about Windows](images/lightbulb.png) Learn

-[Windows 10 editions for education customers](windows-editions-for-education-customers.md)
Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: Windows 10 Pro Education and Windows 10 Education. These editions provide education-specific default settings for the evolving landscape in K-12 education IT environments.

+[Windows 10 editions for education customers](windows-editions-for-education-customers.md)
Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: Windows 10 Pro Education and Windows 10 Education. These editions provide education-specific default settings for the evolving landscape in K-12 education IT environments.

+

[Compare each Windows edition](https://www.microsoft.com/en-us/WindowsForBusiness/Compare)
Find out more about the features and functionality we support in each edition of Windows.

[Get Windows 10 Education or Windows 10 Pro Education](https://www.microsoft.com/en-us/education/buy-license/overview-of-how-to-buy/default.aspx?tabshow=schools)
When you've made your decision, find out how to buy Windows for your school.

-

[Compare each Windows edition](https://www.microsoft.com/en-us/WindowsForBusiness/Compare)
Find out more about the features and functionality we support in each edition of Windows.

-## Plan +## ![Plan for Windows 10 in your school](images/list.png) Plan

@@ -33,14 +33,14 @@ author: jdeckerMS

[Chromebook migration guide](chromebook-migration-guide.md)
Find out how you can migrate a Chromebook-based learning environment to a Windows 10-based learning environment.

- ## Deploy + ## ![Deploy Windows 10 for education](images/PCicon.png) Deploy
-

+

[Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)
Learn how to customize the OS privacy settings, Skype, and Xbox for Windows-based devices used in schools so that you can choose what information is shared with Microsoft.

+

[Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
Get step-by-step guidance to help you deploy Windows 10 in a school environment.

[Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
Get step-by-step guidance on how to deploy Windows 10 to PCs and devices across a school district.

-

[Deployment recommendations for school IT administrators](edu-deployment-recommendations.md)
Learn how to customize the OS privacy settings, Skype, and Xbox for Windows-based devices used in schools so that you can choose what information is shared with Microsoft.

-
+
## Related topics From ef44f5588c2ba3ef794b9c805021d09160448cae Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Fri, 14 Oct 2016 13:30:51 -0700 Subject: [PATCH 08/36] Updated the EDU portal and added icons --- education/windows/images/PCicon.png | Bin 0 -> 772 bytes education/windows/images/lightbulb.png | Bin 0 -> 796 bytes education/windows/images/list.png | Bin 0 -> 391 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 education/windows/images/PCicon.png create mode 100644 education/windows/images/lightbulb.png create mode 100644 education/windows/images/list.png diff --git a/education/windows/images/PCicon.png b/education/windows/images/PCicon.png new file mode 100644 index 0000000000000000000000000000000000000000..c97c137b83d2e0272cd1f3cf7f155a9b6fab885d GIT binary patch literal 772 zcmV+f1N;1mP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0+~rfK~!i%?U_Am zYC#Z&M`I#_poO4a3R{IBLTbBM+XzNu0|5&$T3YIFuu`!T5ws933@SvD zs5vutb8fCAx!FB>vV?tL*quE)8(wBVMq=4%z%Rne+FyebBs)rw>?lF9qXfy05+plH zkn9Lm+jn<&;B-2f_c`nJ8X}PhoS&bw5feZ`ykOXOtyC(pD02|ra#vSZFc=J=)9FCB z+x^FSy&hDnRhnnF+o?4TCX5RVOC%D^+wHd7E$i)e&(F`)YNBY~{rx@pW+9xR&1OTb z+wBIc)e07ih3xe76rP@*^zUY4_?F9NvyjPT;QIQSES*ln+1VLrSz|LyhGmKi42#F( z%=?(pXhicGjRqSrhoihh9*;-As`2u8za_t8xNWf&LFgUAKc;0!zsdGFIXS`1LpU6! zw}@x^p_qQZ53ALR*5C#O@q%GrZ8`iN3Wb=*PcoULHAFaC>4P_&D36bitjEvM1pO38 z5hQw`4}oDp+O-UoN(E}Q8dtkGWY@4DzuynRU=RX<0GZe81)I&L3&MAZ#}GqxAj=dN81}y{ zcL)=~aHUWz7GXRdQ&!%4T8YEF!y+sQO)EO}{(I9hsQ1g|@~1Ic z&8PR5%O%Y-iqMwx`FwQvzdF3QEwR8X6bcZHMyUeFI0TDV{QmOtLjG(vgW+%p4u^w$ zBdGte%8n8wJ4%r3C_%EL1j&vPBs)rw>?lEU1MmvKc3{hn0@C*Y0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0f>S3xm~AStv62*Fm-LK_h*Ez(G|OJgBOz&am7#l}V<1i?Z?AwfIAO0=*_qY_g1 z2_zu+2EIHu!zhWtCnmcGhujaA*_qot=8yX_a+<9KJ0rAY&jwYH(oqE|9aWIhQ3WX- zRgltA1)akC`#X!pV(jwrl4&%WeG3Ev?B(T!M#%(J+akHSxq<2(+tt<8_V)I6dv|xY z^?JSgxXEPN_WOOBAr@hRX0zEoVGyxet?0>D3WdUc+|$z&Ma3aZki}xbB%hz3DRP|k zdc8FojX1v7>rqq;LIfoe2~4hBE>q+*cE6NJguD%s^7(w^oldn{#ksj$jw1YU3(Dv7 zm{hynrpWJrxekYeJbt(ZMIsTdWfP4?x#l0jeGd(XL+bqvm&=8AKA)rIgiBX*3$l|uPGu1VdrHq7{mnA=`=--^YQV4W1&G` zB;qar3F&~qB!8;Uc6HxqG@^(&gbD&6QM1`h-gi=|6pn$iM-GGw%4V~eaJSo~$XDQ* z)oLYAJlx0jA@O(|ZKYB{`SJ(xdlkDeRzJaMM>IVBXjV{ z6H+<{Pq5`2K653_XAPUA#*^L8OT<1D^3MD6&#Ox0Ysr^ipNsz;?EW+BZ?=bGSy0DZ zktFrj8=g?+_gzlg?LIuKYJC}-Wz0IZA+~ab{^T!q!N@Z=%U;fGY$}nKs zQqTL77an+5x_u50YiniB>41dt?A96aeyJK7XXGo4MBt7_cK;@)1MK(z@3NY6p)wX2 OcnqGdelF{r5}E)v5~tw+ literal 0 HcmV?d00001 From 6dbe9266b116a4b8f0a767e8a59921e2693b5fc3 Mon Sep 17 00:00:00 2001 From: isaiahng Date: Fri, 14 Oct 2016 13:40:22 -0700 Subject: [PATCH 09/36] Update monitor-surface-hub.md (#250) --- devices/surface-hub/monitor-surface-hub.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devices/surface-hub/monitor-surface-hub.md b/devices/surface-hub/monitor-surface-hub.md index 7e6381d096..9f45d3d355 100644 --- a/devices/surface-hub/monitor-surface-hub.md +++ b/devices/surface-hub/monitor-surface-hub.md @@ -26,8 +26,10 @@ Surface Hub is offered as a Log Analytics solution in OMS, allowing you to colle 1. **Sign in to Operations Management Suite (OMS)**. You can use either a Microsoft Account or a Work or School account to create a workspace. If your company is already using Azure Active Directory (Azure AD), use a Work or School account when you sign in to OMS. Using a Work or School account allows you to use identities from your Azure AD to manage permissions in OMS. 2. **Create a new OMS workspace**. Enter a name for the workspace, select the workspace region, and provide the email address that you want associated with this workspace. Select **Create**. 3. **Link Azure subscription to your workspace**. If your organization already has an Azure subscription, you can link it to your workspace. Note that you may need to request access from your organization’s Azure administrator. + > [!NOTE] > If your organization does not have an Azure subscription, create a new one or select the default OMS Azure subscription from the list. Your workspace opens. + 4. **Add Surface Hub solution**. In the Solutions Gallery, select the **Surface Hub** tile in the gallery and then select **Add** on the solution’s details page. The solution is now visible on your workspace. ## Use the Surface Hub dashboard From 84f34672e85970b40e830645e3c70e986ef43000 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 14 Oct 2016 13:43:59 -0700 Subject: [PATCH 10/36] added note near top --- windows/deploy/resolve-windows-10-upgrade-errors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/resolve-windows-10-upgrade-errors.md b/windows/deploy/resolve-windows-10-upgrade-errors.md index 69dbde5aba..905779fc25 100644 --- a/windows/deploy/resolve-windows-10-upgrade-errors.md +++ b/windows/deploy/resolve-windows-10-upgrade-errors.md @@ -18,7 +18,7 @@ localizationpriority: high This topic provides a brief introduction to Windows 10 installation processes, and provides resolution procedures that IT administrators can use to resolve issues with Windows 10 upgrade. -If you are not an IT administrator, you can try the [quick fixes](#quick-fixes) listed in this topic. +If you are not an IT administrator, you can try the [quick fixes](#quick-fixes) listed in this topic. If the quick fixes do not resolve your issue, see [Get help with Windows 10 upgrade and installation errors](https://support.microsoft.com/en-us/help/10587/windows-10-get-help-with-upgrade-installation-errors) for more information. ## In this topic From b3528c162cf565701e10f5f1e935e75f06f61c4b Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Fri, 14 Oct 2016 13:52:11 -0700 Subject: [PATCH 11/36] Updated the EDU portal and added icons --- education/windows/images/clipboard.png | Bin 0 -> 855 bytes education/windows/images/education.png | Bin 0 -> 868 bytes education/windows/index.md | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 education/windows/images/clipboard.png create mode 100644 education/windows/images/education.png diff --git a/education/windows/images/clipboard.png b/education/windows/images/clipboard.png new file mode 100644 index 0000000000000000000000000000000000000000..bbfa2c9e8dbb6904cfe6a59eaef93822393ff824 GIT binary patch literal 855 zcmV-d1E~CoP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0_;gdK~!i%?U*}D zD?t>;PhKKQnk0gS5G+Nboum#?uv8SSgxCm{DFg|@B#<_#(uR}?DgnQRr4Q0t`2`FK zDABp|Kh7@RAQ#=)%^hTaaM*dA9rnNH%-KgkNaz<4RL5U~FUWL!L8jviG96!#>G*<7 z#~1Wdj*gBf5D2iL?Kybc_KJ;-4ZO*VOeVvIHpaZfGeP}+p9SRec{L)qjWNu5h4%N* z!NCFD-Q7_z7_<#b%8RDQ$49!jxS-wLUG}}ayrjLoJz88`q-ZqCY54yBZrkeWDz)2f z_H_&d>9Dl4#CJUsiSQ97FH}fj+?E%pJO#HghB^3H{?@rzOBZcHD=RA^6bf;>R;%%a zeHZxR9Dp^jmM+>UmrAAR;o*VPtXwWrsZ^pup+HkpQ=CR$fwX*meWhx(%Kqo)=bV00 z5Z&M3D=&vYkPf)3)-u+n|A|>e18w6XG#ZWg&LaX~dU~42UtV6gKMo>@NQT2<*COQV zgB2GxGc&_NU}tA%bbEVi_s0#sILB2GAss%a9N6646rE1TE)eN-TFv|$_!^gTZ*OlD zi^b^q`I+a|*VpOh=7!tZY?cy<1h*}Q!yz3W9`bX_$f95&Q%T5&r0RVDpRerXuc4U46X}WSXiJ+r9#KY$JFh1snu$!nF*mH<(To5lSP92 zu>JjgH7Z0r9v92Y%YRuinG}sigXiII>>gTMTNAQ!son>c$Z?aeKK8t^f}G%%AWw^e zOe?C_>#8>yTo;4~WG17##2s~YVN~|#iAOW+#Yg0LRVK; zw7tDer>Cb}zAa>x;}raCvdYoi+??`o2_?)ixU2Z2)&*<05h3lDQ(2<Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0{KZqK~!i%?U^x1 za#0k=uhkG44$-I~XoOQkv^WIn5EN#s)EeRJ)LsOFxVM%Ljt;ff6g4#^Hq>N6L=*&R zY4>~o!@cj*`0D$-?>)Xt+#ek7x#ygFJ%2A;-$Ng_U_Xcx3{-^d3m`{$ji%%$o@N6(<=;nVsBNH1m*L2y8*x7 z&%52O$f$!o#>U3%eeoG8D4$TVShPPJwzIP%GJ}J)a-W%*8Gd$lCNhJgET~$oQUiN? zdpsJA+6`@QZ;Oh*gIc*R7!2~$(^HXAM_Ev%QlUob^*YUuj*jf+V7t4!6#o;*_0}F9 z9*T@}96u?%zP{3Ue0)q}xm;$kSd49LZ84wE$E@Zl4&Wn(9BNPt&d<+jbOj-7VB`s1 zTwKt6Vq$_vA`$X|)g+&up6)vd7-GmtLZJ|!oSYOh=QutgeB;3S4Ph%QE98Uu`FVDA zb;V9jPFOe`CWDU{a+1~6Rrc`kz^q$NM4aJ@ppTCa@<&HUY3yZTVS(M;+>pWl%=q{? zjqP@uM#qSg8W?%YU0z<&96l_ONbp9ZL9y>Z4Ql1Ox3@QuafY&>QmI6Z$Q!ED>F|w> z4ZFd3JkG6Cp9sup5HaYBiDJ^i;jMxoPK8sT9Ayz9xe&IG`)nx}`++|Dr7DGYZ>yg85rt ucZ?w2F@ki*2+|!RNOz1N-T7gH82bh5=OO}=RwaP|0000

@@ -23,7 +23,7 @@ author: jdeckerMS [Get Windows 10 Education or Windows 10 Pro Education](https://www.microsoft.com/en-us/education/buy-license/overview-of-how-to-buy/default.aspx?tabshow=schools)
When you've made your decision, find out how to buy Windows for your school.

-## ![Plan for Windows 10 in your school](images/list.png) Plan +## ![Plan for Windows 10 in your school](images/clipboard.png) Plan

From bb65c21219e38606aa38a7207c89da962241d5f6 Mon Sep 17 00:00:00 2001 From: isaiahng Date: Fri, 14 Oct 2016 14:01:23 -0700 Subject: [PATCH 12/36] Update install-apps-on-surface-hub.md (#251) --- devices/surface-hub/install-apps-on-surface-hub.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devices/surface-hub/install-apps-on-surface-hub.md b/devices/surface-hub/install-apps-on-surface-hub.md index 5ebf251e4e..2f658f6fd8 100644 --- a/devices/surface-hub/install-apps-on-surface-hub.md +++ b/devices/surface-hub/install-apps-on-surface-hub.md @@ -59,7 +59,7 @@ During app submission, developers need to set **Device family availability** and - **Windows 10 Desktop** (other device families are optional) - **Let Microsoft decide whether to make the app available to any future device families** -> ![Image showing Device family availability page - part of Windows Store app submission process.](images/sh-device-family-availability.png) +![Image showing Device family availability page - part of Windows Store app submission process.](images/sh-device-family-availability.png) For more information, see [Device family availability](https://msdn.microsoft.com/windows/uwp/publish/upload-app-packages#device-family-availability). @@ -68,7 +68,7 @@ For more information, see [Device family availability](https://msdn.microsoft.co 2. Select **Pricing and availability**. 3. Under Organizational licensing, select **Allow disconnected (offline) licensing for organizations**. -> ![Image showing Organizational licensing page - part of Windows Store app submission process.](images/sh-org-licensing.png) +![Image showing Organizational licensing page - part of Windows Store app submission process.](images/sh-org-licensing.png) > [!NOTE] > **Make my app available to organizations with Store-managed (online) licensing and distribution** is selected by default. From 8b9ac86f5869bee46bb5f828cd19c03909b80a54 Mon Sep 17 00:00:00 2001 From: Mattias Fors Date: Mon, 17 Oct 2016 19:46:35 +0200 Subject: [PATCH 13/36] Reference wrong MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wrong reference under title "Set “preferred” cache devices for Delivery Optimization". Refers to DOBackgroundQoS , should be DOMinBackgroundQoS --- windows/manage/waas-delivery-optimization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/manage/waas-delivery-optimization.md b/windows/manage/waas-delivery-optimization.md index ec8c9efdd4..d518eb27de 100644 --- a/windows/manage/waas-delivery-optimization.md +++ b/windows/manage/waas-delivery-optimization.md @@ -225,7 +225,7 @@ To specify which devices are preferred, you can set the **Max Cache Age** config On devices that are not preferred, you can choose to set the following policy to prioritize data coming from local peers instead of the Internet: -- Set **DOBackgroundQoS** with a low value, for example `65536` which is the equivalent of 64 KB/s. +- Set **DOMinBackgroundQoS** with a low value, for example `65536` which is the equivalent of 64 KB/s. ## Learn more From f22d4d35bcc1ce089c62f83ed90110df1b05478f Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Mon, 17 Oct 2016 12:48:35 -0700 Subject: [PATCH 14/36] adding back Windows 10 settings to MDM topic -- commented out until verified --- ...anage-settings-with-mdm-for-surface-hub.md | 87 ++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index 6dfa5ff0ef..da6d15af77 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -52,7 +52,7 @@ You can manually enroll with an MDM using the **Settings** app on your Surface H ## Manage Surface Hub settings with MDM -You can use MDM to manage some [Surface Hub CSP settings](#supported-surface-hub-csp-settings). Depending on the MDM provider that you use, you may set these settings using a built-in user interface, or by deploying custom SyncML. Microsoft Intune and System Center Configuration Manager provide built-in experiences to help create policy templates for Surface Hub. Refer to documentation from your MDM provider to learn how to create and deploy SyncML. +You can use MDM to manage some [Surface Hub CSP settings](#supported-surface-hub-csp-settings). Depending on the MDM provider that you use, you may set these settings using a built-in user interface, or by deploying custom SyncML. Microsoft Intune and System Center Configuration Manager provide built-in experiences to help create policy templates for Surface Hub. Refer to documentation from your MDM provider to learn how to create and deploy SyncML. ### Supported Surface Hub CSP settings @@ -73,6 +73,91 @@ For more information, see [SurfaceHub configuration service provider](https://ms | Friendly name for wireless projection | Properties/FriendlyName | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | | Device account, including password rotation | DeviceAccount/\
See [SurfaceHub CSP](https://msdn.microsoft.com/library/windows/hardware/mt608323.aspx). | No | No | Yes | + + ## Example: Manage Surface Hub settings with Micosoft Intune You can use Microsoft Intune to manage Surface Hub settings. From f834c48cfb098a6429467c4de1ee310ae7158a6b Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Mon, 17 Oct 2016 12:48:44 -0700 Subject: [PATCH 15/36] Update chromebook-migration-guide.md --- education/windows/chromebook-migration-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/education/windows/chromebook-migration-guide.md b/education/windows/chromebook-migration-guide.md index 81002929b2..795ac6c860 100644 --- a/education/windows/chromebook-migration-guide.md +++ b/education/windows/chromebook-migration-guide.md @@ -35,7 +35,7 @@ App migration or replacement is an essential part of your Chromebook migration. Before you can do any analysis or make decisions about which apps to migrate or replace, you need to identify which apps are currently in use on the Chromebook devices. You will create a list of apps that are currently in use (also called an app portfolio). -**Note**   +> [!NOTE] The majority of Chromebook apps are web apps. For these apps you need to first perform Microsoft Edge compatibility testing and then publish the web app URL to the Windows users. For more information, see the [Perform app compatibility testing for web apps](#perform-testing-webapps) section.   From bd40ef28a886e9fcd1f3269cb6a9f6fda1d31a17 Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Mon, 17 Oct 2016 12:53:58 -0700 Subject: [PATCH 16/36] Update chromebook-migration-guide.md --- education/windows/chromebook-migration-guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/education/windows/chromebook-migration-guide.md b/education/windows/chromebook-migration-guide.md index 795ac6c860..099b0efc5b 100644 --- a/education/windows/chromebook-migration-guide.md +++ b/education/windows/chromebook-migration-guide.md @@ -1,4 +1,4 @@ ---- +> --- title: Chromebook migration guide (Windows 10) description: In this guide you will learn how to migrate a Google Chromebook-based learning environment to a Windows 10-based learning environment. ms.assetid: 7A1FA48A-C44A-4F59-B895-86D4D77F8BEA @@ -36,7 +36,7 @@ App migration or replacement is an essential part of your Chromebook migration. Before you can do any analysis or make decisions about which apps to migrate or replace, you need to identify which apps are currently in use on the Chromebook devices. You will create a list of apps that are currently in use (also called an app portfolio). > [!NOTE] -The majority of Chromebook apps are web apps. For these apps you need to first perform Microsoft Edge compatibility testing and then publish the web app URL to the Windows users. For more information, see the [Perform app compatibility testing for web apps](#perform-testing-webapps) section. +> The majority of Chromebook apps are web apps. For these apps you need to first perform Microsoft Edge compatibility testing and then publish the web app URL to the Windows users. For more information, see the [Perform app compatibility testing for web apps](#perform-testing-webapps) section.   From a2c96e6d4b94d3d15bc99e601aab6bc325d1b576 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Mon, 17 Oct 2016 14:02:51 -0700 Subject: [PATCH 17/36] commenting out link --- devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index da6d15af77..0b83006a82 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -52,7 +52,7 @@ You can manually enroll with an MDM using the **Settings** app on your Surface H ## Manage Surface Hub settings with MDM -You can use MDM to manage some [Surface Hub CSP settings](#supported-surface-hub-csp-settings). Depending on the MDM provider that you use, you may set these settings using a built-in user interface, or by deploying custom SyncML. Microsoft Intune and System Center Configuration Manager provide built-in experiences to help create policy templates for Surface Hub. Refer to documentation from your MDM provider to learn how to create and deploy SyncML. +You can use MDM to manage some [Surface Hub CSP settings](#supported-surface-hub-csp-settings). Depending on the MDM provider that you use, you may set these settings using a built-in user interface, or by deploying custom SyncML. Microsoft Intune and System Center Configuration Manager provide built-in experiences to help create policy templates for Surface Hub. Refer to documentation from your MDM provider to learn how to create and deploy SyncML. ### Supported Surface Hub CSP settings From 8d6531d9a47fddd83a90d89770490a81aa21784c Mon Sep 17 00:00:00 2001 From: Justinha Date: Mon, 17 Oct 2016 15:26:52 -0700 Subject: [PATCH 18/36] updated link to cumulative update for IE --- windows/deploy/upgrade-analytics-get-started.md | 2 +- windows/deploy/upgrade-analytics-review-site-discovery.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/deploy/upgrade-analytics-get-started.md b/windows/deploy/upgrade-analytics-get-started.md index 8307a9bfbf..f86fc0f308 100644 --- a/windows/deploy/upgrade-analytics-get-started.md +++ b/windows/deploy/upgrade-analytics-get-started.md @@ -101,7 +101,7 @@ IMPORTANT: Restart user computers after you install the compatibility update KBs | **Site discovery** | **KB** | |----------------------|-----------------------------------------------------------------------------| -| [Review site discovery](upgrade-analytics-review-site-discovery.md) | Site discovery requires the [July 2016 security update for Internet Explorer](https://support.microsoft.com/en-us/kb/3170106) (KB3170106) or later. | +| [Review site discovery](upgrade-analytics-review-site-discovery.md) | Site discovery requires the [Cumulative Security Update for Internet Explorer 11](http://catalog.update.microsoft.com/v7/site/Search.aspx?q=internet%20explorer%2011%20cumulative%20update), starting with the July 2016 update (KB3170106). | ### Automate data collection diff --git a/windows/deploy/upgrade-analytics-review-site-discovery.md b/windows/deploy/upgrade-analytics-review-site-discovery.md index f236d85945..8a1835573e 100644 --- a/windows/deploy/upgrade-analytics-review-site-discovery.md +++ b/windows/deploy/upgrade-analytics-review-site-discovery.md @@ -15,7 +15,7 @@ This section of the Upgrade Analytics workflow provides an inventory of web site Ensure the following prerequisites are met before using site discovery: -1. Install the latest Internet Explorer 11 Cumulative Update. This update provides the capability for site discovery and is available in the [July 2016 cumulative update](https://support.microsoft.com/kb/3170106) and later. +1. Install the latest Internet Explorer 11 Cumulative Security Update. This update provides the capability for site discovery and is available in the [Internet Explorer 11 Cumulative Security Update](http://catalog.update.microsoft.com/v7/site/Search.aspx?q=internet%20explorer%2011%20cumulative%20update), starting with the July 2016 update. 2. Install the update for customer experience and diagnostic telemetery ([KB3080149](https://support.microsoft.com/kb/3080149)). 3. Enable Internet Explorer data collection, which is disabled by default. The best way to enable it is to modify the [Upgrade Analytics deployment script](upgrade-analytics-get-started.md#run-the-upgrade-analytics-deployment-script) to allow Internet Explorer data collection before you run it. From 552ec005c9269551c0f1709acc4c635cccf944bc Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Mon, 17 Oct 2016 15:37:13 -0700 Subject: [PATCH 19/36] removing commented out section --- ...anage-settings-with-mdm-for-surface-hub.md | 84 ------------------- 1 file changed, 84 deletions(-) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index 0b83006a82..6bd7936606 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -73,90 +73,6 @@ For more information, see [SurfaceHub configuration service provider](https://ms | Friendly name for wireless projection | Properties/FriendlyName | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | | Device account, including password rotation | DeviceAccount/\
See [SurfaceHub CSP](https://msdn.microsoft.com/library/windows/hardware/mt608323.aspx). | No | No | Yes | - ## Example: Manage Surface Hub settings with Micosoft Intune From 5c77e4e3952817e1b9b347cada7f555961672074 Mon Sep 17 00:00:00 2001 From: Jan Backstrom Date: Mon, 17 Oct 2016 15:40:27 -0700 Subject: [PATCH 20/36] fix note --- .../replace-a-windows-7-computer-with-a-windows-10-computer.md | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md b/windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md index 3c570b4800..a3e51c36b6 100644 --- a/windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md +++ b/windows/deploy/replace-a-windows-7-computer-with-a-windows-10-computer.md @@ -82,6 +82,7 @@ During a computer replace, these are the high-level steps that occur: 1. Select a task sequence to execute on this computer: Backup Only Task Sequence * Specify where to save your data and settings: Specify a location * Location: \\\\MDT01\\MigData$\\PC0002 + >[!NOTE]   >If you are replacing the computer at a remote site you should create the MigData folder on MDT02 and use that share instead.   From 9d4bdec3d2c536fe14c01a26bda31ceba6e3ba58 Mon Sep 17 00:00:00 2001 From: Jan Backstrom Date: Mon, 17 Oct 2016 16:37:34 -0700 Subject: [PATCH 21/36] fix bulleted lists; notes --- ...e-boot-image-with-configuration-manager.md | 18 +++--- ...f-windows-10-with-configuration-manager.md | 60 +++++++++---------- 2 files changed, 36 insertions(+), 42 deletions(-) diff --git a/windows/deploy/create-a-custom-windows-pe-boot-image-with-configuration-manager.md b/windows/deploy/create-a-custom-windows-pe-boot-image-with-configuration-manager.md index 3d55bb7385..bfb8f98424 100644 --- a/windows/deploy/create-a-custom-windows-pe-boot-image-with-configuration-manager.md +++ b/windows/deploy/create-a-custom-windows-pe-boot-image-with-configuration-manager.md @@ -47,10 +47,8 @@ By using the MDT wizard to create the boot image in Configuration Manager, you g 2. On the **Package Source** page, in the **Package source folder to be created (UNC Path):** text box, type **\\\\CM01\\Sources$\\OSD\\Boot\\Zero Touch WinPE x64** and click **Next**. - **Note**   - The Zero Touch WinPE x64 folder does not yet exist. The folder will be created later by the wizard. - -   + >[!NOTE] + >The Zero Touch WinPE x64 folder does not yet exist. The folder will be created later by the wizard. 3. On the **General Settings** page, assign the name **Zero Touch WinPE x64** and click **Next**. @@ -58,16 +56,14 @@ By using the MDT wizard to create the boot image in Configuration Manager, you g 5. On the **Components** page, in addition to the default selected **Microsoft Data Access Components (MDAC/ADO)** support, select the **Microsoft Diagnostics and Recovery Toolkit (DaRT)** check box. - ![figure 15](images/mdt-06-fig16.png) + ![Add the DaRT component to the Configuration Manager boot image](images/mdt-06-fig16.png "Add the DaRT component to the Configuration Manager boot image") Figure 15. Add the DaRT component to the Configuration Manager boot image. 6. On the **Customization** page, select the **Use a custom background bitmap file** check box, and in the **UNC path:** text box, browse to **\\\\CM01\\Sources$\\OSD\\Branding\\ ContosoBackground.bmp**. Then click **Next** twice. - **Note**   - It will take a few minutes to generate the boot image. - -   + >[!NOTE] + >It will take a few minutes to generate the boot image. 7. Distribute the boot image to the CM01 distribution point by selecting the **Boot images** node, right-clicking the **Zero Touch WinPE x64** boot image, and selecting **Distribute Content**. @@ -75,9 +71,9 @@ By using the MDT wizard to create the boot image in Configuration Manager, you g 9. Using Configuration Manager Trace, review the E:\\Program Files\\Microsoft Configuration Manager\\Logs\\distmgr.log file. Do not continue until you can see that the boot image is distributed. Look for the line that reads STATMSG: ID=2301. You also can view Content Status in the Configuration Manager Console by selecting **the Zero Touch WinPE x86** boot image. - ![figure 16](images/fig16-contentstatus.png) + ![Content status for the Zero Touch WinPE x64 boot image](images/fig16-contentstatus.png "Content status for the Zero Touch WinPE x64 boot image") - Figure 16. Content status for the Zero Touch WinPE x64 boot image. + Figure 16. Content status for the Zero Touch WinPE x64 boot image 10. Using the Configuration Manager Console, right-click the **Zero Touch WinPE x64** boot image and select **Properties**. diff --git a/windows/deploy/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md b/windows/deploy/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md index 4f25bc9987..ea62cd3903 100644 --- a/windows/deploy/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md +++ b/windows/deploy/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md @@ -49,25 +49,25 @@ To configure permissions for the various service accounts needed for operating s 2. Select the Service Accounts OU and create the CM\_JD account using the following settings: - 1. Name: CM\_JD + * Name: CM\_JD - 2. User logon name: CM\_JD + * User logon name: CM\_JD - 3. Password: P@ssw0rd + * Password: P@ssw0rd - 4. User must change password at next logon: Clear + * User must change password at next logon: Clear - 5. User cannot change password: Select + * User cannot change password: Select - 6. Password never expires: Select + * Password never expires: Select 3. Repeat the step, but for the CM\_NAA account. 4. After creating the accounts, assign the following descriptions: - 1. CM\_JD: Configuration Manager Join Domain Account + * CM\_JD: Configuration Manager Join Domain Account - 2. CM\_NAA: Configuration Manager Network Access Account + * CM\_NAA: Configuration Manager Network Access Account ![figure 6](images/mdt-06-fig06.png) @@ -93,39 +93,37 @@ In order for the Configuration Manager Join Domain Account (CM\_JD) to join mach 3. The Set-OUPermissions.ps1 script allows the CM\_JD user account permissions to manage computer accounts in the Contoso / Computers / Workstations OU. The following is a list of the permissions being granted: - 1. Scope: This object and all descendant objects + * Scope: This object and all descendant objects - 2. Create Computer objects + * Create Computer objects - 3. Delete Computer objects + * Delete Computer objects - 4. Scope: Descendant Computer objects + * Scope: Descendant Computer objects - 5. Read All Properties + * Read All Properties - 6. Write All Properties + * Write All Properties - 7. Read Permissions + * Read Permissions - 8. Modify Permissions + * Modify Permissions - 9. Change Password + * Change Password - 10. Reset Password + * Reset Password - 11. Validated write to DNS host name + * Validated write to DNS host name - 12. Validated write to service principal name + * Validated write to service principal name ## Review the Sources folder structure To support the packages you create in this section, the following folder structure should be created on the Configuration Manager primary site server (CM01): -**Note**   -In most production environments, the packages are stored on a Distributed File System (DFS) share or a "normal" server share, but in a lab environment you can store them on the site server. - -  +>[!NOTE]   +>In most production environments, the packages are stored on a Distributed File System (DFS) share or a "normal" server share, but in a lab environment you can store them on the site server. - E:\\Sources @@ -168,9 +166,9 @@ To extend the Configuration Manager console with MDT 2013 Update 2 wizards and t 5. From the Start screen, run Configure ConfigManager Integration with the following settings: - 1. Site Server Name: CM01.contoso.com + * Site Server Name: CM01.contoso.com - 2. Site code: PS1 + * Site code: PS1 ![figure 8](images/mdt-06-fig08.png) @@ -221,15 +219,15 @@ Configuration Manager has many options for starting a deployment, but starting v 3. In the **PXE** tab, select the following settings: - 1. Enable PXE support for clients + * Enable PXE support for clients - 2. Allow this distribution point to respond to incoming PXE requests + * Allow this distribution point to respond to incoming PXE requests - 3. Enable unknown computer support + * Enable unknown computer support - 4. Require a password when computers use PXE + * Require a password when computers use PXE - 5. Password and Confirm password: Passw0rd! + * Password and Confirm password: Passw0rd! ![figure 12](images/mdt-06-fig13.png) From 6065fc8646c69756e5ebf7388709c0e75c1f34a2 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 18 Oct 2016 07:53:47 -0700 Subject: [PATCH 22/36] adding back commented out W10 settings --- ...anage-settings-with-mdm-for-surface-hub.md | 86 ++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index 6bd7936606..5ed6ba03dd 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -52,7 +52,7 @@ You can manually enroll with an MDM using the **Settings** app on your Surface H ## Manage Surface Hub settings with MDM -You can use MDM to manage some [Surface Hub CSP settings](#supported-surface-hub-csp-settings). Depending on the MDM provider that you use, you may set these settings using a built-in user interface, or by deploying custom SyncML. Microsoft Intune and System Center Configuration Manager provide built-in experiences to help create policy templates for Surface Hub. Refer to documentation from your MDM provider to learn how to create and deploy SyncML. +You can use MDM to manage some [Surface Hub CSP settings](#supported-surface-hub-csp-settings). Depending on the MDM provider that you use, you may set these settings using a built-in user interface, or by deploying custom SyncML. Microsoft Intune and System Center Configuration Manager provide built-in experiences to help create policy templates for Surface Hub. Refer to documentation from your MDM provider to learn how to create and deploy SyncML. ### Supported Surface Hub CSP settings @@ -73,6 +73,90 @@ For more information, see [SurfaceHub configuration service provider](https://ms | Friendly name for wireless projection | Properties/FriendlyName | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | | Device account, including password rotation | DeviceAccount/\
See [SurfaceHub CSP](https://msdn.microsoft.com/library/windows/hardware/mt608323.aspx). | No | No | Yes | + ## Example: Manage Surface Hub settings with Micosoft Intune From 4f78a490932b0aaa563cbf924ac5d26dfa4cc0b2 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 18 Oct 2016 08:07:29 -0700 Subject: [PATCH 23/36] fixing build error --- .../surface-hub/manage-settings-with-mdm-for-surface-hub.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index 5ed6ba03dd..2fce3b3573 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -84,7 +84,7 @@ The following tables include info on Windows 10 settings that have been validate | Setting | Details | CSP reference | Supported with
Intune? | Supported with
Configuration Manager? | Supported with
SyncML? | | -------- | -------- | ------------- |-------------------------- | ---------------------------------------- | ------------------------- | | Allow Bluetooth | Keep this enabled to support Bluetooth peripherals. | [Connectivity/AllowBluetooth](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx#Connectivity_AllowBluetooth) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Bluetooth policies | Use to set the Bluetooth device name, and block advertising, discovery, and automatic pairing. | Bluetooth/
See [Policy CSP](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | +| Bluetooth policies | Use to set the Bluetooth device name, and block advertising, discovery, and automatic pairing. | Bluetooth/\\
See [Policy CSP](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | | Allow camera | Keep this enabled for Skype for Business. | [Camera/AllowCamera](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx#Camera_AllowCamera) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | | Allow location | Keep this enabled to support apps such as Maps. | [System/AllowLocation](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx#System_AllowLocation) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | | Allow telemetry | Keep this enabled to help Microsoft improve Surface Hub. | [System/AllowTelemetry](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx#System_AllowTelemetry) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | @@ -113,13 +113,13 @@ The following tables include info on Windows 10 settings that have been validate | Pause feature updates | See above. | [Update/PauseFeatureUpdates](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx#Update_PauseFeatureUpdates) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | | Pause quality updates | See above. | [Update/PauseQualityUpdates](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx#Update_PauseQualityUpdates) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes| | Configure device to use WSUS| Use to connect your Surface Hub to WSUS instead of Windows Update – see [Windows updates](manage-windows-updates-for-surface-hub.md). | [Update/UpdateServiceUrl](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx#Update_UpdateServiceUrl) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Delivery optimization | Use peer-to-peer content sharing to reduce bandwidth issues during updates. See [Configure Delivery Optimization for Windows 10](https://technet.microsoft.com/itpro/windows/manage/waas-delivery-optimization) for details. | DeliveryOptimization/
See [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | +| Delivery optimization | Use peer-to-peer content sharing to reduce bandwidth issues during updates. See [Configure Delivery Optimization for Windows 10](https://technet.microsoft.com/itpro/windows/manage/waas-delivery-optimization) for details. | DeliveryOptimization/\\
See [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | #### Windows Defender settings | Setting | Details | CSP reference | Supported with
Intune? | Supported with
Configuration Manager? | Supported with
SyncML? | | ----------- | ---------------- | ------------- |-------------------------- | ---------------------------------------- | ------------------------- | -| Defender policies. |Use to configure various Defender settings, including a scheduled scan time. | Defender/
See [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes +| Defender policies. |Use to configure various Defender settings, including a scheduled scan time. | Defender/\\
See [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | Defender status | Use to initiate a Defender scan, force a signature update, query any threats detected. | [Defender CSP](https://msdn.microsoft.com/library/windows/hardware/mt187856.aspx) | No. | No. | Yes | #### Remote reboot settings From c42fb0f5dc1813517ca0324723c7c0745fce87d8 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 18 Oct 2016 08:17:06 -0700 Subject: [PATCH 24/36] fixing build error --- .../manage-settings-with-mdm-for-surface-hub.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index 2fce3b3573..3028f76efe 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -71,9 +71,9 @@ For more information, see [SurfaceHub configuration service provider](https://ms | Welcome screen background image | InBoxApps/Welcome/CurrentBackgroundPath | Yes | Yes.
Use a custom setting. | Yes | | Meeting information displayed on the welcome screen | InBoxApps/Welcome/MeetingInfoOption | Yes | Yes.
Use a custom setting. | Yes | | Friendly name for wireless projection | Properties/FriendlyName | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Device account, including password rotation | DeviceAccount/\
See [SurfaceHub CSP](https://msdn.microsoft.com/library/windows/hardware/mt608323.aspx). | No | No | Yes | +| Device account, including password rotation | DeviceAccount/*``*
See [SurfaceHub CSP](https://msdn.microsoft.com/library/windows/hardware/mt608323.aspx). | No | No | Yes | - +- bool (Boolean) ## Example: Manage Surface Hub settings with Micosoft Intune From 47650f5febccaef0efa9a15ec4db832d92c47d2f Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 18 Oct 2016 09:22:31 -0700 Subject: [PATCH 27/36] testing fix --- .../surface-hub/manage-settings-with-mdm-for-surface-hub.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index 188628e0ca..714b21afbd 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -73,6 +73,7 @@ For more information, see [SurfaceHub configuration service provider](https://ms | Friendly name for wireless projection | Properties/FriendlyName | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | | Device account, including password rotation | DeviceAccount/*``*
See [SurfaceHub CSP](https://msdn.microsoft.com/library/windows/hardware/mt608323.aspx). | No | No | Yes | + + ## Example: Manage Surface Hub settings with Micosoft Intune You can use Microsoft Intune to manage Surface Hub settings. From 8141e7cc6f7789c58da60d0413068e7e08ae2084 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 18 Oct 2016 09:35:05 -0700 Subject: [PATCH 28/36] testing fix --- devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index 714b21afbd..d330ae3656 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -79,6 +79,7 @@ For more information, see [SurfaceHub configuration service provider](https://ms In addition to Surface Hub specific settings, there are numerous settings common to all Windows 10 devices. These settings are defined in the [Configuration service provider reference](https://msdn.microsoft.com/library/windows/hardware/dn920025.aspx). The following tables include info on Windows 10 settings that have been validated with Surface Hub. There is a table with settings for these areas: security, browser, Windows Updates, Windows Defender, remote reboot, certificates, and logs. Each table also tells if the setting is supported with Microsoft Intune, System Center Configuration Manager, or SyncML. +--> #### Security settings @@ -159,7 +160,6 @@ The data type is also stated in the CSP documentation. The most common data type - int (Integer) - bool (Boolean) ---> ## Example: Manage Surface Hub settings with Micosoft Intune From dc22896ac9f885565667a61c6332c30ee33bc988 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 18 Oct 2016 10:05:25 -0700 Subject: [PATCH 29/36] comment out security setting h4 --- devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index d330ae3656..a491bc67fe 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -81,6 +81,7 @@ In addition to Surface Hub specific settings, there are numerous settings common The following tables include info on Windows 10 settings that have been validated with Surface Hub. There is a table with settings for these areas: security, browser, Windows Updates, Windows Defender, remote reboot, certificates, and logs. Each table also tells if the setting is supported with Microsoft Intune, System Center Configuration Manager, or SyncML. --> + #### Browser settings From cba6236dcaf5207aa0333fc99fae20e73aa561ff Mon Sep 17 00:00:00 2001 From: LizRoss Date: Tue, 18 Oct 2016 10:35:17 -0700 Subject: [PATCH 30/36] Updated about icon overlay changes --- windows/keep-secure/change-history-for-keep-windows-10-secure.md | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/keep-secure/change-history-for-keep-windows-10-secure.md b/windows/keep-secure/change-history-for-keep-windows-10-secure.md index 9fe6c9986e..dada97fc72 100644 --- a/windows/keep-secure/change-history-for-keep-windows-10-secure.md +++ b/windows/keep-secure/change-history-for-keep-windows-10-secure.md @@ -16,6 +16,7 @@ This topic lists new and updated topics in the [Keep Windows 10 secure](index.md | New or changed topic | Description | | --- | --- | +|[Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) and [Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md) |Updated the text about the icon overlay option. This icon now only appears on corporate files in the Save As and File Explore views. | |[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) |Added content about using ActiveX controls.| |[Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)](app-behavior-with-wip.md) |New | |[VPN technical guide](vpn-guide.md) | Multiple new topics, replacing previous **VPN profile options** topic | From a6359d9de8c109c1dddc6b9c4a14845c7d596dc9 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 18 Oct 2016 11:13:13 -0700 Subject: [PATCH 31/36] testing fix - add back h3 --- .../surface-hub/manage-settings-with-mdm-for-surface-hub.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index a491bc67fe..b49768ece6 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -73,13 +73,13 @@ For more information, see [SurfaceHub configuration service provider](https://ms | Friendly name for wireless projection | Properties/FriendlyName | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | | Device account, including password rotation | DeviceAccount/*``*
See [SurfaceHub CSP](https://msdn.microsoft.com/library/windows/hardware/mt608323.aspx). | No | No | Yes | - + + #### Browser settings From ae92ac015801710418149dac136fb18d603a4a55 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Tue, 18 Oct 2016 12:51:20 -0700 Subject: [PATCH 35/36] Formatting for comment --- .../manage-settings-with-mdm-for-surface-hub.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index 25e96c5db5..0f6e4b0c4c 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -80,9 +80,8 @@ In addition to Surface Hub specific settings, there are numerous settings common The following tables include info on Windows 10 settings that have been validated with Surface Hub. There is a table with settings for these areas: security, browser, Windows Updates, Windows Defender, remote reboot, certificates, and logs. Each table also tells if the setting is supported with Microsoft Intune, System Center Configuration Manager, or SyncML. - -#### Security settings - + #### Browser settings From fe7705d9c3391f45acbdfe68376dc33beec04b2d Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 18 Oct 2016 13:21:01 -0700 Subject: [PATCH 36/36] removing W10 settings section --- ...anage-settings-with-mdm-for-surface-hub.md | 88 +------------------ 1 file changed, 1 insertion(+), 87 deletions(-) diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index 0f6e4b0c4c..77fe621aae 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -52,7 +52,7 @@ You can manually enroll with an MDM using the **Settings** app on your Surface H ## Manage Surface Hub settings with MDM -You can use MDM to manage some [Surface Hub CSP settings](#supported-surface-hub-csp-settings). Depending on the MDM provider that you use, you may set these settings using a built-in user interface, or by deploying custom SyncML. Microsoft Intune and System Center Configuration Manager provide built-in experiences to help create policy templates for Surface Hub. Refer to documentation from your MDM provider to learn how to create and deploy SyncML. +You can use MDM to manage some [Surface Hub CSP settings](#supported-surface-hub-csp-settings). Depending on the MDM provider that you use, you may set these settings using a built-in user interface, or by deploying custom SyncML. Microsoft Intune and System Center Configuration Manager provide built-in experiences to help create policy templates for Surface Hub. Refer to documentation from your MDM provider to learn how to create and deploy SyncML. ### Supported Surface Hub CSP settings @@ -74,92 +74,6 @@ For more information, see [SurfaceHub configuration service provider](https://ms | Device account, including password rotation | DeviceAccount/*``*
See [SurfaceHub CSP](https://msdn.microsoft.com/library/windows/hardware/mt608323.aspx). | No | No | Yes | - ### Supported Windows 10 settings - -In addition to Surface Hub specific settings, there are numerous settings common to all Windows 10 devices. These settings are defined in the [Configuration service provider reference](https://msdn.microsoft.com/library/windows/hardware/dn920025.aspx). - -The following tables include info on Windows 10 settings that have been validated with Surface Hub. There is a table with settings for these areas: security, browser, Windows Updates, Windows Defender, remote reboot, certificates, and logs. Each table also tells if the setting is supported with Microsoft Intune, System Center Configuration Manager, or SyncML. - - - -#### Browser settings - -| Setting | Details | CSP reference | Supported with
Intune? | Supported with
Configuration Manager? | Supported with
SyncML? | -| -------- | ---------------- | ------------- |-------------------------- | ---------------------------------------- | ------------------------- | -| Homepages | Use to configure the default homepages in Microsoft Edge. | [Browser/Homepages](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Browser_Homepages) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Allow cookies | Surface Hub automatically deletes cookies at the end of a session. Use this to block cookies within a session. | [Browser/AllowCookies](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Browser_AllowCookies) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Allow developer tools | Use to stop users from using F12 Developer Tools. | [Browser/AllowDeveloperTools](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Browser_AllowDeveloperTools) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Allow Do Not Track | Use to enable Do Not Track headers. | [Browser/AllowDoNotTrack](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Browser_AllowDoNotTrack) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Allow pop-ups | Use to block pop-up browser windows. | [Browser/AllowPopups](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Browser_AllowPopups) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Allow search suggestions | Use to block search suggestions in the address bar. | [Browser/AllowSearchSuggestionsinAddressBar](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Browser_AllowSearchSuggestionsinAddressBar) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Allow SmartScreen | Keep this enabled to turn on SmartScreen. | [Browser/AllowSmartScreen](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Browser_AllowSmartScreen) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Prevent ignoring SmartScreen Filter warnings for websites | For extra security, use to stop users from ignoring SmartScreen Filter warnings and block them from accessing potentially malicious websites. | [Browser/PreventSmartScreenPromptOverride](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Browser_PreventSmartScreenPromptOverride) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Prevent ignoring SmartScreen Filter warnings for files | For extra security, use to stop users from ignoring SmartScreen Filter warnings and block them from downloading unverified files from Microsoft Edge. | [Browser/PreventSmartScreenPromptOverrideForFiles](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Browser_PreventSmartScreenPromptOverrideForFiles) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | - -#### Windows Update settings - -| Setting | Details | CSP reference | Supported with
Intune? | Supported with
Configuration Manager? | Supported with
SyncML? | -| ----------- | ---------------- | ------------- |-------------------------- | ---------------------------------------- | ------------------------- | -| Use Current Branch or Current Branch for Business | Use to configure Windows Update for Business – see [Windows updates](manage-windows-updates-for-surface-hub.md). | [Update/BranchReadinessLevel](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Update_BranchReadinessLevel) | Yes. Use a custom policy. | Yes. Use a custom setting. | Yes | -| Defer feature updates| See above. | [Update/ DeferFeatureUpdatesPeriodInDays](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Update_DeferFeatureUpdatesPeriodInDays) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Defer quality updates | See above. | [Update/DeferQualityUpdatesPeriodInDays](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Update_DeferQualityUpdatesPeriodInDays) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Pause feature updates | See above. | [Update/PauseFeatureUpdates](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Update_PauseFeatureUpdates) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Pause quality updates | See above. | [Update/PauseQualityUpdates](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Update_PauseQualityUpdates) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes| -| Configure device to use WSUS| Use to connect your Surface Hub to WSUS instead of Windows Update – see [Windows updates](manage-windows-updates-for-surface-hub.md). | [Update/UpdateServiceUrl](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#Update_UpdateServiceUrl) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Delivery optimization | Use peer-to-peer content sharing to reduce bandwidth issues during updates. See [Configure Delivery Optimization for Windows 10](https://technet.microsoft.com/itpro/windows/manage/waas-delivery-optimization) for details. | DeliveryOptimization/*``*
See [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | - -#### Windows Defender settings - -| Setting | Details | CSP reference | Supported with
Intune? | Supported with
Configuration Manager? | Supported with
SyncML? | -| ----------- | ---------------- | ------------- |-------------------------- | ---------------------------------------- | ------------------------- | -| Defender policies. | Use to configure various Defender settings, including a scheduled scan time. | Defender/*``*
See [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Defender status | Use to initiate a Defender scan, force a signature update, query any threats detected. | [Defender CSP](https://msdn.microsoft.com/library/windows/hardware/mt187856.aspx) | No. | No. | Yes | - -#### Remote reboot settings - -| Setting | Details | CSP reference | Supported with
Intune? | Supported with
Configuration Manager? | Supported with
SyncML? | -| ----------- | ---------------- | ------------- |-------------------------- | ---------------------------------------- | ------------------------- | -| Reboot the device immediately | Use in conjunction with OMS to minimize support costs – see [Monitor your Microsoft Surface Hub](monitor-surface-hub.md). | ./Vendor/MSFT/Reboot/RebootNow
See [Reboot CSP](https://msdn.microsoft.com/library/windows/hardware/mt720802.aspx) | No | No | Yes | -| Reboot the device at a scheduled date and time | See above. | ./Vendor/MSFT/Reboot/Schedule/Single
See [Reboot CSP](https://msdn.microsoft.com/library/windows/hardware/mt720802.aspx) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | -| Reboot the device daily at a scheduled date and time | See above. | ./Vendor/MSFT/Reboot/Schedule/DailyRecurrent
See [Reboot CSP](https://msdn.microsoft.com/library/windows/hardware/mt720802.aspx) | Yes.
Use a custom policy. | Yes.
Use a custom setting. | Yes | - -#### Certficate settings - -| Setting | Details | CSP reference | Supported with
Intune? | Supported with
Configuration Manager? | Supported with
SyncML? | -| ----------- | ---------------- | ------------- |-------------------------- | ---------------------------------------- | ------------------------- | -| Install certificates | Use to deploy certificates to the Surface Hub. | [RootCATrustedCertificates CSP](https://msdn.microsoft.com/library/windows/hardware/dn904970.aspx)
[ClientCertificateInstall CSP](https://msdn.microsoft.com/library/windows/hardware/dn920023.aspx) | Yes.
See [Secure resource access with certificate profiles](https://docs.microsoft.com/intune/deploy-use/secure-resource-access-with-certificate-profiles). | Yes.
See [How to create certificate profiles in Configuration Manager](https://technet.microsoft.com/library/dn270541.aspx). | Yes | - -#### Log settings - -| Setting | Details | CSP reference | Supported with
Intune? | Supported with
Configuration Manager? | Supported with
SyncML? | -| ----------- | ---------------- | ------------- |-------------------------- | ---------------------------------------- | ------------------------- | -| Log collection | Use to remotely collect ETW logs from Surface Hub. | [DiagnosticLog CSP](https://msdn.microsoft.com/library/windows/hardware/mt219118.aspx) | No | No | Yes | - -### Generate OMA URIs for settings -You need to use a setting’s OMA URI to create a custom policy in Intune, or a custom setting in System Center Configuration Manager. - -**To generate the OMA URI for any setting in the CSP documentation** -1. In the CSP documentation, identify the root node of the CSP. Generally, this looks like `./Vendor/MSFT/`.
-For example, the root node of the [SurfaceHub CSP](https://msdn.microsoft.com/library/windows/hardware/mt608323.aspx) is `./Vendor/MSFT/SurfaceHub`. -2. Identify the node path for the setting you want to use.
-For example, the node path for the setting to enable wireless projection is `InBoxApps/WirelessProjection/Enabled`. -3. Append the node path to the root node to generate the OMA URI.
-For example, the OMA URI for the setting to enable wireless projection is `./Vendor/MSFT/SurfaceHub/InBoxApps/WirelessProjection/Enabled`. - -The data type is also stated in the CSP documentation. The most common data types are: -- char (String) -- int (Integer) -- bool (Boolean) - ## Example: Manage Surface Hub settings with Micosoft Intune