deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-22 18:27:23 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into live

Browse Source
This commit is contained in:
LizRoss 2016-12-12 10:04:56 -08:00
commit 060dfff679
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/hololens/TOC.md
View File

@ -1,7 +1,7 @@
# [Microsoft HoloLens](index.md) # [Microsoft HoloLens](index.md)
## [HoloLens in the enterprise: requirements](hololens-requirements.md) ## [HoloLens in the enterprise: requirements](hololens-requirements.md)
## [Set up HoloLens](hololens-setup.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) ## [Enroll HoloLens in MDM](hololens-enroll-mdm.md)
## [Set up HoloLens in kiosk mode](hololens-kiosk.md) ## [Set up HoloLens in kiosk mode](hololens-kiosk.md)
## [Configure HoloLens using a provisioning package](hololens-provisioning.md) ## [Configure HoloLens using a provisioning package](hololens-provisioning.md)

4
devices/hololens/hololens-upgrade-enterprise.md
View File

@ -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. description: HoloLens provides extra features designed for business when you upgrade to Windows Holographic Enterprise.
ms.prod: w10 ms.prod: w10
ms.mktglfcycl: manage ms.mktglfcycl: manage
@ -8,7 +8,7 @@ ms.sitesec: library
author: jdeckerMS 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. 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.

2
devices/hololens/index.md
View File

@ -21,7 +21,7 @@ author: jdeckerMS
| --- | --- | | --- | --- |
| [HoloLens in the enterprise: requirements](hololens-requirements.md) | Lists requirements for general use, Wi-Fi, and device management | | [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 | | [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 | | [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 | | [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 | | [Configure HoloLens using a provisioning package](hololens-provisioning.md) | Provisioning packages make it easy for IT administrators to configure HoloLens devices without imaging |

2
devices/surface-hub/admin-group-management-for-surface-hub.md
View File

@ -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 | | 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 | | 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 | |   | Your organization uses Azure AD Premium or Enterprise Mobility Suite (EMS) | Global administrators and additional administrators |

1
windows/keep-secure/onboard-configure-windows-defender-advanced-threat-protection.md
View File

@ -23,6 +23,7 @@ localizationpriority: high
You need to onboard to Windows Defender ATP before you can use the service. 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 ## In this section
Topic | Description Topic | Description