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

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

Browse Source
This commit is contained in:
LizRoss 2017-05-05 14:22:53 -07:00
commit dd7b11e6df
10 changed files with 94 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.openpublishing.publish.config.json
View File

@ -2,7 +2,6 @@
"build_entry_point": "", "build_entry_point": "",
"need_generate_pdf": false, "need_generate_pdf": false,
"need_generate_intellisense": false, "need_generate_intellisense": false,
"enable_incremental_build": true,
"docsets_to_publish": [ "docsets_to_publish": [
{ {
"docset_name": "education", "docset_name": "education",
@ -387,7 +386,14 @@
"git_repository_branch_open_to_public_contributors": "master", "git_repository_branch_open_to_public_contributors": "master",
"skip_source_output_uploading": false, "skip_source_output_uploading": false,
"need_preview_pull_request": true, "need_preview_pull_request": true,
"enable_incremental_build": true,
"dependent_repositories": [ "dependent_repositories": [
{
"path_to_root": "_themes.pdf",
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
"branch": "master",
"branch_mapping": {}
},
{ {
"path_to_root": "_themes", "path_to_root": "_themes",
"url": "https://github.com/Microsoft/templates.docs.msft", "url": "https://github.com/Microsoft/templates.docs.msft",
@ -395,5 +401,14 @@
"branch_mapping": {} "branch_mapping": {}
} }
], ],
"need_generate_pdf_url_template": false "branch_target_mapping": {
"live": ["Publish","Pdf"],
"master": ["Publish", "Pdf"]
},
"need_generate_pdf_url_template": true,
"Targets": {
"Pdf": {
"template_folder": "_themes.pdf"
}
}
} }

20
.openpublishing.redirection.json
View File

@ -1471,6 +1471,11 @@
"redirect_document_id": true "redirect_document_id": true
}, },
{ {
"source_path": "windows/manage/windows-spotlight.md",
"redirect_url": "/windows/configuration/windows-spotlight",
"redirect_document_id": true
},
{
"source_path": "windows/deploy/activate-forest-by-proxy-vamt.md", "source_path": "windows/deploy/activate-forest-by-proxy-vamt.md",
"redirect_url": "/windows/deployment/volume-activation/activate-forest-by-proxy-vamt", "redirect_url": "/windows/deployment/volume-activation/activate-forest-by-proxy-vamt",
"redirect_document_id": true "redirect_document_id": true
@ -8214,6 +8219,21 @@
"source_path": "education/get-started/index.md", "source_path": "education/get-started/index.md",
"redirect_url": "/education/get-started/get-started-with-microsoft-education", "redirect_url": "/education/get-started/get-started-with-microsoft-education",
"redirect_document_id": true "redirect_document_id": true
},
{
"source_path": "windows/keep-secure/windows-10-enterprise-security-guides.md",
"redirect_url": "/windows/windows-10/index",
"redirect_document_id": true
},
{
"source_path": "windows/keep-secure/change-history-for-keep-windows-10-secure.md",
"redirect_url": "/windows/windows-10/index",
"redirect_document_id": true
},
{
"source_path": "windows/manage/change-history-for-manage-and-update-windows-10.md",
"redirect_url": "/windows/windows-10/index",
"redirect_document_id": true
} }
] ]
} }

6
devices/hololens/hololens-enroll-mdm.md
View File

