Merge remote-tracking branch 'origin/master'

# Conflicts:
#	windows/manage/manage-cortana-in-enterprise.md
This commit is contained in:
LizRoss
2016-04-06 14:57:38 -07:00
95 changed files with 129 additions and 176 deletions

View File

@ -1,11 +1,11 @@
---
title: Enterprise management for Windows 10 devices (Windows 10)
description: Windows 10 provides mobile device management (MDM) capabilities for PCs, laptops, tablets, and phones that enable enterprise-level management of corporate-owned and personal devices.
description: Windows 10 provides mobile device management (MDM) capabilities that enable enterprise-level management of devices.
ms.assetid: 36DA67A1-25F1-45AD-A36B-AEEAC30C9BC4
ms.prod: W10
ms.mktglfcycl: explore
ms.sitesec: library
author: TrudyHa
author: jdeckerMS
---
# Enterprise management for Windows 10 devices
@ -39,8 +39,8 @@ When a personal device is unenrolled, the user's data and apps are untouched, wh
Enterprises have the following identity and management choices.
| | |
|-------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Area | Choices |
|---|---|
| Identity | Active Directory; Azure AD |
| Grouping | Domain join; Workgroup; Azure AD join |
| Device management | Group Policy; System Center Configuration Manager; Microsoft Intune; other MDM solutions; Exchange ActiveSync; Windows PowerShell; Windows Management Instrumentation (WMI) |

View File

@ -1,12 +1,12 @@
---
title: Lockdown features from Windows Embedded 8.1 Industry (Windows 10)
description: Many of the lockdown features available in Windows Embedded 8.1 Industry have been modified in some form for Windows 10. This table maps Windows Embedded Industry 8.1 features to Windows 10 Enterprise features, along with links to documentation.
description: Many of the lockdown features available in Windows Embedded 8.1 Industry have been modified in some form for Windows 10.
ms.assetid: 3C006B00-535C-4BA4-9421-B8F952D47A14
keywords: ["lockdown", "embedded"]
ms.prod: W10
ms.mktglfcycl: deploy
ms.sitesec: library
author: TrudyHa
author: jdeckerMS
---
# Lockdown features from Windows Embedded 8.1 Industry

View File

@ -1,12 +1,12 @@
---
title: Microsoft Passport overview (Windows 10)
description: In Windows 10, Microsoft Passport replaces passwords with strong two-factor authentication that consists of an enrolled device and a Windows Hello (biometric) or PIN.
description: In Windows 10, Microsoft Passport replaces passwords with strong two-factor authentication.
ms.assetid: 292F3BE9-3651-4B20-B83F-85560631EF5B
keywords: ["password", "hello", "fingerprint", "iris", "biometric"]
ms.prod: W10
ms.mktglfcycl: explore
ms.sitesec: library
author: TrudyHa
author: jdeckerMS
---
# Microsoft Passport overview

View File

@ -5,7 +5,7 @@ ms.assetid: 287706E5-063F-4AB5-902C-A0DF6D0730BC
ms.prod: W10
ms.mktglfcycl: explore
ms.sitesec: library
author: TrudyHa
author: jdeckerMS
---
# Provisioning packages

View File

@ -1,12 +1,12 @@
---
title: Windows spotlight on the lock screen (Windows 10)
description: Windows spotlight is an option for the lock screen background that displays different background images and occasionally offers suggestions on the lock screen.
description: Windows spotlight is an option for the lock screen background that displays different background images on the lock screen.
ms.assetid: 1AEA51FA-A647-4665-AD78-2F3FB27AD46A
keywords: ["lockscreen"]
ms.prod: W10
ms.mktglfcycl: explore
ms.sitesec: library
author: TrudyHa
author: jdeckerMS
---
# Windows spotlight on the lock screen