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

Merge branch 'master' of https://cpubwin.visualstudio.com/_git/it-client into maricia-authorname

Browse Source
This commit is contained in:
MariciaAlforque 2018-05-11 12:27:47 -07:00
commit 094dceb50f
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
education/windows/change-to-pro-education.md
View File

@ -17,7 +17,7 @@ ms.date: 04/30/2018
Windows 10 Pro Education is a new offering in Windows 10, version 1607. This edition builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools by providing education-specific default settings. Windows 10 Pro Education is a new offering in Windows 10, version 1607. This edition builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools by providing education-specific default settings.
If you have an education tenant and use devices with Windows 10 Pro, global administrators can opt-in to a free change to Windows 10 Pro Education depending on your scenario. If you have an education tenant and use devices with Windows 10 Pro, global administrators can opt-in to a free change to Windows 10 Pro Education depending on your scenario.
- [Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode](https://www.microsoft.com/en-us/education/windows/s-mode-change-to-edu) - [Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode](https://www.microsoft.com/en-us/education/windows/s-mode-switch-to-edu)
To take advantage of this offering, make sure you meet the [requirements for changing](#requirements-for-changing). For academic customers who are eligible to change to Windows 10 Pro Education, but are unable to use the above methods, contact Microsoft Support for assistance. To take advantage of this offering, make sure you meet the [requirements for changing](#requirements-for-changing). For academic customers who are eligible to change to Windows 10 Pro Education, but are unable to use the above methods, contact Microsoft Support for assistance.

19
windows/privacy/docfx.json
View File

@ -9,8 +9,6 @@
"exclude": [ "exclude": [
"**/obj/**", "**/obj/**",
"**/includes/**", "**/includes/**",
"_themes/**",
"_themes.pdf/**",
"README.md", "README.md",
"LICENSE", "LICENSE",
"LICENSE-CODE", "LICENSE-CODE",
@ -22,21 +20,28 @@
{ {
"files": [ "files": [
"**/*.png", "**/*.png",
"**/*.jpg" "**/*.jpg",
"**/*.gif"
], ],
"exclude": [ "exclude": [
"**/obj/**", "**/obj/**",
"**/includes/**", "**/includes/**"
"_themes/**",
"_themes.pdf/**"
] ]
} }
], ],
"overwrite": [], "overwrite": [],
"externalReference": [], "externalReference": [],
"globalMetadata": { "globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/privacy/breadcrumb/toc.json", "breadcrumb_path": "/windows/privacy/breadcrumb/toc.json",
"extendBreadcrumb": true "extendBreadcrumb": true,
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "daniha",
"ms.date": "05/10/2018",
"feedback_system": "GitHub",
"feedback_github_repo": "MicrosoftDocs/windows-itpro-docs",
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app"
}, },
"fileMetadata": {}, "fileMetadata": {},
"template": [], "template": [],