From 15d951b187ae53388bde014cc2e014ecaf8d998e Mon Sep 17 00:00:00 2001 From: Joey Caparas Date: Sat, 10 Dec 2016 19:11:59 -0800 Subject: [PATCH 1/3] add youtube link --- ...oard-configure-windows-defender-advanced-threat-protection.md | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/keep-secure/onboard-configure-windows-defender-advanced-threat-protection.md b/windows/keep-secure/onboard-configure-windows-defender-advanced-threat-protection.md index 9205bb0153..2a7a40abd6 100644 --- a/windows/keep-secure/onboard-configure-windows-defender-advanced-threat-protection.md +++ b/windows/keep-secure/onboard-configure-windows-defender-advanced-threat-protection.md @@ -23,6 +23,7 @@ localizationpriority: high You need to onboard to Windows Defender ATP before you can use the service. +For more information, see [Onboard your Windows 10 endpoints to Windows Defender ATP](https://www.youtube.com/watch?v=JT7VGYfeRlA&feature=youtu.be). ## In this section Topic | Description From 6eb12a045fb146ac4b624c51e05e7ed867743ac7 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Mon, 12 Dec 2016 07:08:48 -0800 Subject: [PATCH 2/3] topic title change --- devices/hololens/TOC.md | 2 +- devices/hololens/hololens-upgrade-enterprise.md | 4 ++-- devices/hololens/index.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devices/hololens/TOC.md b/devices/hololens/TOC.md index 38959bbbb4..a1e744e8fe 100644 --- a/devices/hololens/TOC.md +++ b/devices/hololens/TOC.md @@ -1,7 +1,7 @@ # [Microsoft HoloLens](index.md) ## [HoloLens in the enterprise: requirements](hololens-requirements.md) ## [Set up HoloLens](hololens-setup.md) -## [Upgrade to Windows Holographic Enterprise](hololens-upgrade-enterprise.md) +## [Unlock Windows Holographic Enterprise features](hololens-upgrade-enterprise.md) ## [Enroll HoloLens in MDM](hololens-enroll-mdm.md) ## [Set up HoloLens in kiosk mode](hololens-kiosk.md) ## [Configure HoloLens using a provisioning package](hololens-provisioning.md) diff --git a/devices/hololens/hololens-upgrade-enterprise.md b/devices/hololens/hololens-upgrade-enterprise.md index ab3a5920df..c931421935 100644 --- a/devices/hololens/hololens-upgrade-enterprise.md +++ b/devices/hololens/hololens-upgrade-enterprise.md @@ -1,5 +1,5 @@ --- -title: Upgrade to Windows Holographic Enterprise (HoloLens) +title: Unlock Windows Holographic Enterprise features (HoloLens) description: HoloLens provides extra features designed for business when you upgrade to Windows Holographic Enterprise. ms.prod: w10 ms.mktglfcycl: manage @@ -8,7 +8,7 @@ ms.sitesec: library author: jdeckerMS --- -# Upgrade to Windows Holographic Enterprise +# Unlock Windows Holographic Enterprise features Microsoft HoloLens is available in the *Development Edition*, which runs Windows Holographic (an edition of Windows 10 designed for HoloLens), and in the [Commercial Suite](https://developer.microsoft.com/windows/holographic/release_notes#introducing_microsoft_hololens_commercial_suite), which provides extra features designed for business. diff --git a/devices/hololens/index.md b/devices/hololens/index.md index 401b51e645..d279a9a072 100644 --- a/devices/hololens/index.md +++ b/devices/hololens/index.md @@ -21,7 +21,7 @@ author: jdeckerMS | --- | --- | | [HoloLens in the enterprise: requirements](hololens-requirements.md) | Lists requirements for general use, Wi-Fi, and device management | | [Set up HoloLens](hololens-setup.md) | How to set up HoloLens for the first time | -| [Upgrade to Windows Holographic Enterprise](hololens-upgrade-enterprise.md) | How to upgrade your Development Edition HoloLens to Windows Holographic Enterprise| +| [Unlock Windows Holographic Enterprise features](hololens-upgrade-enterprise.md) | How to upgrade your Development Edition HoloLens to Windows Holographic Enterprise| | [Enroll HoloLens in MDM](hololens-enroll-mdm.md) | Manage multiple HoloLens devices simultaneously using solutions like Microsoft InTune | | [Set up HoloLens in kiosk mode](hololens-kiosk.md) | Enable kiosk mode for HoloLens, which limits the user's ability to launch new apps or change the running app | | [Configure HoloLens using a provisioning package](hololens-provisioning.md) | Provisioning packages make it easy for IT administrators to configure HoloLens devices without imaging | From 4b5c304deb8d711f9d165d7557f8a3fd7b922bf2 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Mon, 12 Dec 2016 09:22:44 -0800 Subject: [PATCH 3/3] sync --- devices/surface-hub/admin-group-management-for-surface-hub.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/surface-hub/admin-group-management-for-surface-hub.md b/devices/surface-hub/admin-group-management-for-surface-hub.md index 0278b24569..7607199209 100644 --- a/devices/surface-hub/admin-group-management-for-surface-hub.md +++ b/devices/surface-hub/admin-group-management-for-surface-hub.md @@ -74,7 +74,7 @@ If your organization is using AD or Azure AD, we recommend you either domain joi |---------------------------------------------------|-----------------------------------------|-------| | Create a local admin account | None | The user name and password specified during first run | | Domain join to Active Directory (AD) | Your organization uses AD | Any AD user from a specific security group in your domain | -| Azure Active Directory (Azure AD) join the device | Your organization uses Azure AD Basic | Global administators only | +| Azure Active Directory (Azure AD) join the device | Your organization uses Azure AD Basic | Global administrators only | |   | Your organization uses Azure AD Premium or Enterprise Mobility Suite (EMS) | Global administrators and additional administrators |