@ -11,7 +11,7 @@ localizationpriority: medium
# Enroll HoloLens in MDM # Enroll HoloLens in MDM
You can manage multiple Microsoft HoloLens devices simultaneously using solutions like Microsoft InTune. You will be able to manage settings, select apps to install and set security configurations tailored to your organization's need. You can manage multiple Microsoft HoloLens devices simultaneously using solutions like Microsoft Intune. You will be able to manage settings, select apps to install and set security configurations tailored to your organization's need.
>[!NOTE] >[!NOTE]
>Mobile device management (MDM) for the Development edition of HoloLens does not include VPN, BitLocker, or kiosk mode. Those features are only available when you [upgrade to Windows Holographic for Business](hololens-upgrade-enterprise.md). >Mobile device management (MDM) for the Development edition of HoloLens does not include VPN, BitLocker, or kiosk mode. Those features are only available when you [upgrade to Windows Holographic for Business](hololens-upgrade-enterprise.md).
@ -22,7 +22,7 @@ You can manage multiple Microsoft HoloLens devices simultaneously using solution
## Auto-enrollment in MDM ## Auto-enrollment in MDM
If your organization uses Azure Active Directory (Azure AD) and an MDM solution that accepts an AAD token for authentication (currently, only supported in Microsoft Intune and Airwatch), your IT admin can configure Azure AD to automatically allow MDM enrollment after the user signs in with their Azure AD account. [Learn how to configure Azure AD enrollment.](https://docs.microsoft.com/intune/deploy-use/set-up-windows-device-management-with-microsoft-intune#azure-active-directory-enrollment) If your organization uses Azure Active Directory (Azure AD) and an MDM solution that accepts an AAD token for authentication (currently, only supported in Microsoft Intune and AirWatch), your IT admin can configure Azure AD to automatically allow MDM enrollment after the user signs in with their Azure AD account. [Learn how to configure Azure AD enrollment.](https://docs.microsoft.com/intune/deploy-use/set-up-windows-device-management-with-microsoft-intune#azure-active-directory-enrollment)
When auto-enrollment is enabled, no additional manual enrollment is needed. When the user signs in with an Azure AD account, the device is enrolled in MDM after completing the first-run experience. When auto-enrollment is enabled, no additional manual enrollment is needed. When the user signs in with an Azure AD account, the device is enrolled in MDM after completing the first-run experience.
@ -36,4 +36,4 @@ When auto-enrollment is enabled, no additional manual enrollment is needed. When
4. Upon successful authentication to the MDM server, a success message is shown. 4. Upon successful authentication to the MDM server, a success message is shown.
Your device is now enrolled with your MDM server. The device will need to restart to acquire policies, certificates, and apps. The Settings app will now reflect that the device is enrolled in device management. Your device is now enrolled with your MDM server. The device will need to restart to acquire policies, certificates, and apps. The Settings app will now reflect that the device is enrolled in device management.

4
devices/hololens/index.md
View File

@ -23,7 +23,7 @@ localizationpriority: medium
| [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 |
| [Unlock Windows Holographic for Business features](hololens-upgrade-enterprise.md) | How to upgrade your Development Edition HoloLens to Windows Holographic for Business| | [Unlock Windows Holographic for Business features](hololens-upgrade-enterprise.md) | How to upgrade your Development Edition HoloLens to Windows Holographic for Business|
| [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 |
| [Install apps on HoloLens](hololens-install-apps.md) | Use Microsoft Store for Business, mobile device management (MDM), or the Windows Device Portal to install apps on HoloLens| | [Install apps on HoloLens](hololens-install-apps.md) | Use Microsoft Store for Business, mobile device management (MDM), or the Windows Device Portal to install apps on HoloLens|
@ -37,4 +37,4 @@ localizationpriority: medium
- [HoloLens Commercial Suite](https://www.microsoft.com/microsoft-hololens/hololens-commercial) - [HoloLens Commercial Suite](https://www.microsoft.com/microsoft-hololens/hololens-commercial)
- [HoloLens release notes](https://developer.microsoft.com/en-us/windows/mixed-reality/release_notes) - [HoloLens release notes](https://developer.microsoft.com/en-us/windows/mixed-reality/release_notes)

2
devices/surface/considerations-for-surface-and-system-center-configuration-manager.md
View File

@ -13,7 +13,7 @@ author: Scottmca
Fundamentally, management and deployment of Surface devices with System Center Configuration Manager is the same as the management and deployment of any other PC. Like any other PC, a deployment to Surface devices includes importing drivers, importing a Windows image, preparing a deployment task sequence, and then deploying the task sequence to a collection. After deployment, Surface devices are like any other Windows client – to publish apps, settings, and policies, you use the same process that you would use for any other device. Fundamentally, management and deployment of Surface devices with System Center Configuration Manager is the same as the management and deployment of any other PC. Like any other PC, a deployment to Surface devices includes importing drivers, importing a Windows image, preparing a deployment task sequence, and then deploying the task sequence to a collection. After deployment, Surface devices are like any other Windows client – to publish apps, settings, and policies, you use the same process that you would use for any other device.
You can find more information about how to use Configuration Manager to deploy and manage devices in the [Documentation for System Center Configuration Manager](https://docs.microsoft.com/sccm/index) article in the TechNet Library. You can find more information about how to use Configuration Manager to deploy and manage devices in the [Documentation for System Center Configuration Manager](https://docs.microsoft.com/sccm/index).
Although the deployment and management of Surface devices is fundamentally the same as any other PC, there are some scenarios that may require additional considerations or steps. This article provides descriptions and guidance for these scenarios; the solutions documented in this article may apply to other devices and manufacturers as well. Although the deployment and management of Surface devices is fundamentally the same as any other PC, there are some scenarios that may require additional considerations or steps. This article provides descriptions and guidance for these scenarios; the solutions documented in this article may apply to other devices and manufacturers as well.

53
education/index.md
View File

@ -1,8 +1,9 @@
--- ---
layout: HubPage layout: HubPage
hide_bc: true hide_bc: true
title: Microsoft Education Documentation | Microsoft Docs title: Microsoft Education documentation and resources | Microsoft Docs
description: TK from Celeste Guzman description: Learn about product documentation and resources available for school IT administrators, teachers, students, and education app developers.
author: CelesteDG
--- ---
<div id="main" class="v2"> <div id="main" class="v2">
<div class="container"> <div class="container">
@ -14,7 +15,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage"> <div class="cardImage">
<img data-hoverimage="/media/common/i_advanced.svg" src="/media/common/i_advanced.svg" alt="" /> <img data-hoverimage="/media/common/i_advanced.svg" src="/media/common/i_advanced.svg" alt="Learn more about Microsoft Education products." />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -32,7 +33,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage"> <div class="cardImage">
<img data-hoverimage="/media/common/i_get-started.svg" src="/media/common/i_get-started.svg" alt="" /> <img data-hoverimage="/media/common/i_get-started.svg" src="/media/common/i_get-started.svg" alt="For IT Pros: Get started with Microsoft Education" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -61,7 +62,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-pro-get-started.svg" alt="" /> <img src="/media/hubs/education/education-pro-get-started.svg" alt="For IT Pros: Get started with Microsoft Education" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -80,7 +81,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-pro-office365.svg" alt="" /> <img src="/media/hubs/education/education-pro-office365.svg" alt="Office 365 for Education" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -99,7 +100,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-pro-intune.svg" alt="" /> <img src="/media/hubs/education/education-pro-intune.svg" alt="Microsoft Intune for Education" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -118,7 +119,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-pro-windows10.svg" alt="" /> <img src="/media/hubs/education/education-pro-windows10.svg" alt="Windows 10 for Education" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -137,7 +138,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-pro-school-data.svg" alt="" /> <img src="/media/hubs/education/education-pro-school-data.svg" alt="School Data Sync" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -156,7 +157,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-pro-azure-directory.svg" alt="" /> <img src="/media/hubs/education/education-pro-azure-directory.svg" alt="Azure Active Directory" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -175,7 +176,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-pro-store.svg" alt="" /> <img src="/media/hubs/education/education-pro-store.svg" alt="Microsoft Store for Education" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -194,7 +195,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-pro-minecraft.svg" alt="" /> <img src="/media/hubs/education/education-pro-minecraft.svg" alt="Minecraft: Educaton Edition" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -223,7 +224,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-teachers-help.svg" alt="" /> <img src="/media/hubs/education/education-teachers-help.svg" alt="Get started for educators" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -242,7 +243,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-teachers-office-help.svg" alt="" /> <img src="/media/hubs/education/education-teachers-office-help.svg" alt="Office help and training" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -261,7 +262,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-teachers-windows-help.svg" alt="" /> <img src="/media/hubs/education/education-teachers-windows-help.svg" alt="Windows help" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -280,7 +281,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-pro-store.svg" alt="" /> <img src="/media/hubs/education/education-pro-store.svg" alt="Microsoft Store for Education" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -299,7 +300,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-pro-minecraft.svg" alt="" /> <img src="/media/hubs/education/education-pro-minecraft.svg" alt="Minecraft: Education Edition" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -318,7 +319,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-teachers-educator-community.svg" alt="" /> <img src="/media/hubs/education/education-teachers-educator-community.svg" alt="Microsoft Educator Community" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -347,7 +348,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-students-help.svg" alt="" /> <img src="/media/hubs/education/education-students-help.svg" alt="Get started for students" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -366,7 +367,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-students-office-help.svg" alt="" /> <img src="/media/hubs/education/education-students-office-help.svg" alt="Office help and training" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -385,7 +386,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-students-windows-help.svg" alt="" /> <img src="/media/hubs/education/education-students-windows-help.svg" alt="Windows help" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -404,7 +405,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-students-imagine.svg" alt="" /> <img src="/media/hubs/education/education-students-imagine.svg" alt="Microsoft Imagine" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -433,12 +434,12 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-developers-uwp-apps.svg" alt="" /> <img src="/media/hubs/education/education-developers-uwp-apps.svg" alt="UWP apps for education" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
<h3>UWP apps for education</h3> <h3>UWP apps for education</h3>
<p>Learn how to write Universal Windows apps for education</p> <p>Learn how to write Universal Windows apps for education.</p>
</div> </div>
</div> </div>
</div> </div>
@ -452,7 +453,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-developers-api-test.svg" alt="" /> <img src="/media/hubs/education/education-developers-api-test.svg" alt="Take a Test API" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
@ -471,7 +472,7 @@ description: TK from Celeste Guzman
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <div class="cardImage bgdAccent1">
<img src="/media/hubs/education/education-developers-office-education.svg" alt="" /> <img src="/media/hubs/education/education-developers-office-education.svg" alt="Office Education Dev Center" />
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">

32
education/windows/windows-editions-for-education-customers.md
View File

@ -1,6 +1,6 @@
--- ---
title: Windows 10 editions for education customers title: Windows 10 editions for education customers
description: Provides an overview of the two editions in Windows 10, version 1607 that's designed for the needs of K-12 institutions. description: Provides an overview of the two Windows 10 editions that are designed for the needs of K-12 institutions.
keywords: Windows 10 Pro Education, Windows 10 Education, Windows 10 editions, education customers keywords: Windows 10 Pro Education, Windows 10 Education, Windows 10 editions, education customers
ms.prod: w10 ms.prod: w10
ms.mktglfcycl: plan ms.mktglfcycl: plan
@ -16,39 +16,45 @@ author: CelesteDG
- Windows 10 - Windows 10
Windows 10 Anniversary Update (Windows 10, version 1607) continues our commitment to productivity, security, and privacy for all customers. Windows 10 Pro and Windows 10 Enterprise offer the functionality and safety features demanded by business and education customers around the globe. Windows 10 is the most secure Windows we’ve ever built. All of our Windows commercial editions can be configured to support the needs of schools, through group policies, domain join, and more. To learn more about Microsoft’s commitment to security and privacy in Windows 10, see more on both [security](https://go.microsoft.com/fwlink/?LinkId=822619) and [privacy](https://go.microsoft.com/fwlink/?LinkId=822620). Windows 10, version 1607 (Anniversary Update) continues our commitment to productivity, security, and privacy for all customers. Windows 10 Pro and Windows 10 Enterprise offer the functionality and safety features demanded by business and education customers around the globe. Windows 10 is the most secure Windows we’ve ever built. All of our Windows commercial editions can be configured to support the needs of schools, through group policies, domain join, and more. To learn more about Microsoft’s commitment to security and privacy in Windows 10, see more on both [security](https://go.microsoft.com/fwlink/?LinkId=822619) and [privacy](https://go.microsoft.com/fwlink/?LinkId=822620).
Windows 10, version 1607 offers a variety of new features and functionality, such as simplified provisioning with the [Set up School PCs app](https://go.microsoft.com/fwlink/?LinkID=821951) or [Windows Configuration Designer](https://go.microsoft.com/fwlink/?LinkId=822623), easier delivery of digital assessments with [Take a Test](https://go.microsoft.com/fwlink/?LinkID=821956), and faster log in performance for shared devices than ever before. These features work with all Windows for desktop editions, excluding Windows 10 Home. You can find more information about Windows 10, version 1607 on [windows.com](http://www.windows.com/). Beginning with version 1607, Windows 10 offers a variety of new features and functionality, such as simplified provisioning with the [Set up School PCs app](https://go.microsoft.com/fwlink/?LinkID=821951) or [Windows Configuration Designer](https://go.microsoft.com/fwlink/?LinkId=822623), easier delivery of digital assessments with [Take a Test](https://go.microsoft.com/fwlink/?LinkID=821956), and faster log in performance for shared devices than ever before. These features work with all Windows for desktop editions, excluding Windows 10 Home. You can find more information on [windows.com](http://www.windows.com/).
Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: [Windows 10 Pro Education](#windows-10-pro-education) and [Windows 10 Education](#windows-10-education). These editions provide education-specific default settings for the evolving landscape in K-12 education IT environments. Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: [Windows 10 Pro Education](#windows-10-pro-education) and [Windows 10 Education](#windows-10-education). These editions provide education-specific default settings for the evolving landscape in K-12 education IT environments.
## Windows 10 Pro Education ## Windows 10 Pro Education
Windows 10 Pro Education builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools. Windows 10 Pro Education is effectively a variant of Windows 10 Pro that provides education-specific default settings, including the removal of Cortana<sup>1</sup>. These default settings disable tips, tricks and suggestions & Windows Store suggestions. More detailed information on these default settings is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). Windows 10 Pro Education builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools. Windows 10 Pro Education is effectively a variant of Windows 10 Pro that provides education-specific default settings. These default settings disable tips, tricks and suggestions & Windows Store suggestions. More detailed information on these default settings is available in [Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627).
> [!NOTE] For Cortana<sup>1</sup>,
> If using Windows 10 Pro Education or Windows 10 Education, upgrading from Windows 10, version 1607 (Anniversary Update) to Windows 10, version 1703 (Creators Update) will enable Cortana. You can use the **AllowCortana** policy to turn it off. For more information, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md). - If you're using version 1607, Cortana is removed.
- If you're using new devices with version 1703, Cortana is turned on by default.
- If you're upgrading from version 1607 to version 1703, Cortana will be enabled.
You can use the **AllowCortana** policy to turn Cortana off. For more information, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md).
Windows 10 Pro Education is available on new devices pre-installed with Windows 10, version 1607 or newer versions that are purchased with discounted K-12 academic licenses through OEM partners (these discounted licenses are sometimes referred to as National Academic or Shape the Future). Windows 10 Pro Education is available on new devices pre-installed with Windows 10, version 1607 or newer versions that are purchased with discounted K-12 academic licenses through OEM partners (these discounted licenses are sometimes referred to as National Academic or Shape the Future).
Existing devices running Windows 10 Pro, currently activated with the original OEM digital product key and purchased with discounted K-12 academic licenses through OEM partners (these discounted licenses are sometimes referred to as National Academic or Shape the Future), will upgrade automatically to Windows 10 Pro Education as part of the Windows 10, version 1607 installation. Existing devices running Windows 10 Pro, currently activated with the original OEM digital product key and purchased with discounted K-12 academic licenses through OEM partners (these discounted licenses are sometimes referred to as National Academic or Shape the Future), will upgrade automatically to Windows 10 Pro Education as part of the Windows 10, version 1607 installation.
Customers with Academic Volume Licensing agreements with rights for Windows can get Windows 10 Pro Education through the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx), available at a later date. Customers with Academic Volume Licensing agreements with rights for Windows can get Windows 10 Pro Education through the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx).
Customers that deploy Windows 10 Pro are able to configure the product to have similar feature settings to Windows 10 Pro Education using policies. More detailed information on these policies and the configuration steps required is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Pro read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment. Customers who deploy Windows 10 Pro are able to configure the product to have similar feature settings to Windows 10 Pro Education using policies. More detailed information on these policies and the configuration steps required is available in Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Pro read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment.
## Windows 10 Education ## Windows 10 Education
Windows 10 Education builds on Windows 10 Enterprise and provides the enterprise-grade manageability and security desired by many schools. Windows 10 Education is effectively a variant of Windows 10 Enterprise that provides education-specific default settings, including the removal of Cortana<sup>1</sup>. These default settings disable tips, tricks and suggestions & Windows Store suggestions. More detailed information on these default settings is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). Windows 10 Education builds on Windows 10 Enterprise and provides the enterprise-grade manageability and security desired by many schools. Windows 10 Education is effectively a variant of Windows 10 Enterprise that provides education-specific default settings. These default settings disable tips, tricks and suggestions & Windows Store suggestions. More detailed information on these default settings is available in [Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627).
> [!NOTE] For Cortana<sup>1</sup>,
> If using Windows 10 Pro Education or Windows 10 Education, upgrading from Windows 10, version 1607 (Anniversary Update) to Windows 10, version 1703 (Creators Update) will enable Cortana. You can use the **AllowCortana** policy to turn it off. For more information, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md). - If you're using version 1607, Cortana<sup>1</sup> is removed.
- If you're using new devices with version 1703, Cortana is turned on by default.
- If you're upgrading from version 1607 to version 1703, Cortana will be enabled.
You can use the **AllowCortana** policy to turn Cortana off. For more information, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md).
Windows 10 Education is available through Microsoft Volume Licensing. Customers who are already running Windows 10 Education can upgrade to Windows 10, version 1607 or newer versions through Windows Update or from the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). We recommend Windows 10 Education to all K-12 customers as it provides the most complete and secure edition for education environments. If you do not have access to Windows 10 Education, contact your Microsoft representative or see more information [here](https://go.microsoft.com/fwlink/?LinkId=822628). Windows 10 Education is available through Microsoft Volume Licensing. Customers who are already running Windows 10 Education can upgrade to Windows 10, version 1607 or newer versions through Windows Update or from the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). We recommend Windows 10 Education to all K-12 customers as it provides the most complete and secure edition for education environments. If you do not have access to Windows 10 Education, contact your Microsoft representative or see more information [here](https://go.microsoft.com/fwlink/?LinkId=822628).
Customers that deploy Windows 10 Enterprise are able to configure the product to have similar feature settings to Windows 10 Education using policies. More detailed information on these policies and the configuration steps required is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Enterprise read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment. Customers who deploy Windows 10 Enterprise are able to configure the product to have similar feature settings to Windows 10 Education using policies. More detailed information on these policies and the configuration steps required is available in [Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Enterprise read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment.
For any other questions, contact [Microsoft Customer Service and Support](https://support.microsoft.com/en-us). For any other questions, contact [Microsoft Customer Service and Support](https://support.microsoft.com/en-us).
@ -62,4 +68,4 @@ For any other questions, contact [Microsoft Customer Service and Support](https:
<sup>1</sup> <small>Cortana available in select markets; experience may vary by region and device. Cortana is disabled in the Windows 10 Pro Education and Windows 10 Education editions.</small> <sup>1</sup> <small>Cortana available in select markets; experience may vary by region and device.</small>

2
store-for-business/distribute-apps-with-management-tool.md
View File

@ -59,7 +59,7 @@ This diagram shows how you can use a management tool to distribute an online-lic
## Related topics ## Related topics
[Configure MDM Provider](configure-mdm-provider-windows-store-for-business.md) [Configure MDM Provider](configure-mdm-provider-windows-store-for-business.md)
[Manage apps you purchased from the Microsoft Store for Business and Education with Microsoft InTune](https://technet.microsoft.com/library/mt676514.aspx) [Manage apps you purchased from the Microsoft Store for Business and Education with Microsoft Intune](https://technet.microsoft.com/library/mt676514.aspx)
   

12
windows/deployment/windows-10-poc-sc-config-mgr.md
View File

@ -4,8 +4,7 @@ description: Deploy Windows 10 in a test lab using System Center Configuration M
ms.prod: w10 ms.prod: w10
ms.mktglfcycl: deploy ms.mktglfcycl: deploy
ms.sitesec: library ms.sitesec: library
ms.pagetype: deploy ms.pagetype: deploykeywords: deployment, automate, tools, configure, sccm, configuration manager
keywords: deployment, automate, tools, configure, sccm, configuration manager
localizationpriority: high localizationpriority: high
author: greg-lindsay author: greg-lindsay
--- ---
@ -15,7 +14,6 @@ author: greg-lindsay
**Applies to** **Applies to**
- Windows 10 - Windows 10
**Important**: This guide leverages the proof of concept (PoC) environment, and some settings that are configured in the following guides: **Important**: This guide leverages the proof of concept (PoC) environment, and some settings that are configured in the following guides:
- [Step by step guide: Deploy Windows 10 in a test lab](windows-10-poc.md) - [Step by step guide: Deploy Windows 10 in a test lab](windows-10-poc.md)
- [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md) - [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md)
@ -26,7 +24,6 @@ The PoC environment is a virtual network running on Hyper-V with three virtual m
- **DC1**: A contoso.com domain controller, DNS server, and DHCP server. - **DC1**: A contoso.com domain controller, DNS server, and DHCP server.
- **SRV1**: A dual-homed contoso.com domain member server, DNS server, and default gateway providing NAT service for the PoC network. - **SRV1**: A dual-homed contoso.com domain member server, DNS server, and default gateway providing NAT service for the PoC network.
- **PC1**: A contoso.com member computer running Windows 7, Windows 8, or Windows 8.1 that has been cloned from a physical computer on your corporate network for testing purposes. - **PC1**: A contoso.com member computer running Windows 7, Windows 8, or Windows 8.1 that has been cloned from a physical computer on your corporate network for testing purposes.
This guide leverages the Hyper-V server role to perform procedures. If you do not complete all steps in a single session, consider using [checkpoints](https://technet.microsoft.com/library/dn818483.aspx) and [saved states](https://technet.microsoft.com/library/ee247418.aspx) to pause, resume, or restart your work. This guide leverages the Hyper-V server role to perform procedures. If you do not complete all steps in a single session, consider using [checkpoints](https://technet.microsoft.com/library/dn818483.aspx) and [saved states](https://technet.microsoft.com/library/ee247418.aspx) to pause, resume, or restart your work.
>Multiple features and services are installed on SRV1 in this guide. This is not a typical installation, and is only done to set up a lab environment with a bare minimum of resources. However, if less than 4 GB of RAM is allocated to SRV1 in the Hyper-V console, some procedures will be extremely slow to complete. If resources are limited on the Hyper-V host, consider reducing RAM allocation on DC1 and PC1, and then increasing the RAM allocation on SRV1. You can adjust RAM allocation for a VM by right-clicking the VM in the Hyper-V Manager console, clicking **Settings**, clicking **Memory**, and modifying the value next to **Maximum RAM**. >Multiple features and services are installed on SRV1 in this guide. This is not a typical installation, and is only done to set up a lab environment with a bare minimum of resources. However, if less than 4 GB of RAM is allocated to SRV1 in the Hyper-V console, some procedures will be extremely slow to complete. If resources are limited on the Hyper-V host, consider reducing RAM allocation on DC1 and PC1, and then increasing the RAM allocation on SRV1. You can adjust RAM allocation for a VM by right-clicking the VM in the Hyper-V Manager console, clicking **Settings**, clicking **Memory**, and modifying the value next to **Maximum RAM**.
@ -38,7 +35,6 @@ This guide provides end-to-end instructions to install and configure System Cent
Topics and procedures in this guide are summarized in the following table. An estimate of the time required to complete each procedure is also provided. Time required to complete procedures will vary depending on the resources available to the Hyper-V host and assigned to VMs, such as processor speed, memory allocation, disk speed, and network speed. Topics and procedures in this guide are summarized in the following table. An estimate of the time required to complete each procedure is also provided. Time required to complete procedures will vary depending on the resources available to the Hyper-V host and assigned to VMs, such as processor speed, memory allocation, disk speed, and network speed.
<div style='font-size:9.0pt'> <div style='font-size:9.0pt'>
<TABLE border=1 cellspacing=0 cellpadding=0> <TABLE border=1 cellspacing=0 cellpadding=0>
<TR><TD BGCOLOR="#a0e4fa"><B>Topic</B><TD BGCOLOR="#a0e4fa"><B>Description</B><TD BGCOLOR="#a0e4fa"><B>Time</B> <TR><TD BGCOLOR="#a0e4fa"><B>Topic</B><TD BGCOLOR="#a0e4fa"><B>Description</B><TD BGCOLOR="#a0e4fa"><B>Time</B>
@ -48,8 +44,7 @@ Topics and procedures in this guide are summarized in the following table. An es
<TR><TD>[Prepare for Zero Touch installation](#prepare-for-zero-touch-installation)<TD>Prerequisite procedures to support Zero Touch installation.<TD>60 minutes <TR><TD>[Prepare for Zero Touch installation](#prepare-for-zero-touch-installation)<TD>Prerequisite procedures to support Zero Touch installation.<TD>60 minutes
<TR><TD>[Create a boot image for Configuration Manager](#create-a-boot-image-for-configuration-manager)<TD>Use the MDT wizard to create the boot image in Configuration Manager.<TD>20 minutes <TR><TD>[Create a boot image for Configuration Manager](#create-a-boot-image-for-configuration-manager)<TD>Use the MDT wizard to create the boot image in Configuration Manager.<TD>20 minutes
<TR><TD>[Create a Windows 10 reference image](#create-a-windows-10-reference-image)<TD>This procedure can be skipped if it was done previously, otherwise instructions are provided to create a reference image.<TD>0-60 minutes <TR><TD>[Create a Windows 10 reference image](#create-a-windows-10-reference-image)<TD>This procedure can be skipped if it was done previously, otherwise instructions are provided to create a reference image.<TD>0-60 minutes
<TR><TD>[Add a Windows 10 operating system image](#add-a-windows-10-operating-system-image)<TD>Add a Windows 10 operating system image and distribute it.<TD>10 minutes <TR><TD>[Add a Windows 10 operating system image](#add-a-windows-10-operating-system-image)<TD>Add a Windows 10 operating system image and distribute it.<TD>10 minutes<TR><TD>[Create a task sequence](#create-a-task-sequence)<TD>Create a Configuration Manager task sequence with MDT integration using the MDT wizard<TD>15 minutes
<TR><TD>[Create a task sequence](#create-a-task-sequence)<TD>Create a Configuration Manager task sequence with MDT integration using the MDT wizard<TD>15 minutes
<TR><TD>[Finalize the operating system configuration](#finalize-the-operating-system-configuration)<TD>Enable monitoring, configure rules, and distribute content.<TD>30 minutes <TR><TD>[Finalize the operating system configuration](#finalize-the-operating-system-configuration)<TD>Enable monitoring, configure rules, and distribute content.<TD>30 minutes
<TR><TD>[Deploy Windows 10 using PXE and Configuration Manager](#deploy-windows-10-using-pxe-and-configuration-manager)<TD>Deploy Windows 10 using Configuration Manager deployment packages and task sequences.<TD>60 minutes <TR><TD>[Deploy Windows 10 using PXE and Configuration Manager](#deploy-windows-10-using-pxe-and-configuration-manager)<TD>Deploy Windows 10 using Configuration Manager deployment packages and task sequences.<TD>60 minutes
<TR><TD>[Replace a client with Windows 10 using Configuration Manager](#replace-a-client-with-windows-10-using-configuration-manager)<TD>Replace a client computer with Windows 10 using Configuration Manager.<TD>90 minutes <TR><TD>[Replace a client with Windows 10 using Configuration Manager](#replace-a-client-with-windows-10-using-configuration-manager)<TD>Replace a client computer with Windows 10 using Configuration Manager.<TD>90 minutes
@ -60,7 +55,6 @@ Topics and procedures in this guide are summarized in the following table. An es
</div> </div>
## Install prerequisites ## Install prerequisites
1. Before installing System Center Configuration Manager, we must install prerequisite services and features. Type the following command at an elevated Windows PowerShell prompt on SRV1: 1. Before installing System Center Configuration Manager, we must install prerequisite services and features. Type the following command at an elevated Windows PowerShell prompt on SRV1:
``` ```
@ -78,7 +72,7 @@ Topics and procedures in this guide are summarized in the following table. An es
This command mounts the .ISO file to drive D on SRV1. This command mounts the .ISO file to drive D on SRV1.
4. Type the following command at an elevated Windows PowerShell prompt on SRV1 to install SQL Server 2012 SP2: 4. Type the following command at an elevated Windows PowerShell prompt on SRV1 to install SQL Server:
``` ```
D:\setup.exe /q /ACTION=Install /ERRORREPORTING="False" /FEATURES=SQLENGINE,RS,IS,SSMS,TOOLS,ADV_SSMS,CONN /INSTANCENAME=MSSQLSERVER /INSTANCEDIR="C:\Program Files\Microsoft SQL Server" /SQLSVCACCOUNT="NT AUTHORITY\System" /SQLSYSADMINACCOUNTS="BUILTIN\ADMINISTRATORS" /SQLSVCSTARTUPTYPE=Automatic /AGTSVCACCOUNT="NT AUTHORITY\SYSTEM" /AGTSVCSTARTUPTYPE=Automatic /RSSVCACCOUNT="NT AUTHORITY\System" /RSSVCSTARTUPTYPE=Automatic /ISSVCACCOUNT="NT AUTHORITY\System" /ISSVCSTARTUPTYPE=Disabled /ASCOLLATION="Latin1_General_CI_AS" /SQLCOLLATION="SQL_Latin1_General_CP1_CI_AS" /TCPENABLED="1" /NPENABLED="1" /IAcceptSQLServerLicenseTerms D:\setup.exe /q /ACTION=Install /ERRORREPORTING="False" /FEATURES=SQLENGINE,RS,IS,SSMS,TOOLS,ADV_SSMS,CONN /INSTANCENAME=MSSQLSERVER /INSTANCEDIR="C:\Program Files\Microsoft SQL Server" /SQLSVCACCOUNT="NT AUTHORITY\System" /SQLSYSADMINACCOUNTS="BUILTIN\ADMINISTRATORS" /SQLSVCSTARTUPTYPE=Automatic /AGTSVCACCOUNT="NT AUTHORITY\SYSTEM" /AGTSVCSTARTUPTYPE=Automatic /RSSVCACCOUNT="NT AUTHORITY\System" /RSSVCSTARTUPTYPE=Automatic /ISSVCACCOUNT="NT AUTHORITY\System" /ISSVCSTARTUPTYPE=Disabled /ASCOLLATION="Latin1_General_CI_AS" /SQLCOLLATION="SQL_Latin1_General_CP1_CI_AS" /TCPENABLED="1" /NPENABLED="1" /IAcceptSQLServerLicenseTerms

2
windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md
View File

@ -27,7 +27,7 @@ You can define custom alert definitions and indicators of compromise (IOC) using
Before creating custom alerts, you'll need to enable the threat intelligence application in Azure Active Directory and generate access tokens. For more information, see [Enable the custom threat intelligence application](enable-custom-ti-windows-defender-advanced-threat-protection.md). Before creating custom alerts, you'll need to enable the threat intelligence application in Azure Active Directory and generate access tokens. For more information, see [Enable the custom threat intelligence application](enable-custom-ti-windows-defender-advanced-threat-protection.md).
### Use the threat intelligence REST API to create custom threat intelligence alerts ### Use the threat intelligence REST API to create custom threat intelligence alerts
You can call and specify the resource URLs using one of the following operations to access and manipulate a threat intelligence resource, you call and specify the resource URLs using one of the following operations: You can call and specify the resource URLs using one of the following operations to access and manipulate a threat intelligence resource:
- GET - GET
- POST - POST