Merge branch 'master' into vs-win10gdproverview

This commit is contained in:
eross-msft
2017-09-24 14:49:15 -07:00
22 changed files with 1349 additions and 558 deletions

View File

@ -1,270 +1,12 @@
{
"build_entry_point": "",
"need_generate_pdf": false,
"need_generate_intellisense": false,
"docsets_to_publish": [
{
"docset_name": "mdop-VSTS",
"build_source_folder": "mdop",
"build_output_subfolder": "mdop-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-manage-VSTS",
"build_source_folder": "windows/manage",
"build_output_subfolder": "windows-manage-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "smb-VSTS",
"build_source_folder": "smb",
"build_output_subfolder": "smb-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "surface-hub-VSTS",
"build_source_folder": "devices/surface-hub",
"build_output_subfolder": "surface-hub-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "microsoft-edge-VSTS",
"build_source_folder": "browsers/edge",
"build_output_subfolder": "microsoft-edge-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-development-VSTS",
"build_source_folder": "windows/deployment",
"build_output_subfolder": "win-development-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-plan-VSTS",
"build_source_folder": "windows/plan",
"build_output_subfolder": "windows-plan-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-client-management-VSTS",
"build_source_folder": "windows/client-management",
"build_output_subfolder": "win-client-management-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-threat-protection-VSTS",
"build_source_folder": "windows/threat-protection",
"build_output_subfolder": "win-threat-protection-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-app-management-VSTS",
"build_source_folder": "windows/application-management",
"build_output_subfolder": "win-app-management-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-deploy-VSTS",
"build_source_folder": "windows/deploy",
"build_output_subfolder": "windows-deploy-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "keep-secure-VSTS",
"build_source_folder": "windows/keep-secure",
"build_output_subfolder": "keep-secure-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "surface-VSTS",
"build_source_folder": "devices/surface",
"build_output_subfolder": "surface-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-hub-VSTS",
"build_source_folder": "windows/hub",
"build_output_subfolder": "windows-hub-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "internet-explorer-VSTS",
"build_source_folder": "browsers/internet-explorer",
"build_output_subfolder": "internet-explorer-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "bcs-VSTS",
"build_source_folder": "bcs",
"build_output_subfolder": "bcs-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
@ -273,40 +15,7 @@
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-access-protection-VSTS",
"build_source_folder": "windows/access-protection",
"build_output_subfolder": "win-access-protection-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-device-security-VSTS",
"build_source_folder": "windows/device-security",
"build_output_subfolder": "win-device-security-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
@ -315,7 +24,6 @@
"build_output_subfolder": "education-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
@ -324,32 +32,31 @@
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "store-for-business-VSTS",
"build_source_folder": "store-for-business",
"build_output_subfolder": "store-for-business-VSTS",
"docset_name": "gdpr",
"build_source_folder": "gdpr",
"build_output_subfolder": "gdpr",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"moniker_ranges": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
"template_folder": "_themes"
},
{
"docset_name": "win-configuration-VSTS",
"build_source_folder": "windows/configuration",
"build_output_subfolder": "win-configuration-VSTS",
"docset_name": "internet-explorer-VSTS",
"build_source_folder": "browsers/internet-explorer",
"build_output_subfolder": "internet-explorer-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
@ -358,40 +65,7 @@
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-update-VSTS",
"build_source_folder": "windows/update",
"build_output_subfolder": "windows-update-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "win-whats-new-VSTS",
"build_source_folder": "windows/whats-new",
"build_output_subfolder": "win-whats-new-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
@ -400,7 +74,6 @@
"build_output_subfolder": "itpro-hololens-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
@ -409,15 +82,15 @@
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "windows-configure-VSTS",
"build_source_folder": "windows/configure",
"build_output_subfolder": "windows-configure-VSTS",
"docset_name": "keep-secure-VSTS",
"build_source_folder": "windows/keep-secure",
"build_output_subfolder": "keep-secure-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
@ -426,6 +99,24 @@
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "mdop-VSTS",
"build_source_folder": "mdop",
"build_output_subfolder": "mdop-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
@ -434,7 +125,6 @@
"build_output_subfolder": "microsoft-365",
"locale": "en-us",
"monikers": [],
"moniker_groups": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
@ -443,6 +133,330 @@
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "microsoft-edge-VSTS",
"build_source_folder": "browsers/edge",
"build_output_subfolder": "microsoft-edge-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "smb-VSTS",
"build_source_folder": "smb",
"build_output_subfolder": "smb-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "store-for-business-VSTS",
"build_source_folder": "store-for-business",
"build_output_subfolder": "store-for-business-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "surface-hub-VSTS",
"build_source_folder": "devices/surface-hub",
"build_output_subfolder": "surface-hub-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "surface-VSTS",
"build_source_folder": "devices/surface",
"build_output_subfolder": "surface-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "win-access-protection-VSTS",
"build_source_folder": "windows/access-protection",
"build_output_subfolder": "win-access-protection-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "win-app-management-VSTS",
"build_source_folder": "windows/application-management",
"build_output_subfolder": "win-app-management-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "win-client-management-VSTS",
"build_source_folder": "windows/client-management",
"build_output_subfolder": "win-client-management-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "win-configuration-VSTS",
"build_source_folder": "windows/configuration",
"build_output_subfolder": "win-configuration-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "win-development-VSTS",
"build_source_folder": "windows/deployment",
"build_output_subfolder": "win-development-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "win-device-security-VSTS",
"build_source_folder": "windows/device-security",
"build_output_subfolder": "win-device-security-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "windows-configure-VSTS",
"build_source_folder": "windows/configure",
"build_output_subfolder": "windows-configure-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "windows-deploy-VSTS",
"build_source_folder": "windows/deploy",
"build_output_subfolder": "windows-deploy-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "windows-hub-VSTS",
"build_source_folder": "windows/hub",
"build_output_subfolder": "windows-hub-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "windows-manage-VSTS",
"build_source_folder": "windows/manage",
"build_output_subfolder": "windows-manage-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "windows-plan-VSTS",
"build_source_folder": "windows/plan",
"build_output_subfolder": "windows-plan-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "windows-update-VSTS",
"build_source_folder": "windows/update",
"build_output_subfolder": "windows-update-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "win-threat-protection-VSTS",
"build_source_folder": "windows/threat-protection",
"build_output_subfolder": "win-threat-protection-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
},
{
"docset_name": "win-whats-new-VSTS",
"build_source_folder": "windows/whats-new",
"build_output_subfolder": "win-whats-new-VSTS",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"moniker_groups": [],
"version": 0
}
],
@ -452,9 +466,11 @@
"branches_to_filter": [
""
],
"git_repository_url_open_to_public_contributors": "https://cpubwin.visualstudio.com/_git/it-client",
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/windows-itpro-docs",
"git_repository_branch_open_to_public_contributors": "master",
"skip_source_output_uploading": false,
"need_preview_pull_request": true,
"resolve_user_profile_using_github": true,
"dependent_repositories": [
{
"path_to_root": "_themes.pdf",
@ -480,7 +496,8 @@
]
},
"need_generate_pdf_url_template": true,
"resolve_user_profile_using_github": true,
"need_generate_pdf": false,
"need_generate_intellisense": false,
"Targets": {
"Pdf": {
"template_folder": "_themes.pdf"

View File

@ -0,0 +1,82 @@
<svg id="Illustrations" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 140">
<defs>
<style>
.cls-1 {
fill: none;
stroke: #bad80a;
}
.cls-1, .cls-2, .cls-3, .cls-6, .cls-9 {
stroke-miterlimit: 10;
stroke-width: 2px;
}
.cls-2, .cls-3, .cls-6, .cls-8, .cls-9 {
fill: #fff;
}
.cls-2 {
stroke: #ababab;
}
.cls-3 {
stroke: #55d2f6;
}
.cls-4 {
fill: #ffc52b;
}
.cls-5 {
fill: #ffb900;
}
.cls-6 {
stroke: #2bc7f4;
}
.cls-7 {
fill: #2bc7f4;
}
.cls-9 {
stroke: #556a8a;
}
.cls-10 {
fill: #c2c2c2;
}
</style>
</defs>
<title>ms365enterprise-partner-fastrack-3</title>
<g>
<polyline class="cls-1" points="212.84 92.22 212.84 46.89 255 71.03 212.62 92.66"/>
<g>
<g>
<polygon class="cls-2" points="224.55 18 236.93 39.5 224.55 61 199.8 61 187.42 39.5 199.8 18 224.55 18"/>
<polygon class="cls-3" points="281.75 50 294.13 71.5 281.75 93 257 93 244.62 71.5 257 50 281.75 50"/>
</g>
<polygon class="cls-2" points="224.55 78 236.93 99.5 224.55 121 199.8 121 187.42 99.5 199.8 78 224.55 78"/>
</g>
<g>
<path class="cls-4" d="M281,57.35,291.17,40.5H279L262.9,63.83h11.66l-10.8,20.06,10-8.89,3.82-3.41L294,57.35Z"/>
<path class="cls-5" d="M281,57.35,291.17,40.5h-7L268.08,63.83h11.66l-6,11.17,3.82-3.41L294,57.35Z"/>
</g>
<polygon class="cls-6" points="170.5 34 192 71 170.5 108 127.5 108 106 71 127.5 34 170.5 34"/>
<g>
<path class="cls-7" d="M170,74h-5V53l3-4-3-10h-4l-3,10,3,4V74h-5v6h3c0,2-2,4-3,4.08V96.5c0,3.3,2,5.5,4,5.5h6c2,0,4-2.7,4-6V84c-1,0-3-2-3-4h3Z"/>
<rect class="cls-8" x="160" y="82" width="2" height="17"/>
<rect class="cls-8" x="164" y="82" width="2" height="17"/>
<path class="cls-9" d="M150,50.5a12,12,0,0,0-7-10.91V47.5l-5,4-5-4V39.59a12,12,0,0,0,0,21.81V96.5a4,4,0,0,0,4,4h1a4,4,0,0,0,4-4V61.8A12,12,0,0,0,150,50.5Z"/>
<rect class="cls-10" x="134" y="91" width="7" height="5"/>
</g>
<g>
<circle class="cls-9" cx="212.18" cy="34.18" r="7.71"/>
<path class="cls-9" d="M200.18,54.18a12,12,0,0,1,24,0"/>
</g>
<g>
<circle class="cls-9" cx="212.18" cy="93.86" r="7.71"/>
<path class="cls-9" d="M200.18,113.86a12,12,0,0,1,24,0"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -0,0 +1,123 @@
<svg id="Illustrations" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 140">
<defs>
<style>
.cls-1, .cls-14, .cls-5 {
fill: #fff;
}
.cls-1, .cls-6 {
stroke: #556a8a;
}
.cls-1, .cls-12, .cls-14, .cls-6 {
stroke-miterlimit: 10;
stroke-width: 2px;
}
.cls-2 {
fill: #80def9;
opacity: 0.7;
}
.cls-3 {
fill: #556a8a;
}
.cls-4 {
fill: #e5e5e5;
}
.cls-5 {
opacity: 0.8;
}
.cls-12, .cls-6, .cls-7 {
fill: none;
}
.cls-8 {
fill: #7750a3;
}
.cls-9 {
fill: #9273b6;
}
.cls-10 {
fill: #2bc7f4;
}
.cls-11 {
fill: #ababab;
}
.cls-12 {
stroke: #ababab;
}
.cls-13 {
fill: #55d2f6;
}
.cls-14 {
stroke: #00bcf2;
}
.cls-15 {
fill: #3a96dd;
}
.cls-16 {
fill: #e6e6e6;
}
.cls-17 {
fill: #f2f2f2;
}
.cls-18 {
fill: #bad80a;
}
</style>
</defs>
<title>ms365enterprise-partner-news-2</title>
<g>
<path class="cls-1" d="M116.21,115h0Z"/>
<path class="cls-2" d="M185.9,67.69a39.37,39.37,0,0,1,77.71-1.23,26.79,26.79,0,0,1,43,13.62,23.42,23.42,0,1,1,5.56,46.16H180.43C167.06,123.52,157,111.12,157,97A29.27,29.27,0,0,1,185.9,67.69Z"/>
<path class="cls-2" d="M80.75,41.86a33.72,33.72,0,0,1,66.56-1.06,22.95,22.95,0,0,1,36.86,11.66A20.06,20.06,0,1,1,188.93,92H76.07C64.62,89.68,56,79.06,56,66.93A25.07,25.07,0,0,1,80.75,41.86Z"/>
<g>
<g>
<path class="cls-3" d="M126,21.43H112.21c-1.36,0-3.21,1.11-3.21,2.47v84c0,5.06,1.35,7.07,5.16,7.07,5.42,0,11.84-9.35,11.84-19.83Z"/>
<path class="cls-4" d="M230,17v88.6c0,6.5-2,9.39-9.19,9.39H113c1.21,0,8-.71,8-7.1,0-6.72-.06-75.29,0-90.89Z"/>
<polygon class="cls-5" points="230 17 230 86 158.48 17 230 17"/>
<path class="cls-6" d="M121,17c-.06,15.6,0,84.17,0,90.89,0,6.39-6.79,7.05-8,7.1H220.81c7.23,0,9.19-2.89,9.19-9.39V17Z"/>
<rect class="cls-7" x="108" y="-1" width="128" height="128" transform="translate(344 126) rotate(-180)"/>
</g>
<rect class="cls-8" x="135" y="32" width="78" height="8"/>
<rect class="cls-9" x="135" y="74" width="48" height="8"/>
<rect class="cls-10" x="135" y="47" width="29" height="20"/>
<rect class="cls-11" x="190" y="74" width="23" height="27"/>
<line class="cls-12" x1="170" y1="48" x2="212" y2="48"/>
<line class="cls-12" x1="171" y1="66" x2="213" y2="66"/>
<line class="cls-12" x1="136" y1="90" x2="183" y2="90"/>
<line class="cls-12" x1="136" y1="99" x2="183" y2="99"/>
<line class="cls-12" x1="170" y1="57" x2="212" y2="57"/>
<polygon class="cls-13" points="164 47 164 64 147 47 164 47"/>
</g>
</g>
<path class="cls-14" d="M310.65,59.88a16.11,16.11,0,0,0-2.9-4.86,22.4,22.4,0,0,0-6.16-5.45V49A18.08,18.08,0,0,0,283.54,31.2,17.75,17.75,0,0,0,274,33.87a24.17,24.17,0,0,0-19.4-9.81A23.79,23.79,0,0,0,230.7,47.47c0,.89.22,1.56.22,2.45C224,53.27,220,59.06,220,66.42c0,10.52,8.27,18.94,19.23,19.56,1,7.3,10.21,13,21.42,13,9.55,0,17.64-4.15,20.45-9.9a22.31,22.31,0,0,0,29.54-29.23Z"/>
<path class="cls-3" d="M239.3,72.9h3.41l-.09-18H239.3c-2.2,0-4.65,4.35-4.62,9S237.1,72.92,239.3,72.9Z"/>
<path class="cls-15" d="M237.26,64c0-5,1.74-9,3.94-9A14,14,0,0,1,243,55c1.91.67,2.25,4.46,2.27,8.93s.22,8.36-1.72,9c-.17.05-2,0-2.22,0C239.09,73,237.28,69,237.26,64Z"/>
<path class="cls-6" d="M261,67.65h-2.7a7.65,7.65,0,1,0,0,15.3H261a7.65,7.65,0,1,0,0-15.3Z"/>
<path class="cls-16" d="M281.69,64v-.08c0-8.74,1-15.81,3-19-3.7,1.91-12.29,4.88-22.83,7.61-5,1.3-19.12,3.36-19.17,3.39-1.53,1.53-1.9,5.59-2,7.37,0,.27,0,.48,0,.63,0,1.13.24,6.24,2,8,0,0,14.21,2.09,19.17,3.39,10.54,2.73,19.13,5.7,22.83,7.61-1.6-2.54-2.56-7.62-2.87-14.07C281.73,67.32,281.69,65.69,281.69,64Z"/>
<g>
<path class="cls-17" d="M284.67,82.95c-3.7-1.91-12.29-4.88-22.83-7.61-5-1.3-19.12-3.36-19.17-3.39-1.76-1.76-2-8.36-1.65-7.8,0,0,12,1.55,18.65,2.8s22,6,22,6C281.65,78.57,283.07,80.41,284.67,82.95Z"/>
<path class="cls-6" d="M281.69,63.95v0c0-8,.83-14.61,2.5-18.08.15-.32-.38,0-.21-.3-.47.24.81-.56.19-.28a168.81,168.81,0,0,1-22.33,7.31c-5,1.3-19.12,3.36-19.17,3.39-1.76,1.76-2,6.87-2,8s.24,6.24,2,8c.05,0,14.21,2.09,19.17,3.39,10.54,2.73,17.5,5.11,21.2,7-.25-.39,1,.61.75.09-1.52-3.58-2.1-10.83-2.1-18.47Z"/>
<path class="cls-18" d="M293.2,64c0,8.33-2.32,15.48-4.24,18.7-.68,1.15-1.45,1.8-2.25,1.8a2.59,2.59,0,0,1-2-1.36c-1.58-2.27-2.81-7.18-3.29-13.28-.15-1.86-.23-3.82-.23-5.86s.08-4,.23-5.9c.49-6.08,1.71-11,3.29-13.23a2.58,2.58,0,0,1,2-1.37c.8,0,1.57.64,2.25,1.81C290.88,48.5,293.2,55.66,293.2,64Z"/>
<path class="cls-3" d="M288.67,63.95a6,6,0,0,1-6,6,6.09,6.09,0,0,1-1.22-.12c-.15-1.86-.23-3.82-.23-5.86s.08-4,.23-5.9a6.08,6.08,0,0,1,1.22-.12A6,6,0,0,1,288.67,63.95Z"/>
<path class="cls-6" d="M293.2,64c0,8.33-2.32,15.48-4.24,18.7-.68,1.15-1.45,1.8-2.25,1.8a2.57,2.57,0,0,1-2-1.36c-2.06-3-3.52-10.4-3.52-19.14s1.46-16.17,3.52-19.13a2.59,2.59,0,0,1,2-1.37c.8,0,1.57.65,2.25,1.81C290.88,48.49,293.2,55.66,293.2,64Z"/>
</g>
<line class="cls-6" x1="297.2" y1="63.47" x2="320.2" y2="63.47"/>
<line class="cls-6" x1="297.42" y1="56.47" x2="317.2" y2="44.73"/>
<line class="cls-6" x1="317.2" y1="82.21" x2="297.42" y2="70.47"/>
</svg>

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -0,0 +1,72 @@
<svg id="Illustrations" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 140">
<defs>
<style>
.cls-1, .cls-5 {
fill: #fff;
}
.cls-2 {
fill: #80def9;
opacity: 0.7;
}
.cls-3, .cls-6 {
fill: none;
stroke-miterlimit: 10;
stroke-width: 2px;
}
.cls-3 {
stroke: #556a8a;
}
.cls-4 {
fill: #556a8a;
}
.cls-5 {
opacity: 0.2;
}
.cls-6 {
stroke: #868787;
}
.cls-7 {
fill: #e5e5e5;
}
.cls-8 {
fill: #bad80a;
}
</style>
</defs>
<title>ms365enterprise-partner-resource-training-1</title>
<g>
<path class="cls-1" d="M287,26v76a2,2,0,0,1-2,2H167a2,2,0,0,1-2-2V26a2,2,0,0,1,2-2H285A2,2,0,0,1,287,26Z"/>
<path class="cls-2" d="M180,25v79H167a2,2,0,0,1-1-.29V25Z"/>
<path class="cls-2" d="M273,25v79h13a2,2,0,0,0,1-.29V25Z"/>
<rect class="cls-3" x="165.04" y="24" width="122" height="80" rx="2" ry="2"/>
<rect class="cls-4" x="159" y="21" width="135" height="5"/>
<path class="cls-4" d="M101,92.93V131.5h11.09c1.54-13.16,3.6-30.57,3.94-32.83.43-2.76,4.7-2.76,5.12,0,.35,2.26,2.74,19.67,4.45,32.83H136v-41h6l-.33-12.33L141,53l8.42,2.19a4.54,4.54,0,0,0,1.93.25,4.49,4.49,0,0,0,1.48-.38l19-9.45a4.54,4.54,0,1,0-3.75-8.27l-16.63,6.83-15.9-4.68c-.93-.28-1.91-.57-2.94-.86l0,0c-2.06-.58-4.18-1.16-5.79-1.59l-2.7-.72-6,12.48H118l-6-12.48s-5.77,1.3-9.89,2.39l-1.63.44A8.84,8.84,0,0,0,95,43.48a11.43,11.43,0,0,0-1.28,4.42c-.61,6.36-.6,20.59-1.12,26.31-.19,2-.2,8.56,2.07,11.48A88.76,88.76,0,0,0,101,92.93Z"/>
<path class="cls-5" d="M171.84,45.58l-19,9.45a4.49,4.49,0,0,1-1.48.38,4.54,4.54,0,0,1-1.93-.25L141,53l.67,25.2L142,90.5l-47-47a8.84,8.84,0,0,1,5.55-4.38l1.63-.44c4.12-1.09,9.89-2.39,9.89-2.39l6,12.48h.1l6-12.48,2.7.72c1.61.43,3.73,1,5.79,1.59l0,0c1,.29,2,.58,2.94.86l15.9,4.68,16.63-6.83a4.54,4.54,0,1,1,3.75,8.27Z"/>
<ellipse class="cls-4" cx="117.98" cy="20.96" rx="10" ry="12.46"/>
<g>
<path class="cls-4" d="M200.36,50h-1.44V39.11a3.34,3.34,0,0,1-.49.38,8,8,0,0,1-.72.43q-.4.21-.84.4a6.13,6.13,0,0,1-.87.29V39.15a8.37,8.37,0,0,0,1-.36q.53-.22,1-.5t1-.58a7.71,7.71,0,0,0,.79-.59h.54Z"/>
<path class="cls-4" d="M201.88,58.7a2.62,2.62,0,0,0-.18-1,2,2,0,0,0-1.23-1.14,2.87,2.87,0,0,0-.91-.14,3,3,0,0,0-.83.11,4,4,0,0,0-.79.32,4.94,4.94,0,0,0-.74.48,5.4,5.4,0,0,0-.66.62V56.4a4.3,4.3,0,0,1,1.36-.9,4.78,4.78,0,0,1,1.83-.31,4.42,4.42,0,0,1,1.43.22,3.28,3.28,0,0,1,1.14.65,3,3,0,0,1,.76,1.06,3.6,3.6,0,0,1,.28,1.45,5,5,0,0,1-.17,1.35,4.22,4.22,0,0,1-.52,1.14,5.51,5.51,0,0,1-.87,1,12.39,12.39,0,0,1-1.24,1q-.89.63-1.46,1.08a6.36,6.36,0,0,0-.91.84,2.4,2.4,0,0,0-.47.78,2.71,2.71,0,0,0-.14.9h6.28V68h-7.78v-.62a5.2,5.2,0,0,1,.18-1.42,3.7,3.7,0,0,1,.58-1.17,6.45,6.45,0,0,1,1.06-1.11q.65-.55,1.6-1.25a10,10,0,0,0,1.15-.94,4.85,4.85,0,0,0,.74-.9,3.19,3.19,0,0,0,.4-.91A3.88,3.88,0,0,0,201.88,58.7Z"/>
<path class="cls-4" d="M203.47,83.43a3.67,3.67,0,0,1-.32,1.55,3.43,3.43,0,0,1-.9,1.2,4.19,4.19,0,0,1-1.4.77,5.67,5.67,0,0,1-1.8.27,5.24,5.24,0,0,1-2.87-.69V85a4.59,4.59,0,0,0,2.92,1,4,4,0,0,0,1.19-.17,2.66,2.66,0,0,0,.91-.48,2.15,2.15,0,0,0,.59-.76,2.4,2.4,0,0,0,.21-1q0-2.47-3.52-2.47h-1V79.87h1q3.11,0,3.11-2.32,0-2.14-2.37-2.14a4,4,0,0,0-2.5.9v-1.4a5.48,5.48,0,0,1,2.87-.72,4.4,4.4,0,0,1,1.43.22,3.28,3.28,0,0,1,1.1.62,2.71,2.71,0,0,1,.71.95,2.91,2.91,0,0,1,.25,1.22,3.08,3.08,0,0,1-2.51,3.2v0a4,4,0,0,1,1.19.31,3.17,3.17,0,0,1,.94.63,2.82,2.82,0,0,1,.62.91A2.92,2.92,0,0,1,203.47,83.43Z"/>
<line class="cls-6" x1="212" y1="45" x2="245" y2="45"/>
<line class="cls-6" x1="212" y1="62" x2="245" y2="62"/>
<line class="cls-6" x1="212" y1="79" x2="245" y2="79"/>
</g>
<g>
<rect class="cls-4" x="252" y="83.57" width="2" height="25" rx="0.5" ry="0.5"/>
<path class="cls-1" d="M307,84.5,278,73.57,249,84.5l9,4v15.74c0,5.56,9.16,10.26,20,10.26s20-4.7,20-10.26V88.5Z"/>
<polygon class="cls-7" points="249.52 84.5 278.52 73.57 306.52 84.5 278.52 96.5 249.52 84.5"/>
<polygon class="cls-8" points="299.09 88.18 278.52 96.94 259.09 88.73 258.82 93.27 278.52 101.6 299.09 92.91 299.09 88.18"/>
<path class="cls-3" d="M308,84.5,279,73.57,250,84.5l9,4v15.74c0,5.56,9.16,10.26,20,10.26s20-4.7,20-10.26V88.5Z"/>
<path class="cls-4" d="M251,109v-4c0-2.2.72-4,1.6-4h.8c.88,0,1.6,1.8,1.6,4v4Z"/>
<polyline class="cls-3" points="257.73 87.91 278.52 96.5 301.27 87.45"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@ -123,6 +123,7 @@ description: Learn about the product documentation and resources available for M
</li>
</ul>
</li>
<!--
<li>
<a href="#user-mgmt">User management</a>
<ul id="user-mgmt" class="cardsC">
@ -171,14 +172,72 @@ description: Learn about the product documentation and resources available for M
</li>
</ul>
</li>
-->
<li>
<a href="#device-mgmt">Device management</a>
<ul id="device-mgmt" class="cardsC">
<a href="#user-device-mgmt">User and device management</a>
<ul id="user-device-mgmt" class="cardsC">
<li class="fullSpan">
<div class="container intro">
<p>Find help on managing your organization's devices from the Microsoft 365 Business admin center.</p>
<p>Manage customers/users in your organization and find help on managing your organization's devices from the Microsoft 365 Business admin center.</p>
</div>
</li>
<li>
<a href="https://support.office.com/article/96153102-1db1-4df8-bca5-38cea80b65ce" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-user-management-add-customer-1.svg" alt="Add a new user and assign licenses" />
</div>
</div>
<div class="cardText">
<h3>Add a new customer/user</h3>
<p>Onboarding a new user? Use the admin center to add a new user and assign licenses.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://support.office.com/article/d5155593-3bac-4d8d-9d8b-f4513a81479e" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-user-management-remove-customer-2.svg" alt="Follow the links to remove a customer/user" />
</div>
</div>
<div class="cardText">
<h3>Remove a customer/user</h3>
<p>Need to remove a user? You'll need to <a href="https://support.office.com/article/80bdae57-f8bc-4e40-a58c-956007117ecb">remove company data from devices</a> and <a href="https://support.office.com/article/c4db6caf-74df-4734-b1dd-53e371c7a3c3">reset Windows 10 devices to their factory settings</a>.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://support.office.com/article/2d7ff45e-0da0-4caa-89a9-48cabf41f193" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-upgrade-2.svg" alt="Upgrade to Windows 10" />
</div>
</div>
<div class="cardText">
<h3>Set up Windows devices for Microsoft 365 Business users</h3>
<p>Once you've upgraded your device to Windows 10 Pro, join it to your organization's Azure AD, and get it ready for use.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://support.office.com/article/ed34fff3-2881-4ed4-9906-1ba6bb8dd804" target="_blank">
<div class="cardSize">
@ -272,12 +331,88 @@ description: Learn about the product documentation and resources available for M
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-policies-set-device-config-1.svg" alt="Set device configurations for Windows 10 PCs" />
<img src="images/bcs-partner-policies-set-device-config-1.svg" alt="Set device protection settings for Windows 10 PCs" />
</div>
</div>
<div class="cardText">
<h3>Set device configurations for Windows 10 PCs</h3>
<p>Learn how to create, edit, or delete an app management policy in Microsoft 365 Business.</p>
<h3>Set device protection settings for Windows 10 PCs</h3>
<p>Learn how to secure Windows 10 PCs and what settings you can configure.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://support.office.com/article/02e74022-44af-414b-9d74-0ebf5c2197f0" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-policies-set-device-config-1.svg" alt="Set app protection settings for Windows 10 devices" />
</div>
</div>
<div class="cardText">
<h3>Set app protection settings for Windows 10 devices</h3>
<p>Learn how to create and assign app protection settings for Windows 10 devices and what settings you can configure.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://support.office.com/article/6f2b80b4-81c3-4714-a7bc-ae69313e8a33" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-iw-devicesetup-setup-1.svg" alt="Set app protection settings for Android or iOS devices" />
</div>
</div>
<div class="cardText">
<h3>Set app protection settings for Android or iOS devices</h3>
<p>Learn how to create, edit, or delete an app management policy for Android or iOS devices, and what settings you can configure.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://support.office.com/article/f3433b6b-02f7-447f-9d62-306bf03638b0" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-password-3.svg" alt="Validate app protection settings on Android devices" />
</div>
</div>
<div class="cardText">
<h3>Validate app protection settings on Android devices</h3>
<p>Follow the steps to confirm that the settings you chose are working on Android devices.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://support.office.com/article/2ec03d29-cc1d-4e74-a985-fb55a4b62966" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-password-3.svg" alt="Validate app protection settings on iOS devices" />
</div>
</div>
<div class="cardText">
<h3>Validate app protection settings on iOS devices</h3>
<p>Follow the steps to confirm that the settings you chose are working on iOS devices.</p>
</div>
</div>
</div>
@ -369,162 +504,7 @@ description: Learn about the product documentation and resources available for M
</div>
</div>
</a>
</li>
<li>
<a href="https://support.office.com/article/2d7ff45e-0da0-4caa-89a9-48cabf41f193" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-upgrade-2.svg" alt="Upgrade to Windows 10" />
</div>
</div>
<div class="cardText">
<h3>Upgrade to Windows 10</h3>
<p>Set up Windows 10 PCs for Microsoft 365 Business users.</p>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</li>
<li>
<a href="#troub-support">Troubleshooting and support</a>
<ul id="troub-support" class="cardsC">
<li class="fullSpan">
<div class="container intro">
<p>Looking for help or can't find what you need? Try these resources.</p>
</div>
</li>
<li>
<a href="https://www.microsoft.com/solution-providers/search" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-find-partner-1.svg" alt="Find a Microsoft-certified service provider" />
</div>
</div>
<div class="cardText">
<h3>Find a Partner</h3>
<p>Visit the Microsoft Partner Center to locate a Microsoft-certified solution provider who can help you locally or remotely. </p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://support.office.com/article/496e690b-b75d-4ff5-bf34-cc32905d0364#bkmk_support" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-technical-support-4.svg" alt="Submit a technical support request for Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
<h3>Microsoft Technical Support</h3>
<p>Submit a technical support request for Microsoft 365 Business.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-troubleshooting-3.svg" alt="Find solutions for common Microsoft 365 Business issues" />
</div>
</div>
<div class="cardText">
<h3>Troubleshoot problems - Coming soon</h3>
<p>Find solutions for common Microsoft 365 Business issues.</p>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</li>
<li>
<a href="#adv-mgmt">Advanced management</a>
<ul id="adv-mgmt" class="cardsC">
<li class="fullSpan">
<div class="container intro">
<p>See these links for more in-depth information about these products and features.</p>
</div>
</li>
<!--
<li>
<a href="https://docs.microsoft.com/intune">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-intune-1.svg" alt="Microsoft Intune" />
</div>
</div>
<div class="cardText">
<h3>Microsoft Intune</h3>
<p>Need to update other policies or take advantage of the full Intune capabilities? </p>
</div>
</div>
</div>
</div>
</a>
</li>
-->
<li>
<a href="https://docs.microsoft.com/en-us/windows/windows-10/" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-windows10-2.svg" alt="Learn more about Windows 10" />
</div>
</div>
<div class="cardText">
<h3>Windows 10</h3>
<p>Find out what's new, how to apply custom configurations to devices, managing apps, deployment, and more.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://msdn.microsoft.com/partner-center/autopilot" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-auto-pilot-3.svg" alt="Use Windows AutoPilot to deploy Windows 10 devices" />
</div>
</div>
<div class="cardText">
<h3>Set up Windows 10 devices using Windows AutoPilot</h3>
<p>Deploy Windows 10 devices using Windows AutoPilot from the Partner Center.</p>
</div>
</div>
</div>
</div>
</a>
</li>
</li>
</ul>
</li>
<li>
@ -573,27 +553,6 @@ description: Learn about the product documentation and resources available for M
</div>
</a>
</li>
<!--
<li>
<a href="#">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management- management-4_placeholder.svg" alt="Manage changes" />
</div>
</div>
<div class="cardText">
<h3>Change management</h3>
<p>tbd</p>
</div>
</div>
</div>
</div>
</a>
</li>
-->
<li>
<a href="https://support.office.com/article/74a1ef8b-3844-4d08-9980-9f8f7a36000f" target="_blank">
<div class="cardSize">
@ -696,6 +655,314 @@ description: Learn about the product documentation and resources available for M
</li>
</ul>
</li>
<li>
<a href="#adv-mgmt">Advanced management</a>
<ul id="adv-mgmt" class="cardsC">
<li class="fullSpan">
<div class="container intro">
<p>See these links for more in-depth information about these products and features.</p>
</div>
</li>
<li>
<a href="https://docs.microsoft.com/en-us/windows/windows-10/" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-windows10-2.svg" alt="Learn more about Windows 10" />
</div>
</div>
<div class="cardText">
<h3>Windows 10</h3>
<p>Find out what's new, how to apply custom configurations to devices, managing apps, deployment, and more.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://msdn.microsoft.com/partner-center/autopilot" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-auto-pilot-3.svg" alt="Use Windows AutoPilot to deploy Windows 10 devices" />
</div>
</div>
<div class="cardText">
<h3>Set up Windows 10 devices using Windows AutoPilot</h3>
<p>Deploy Windows 10 devices using Windows AutoPilot from the Partner Center.</p>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</li>
<li>
<a href="#trouble-support">Troubleshooting and support</a>
<ul id="trouble-support" class="cardsC">
<li class="fullSpan">
<div class="container intro">
<p>Looking for help or can't find what you need? Try these resources.</p>
</div>
</li>
<li>
<a href="https://www.microsoft.com/solution-providers/search" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-find-partner-1.svg" alt="Find a Microsoft-certified service provider" />
</div>
</div>
<div class="cardText">
<h3>Find a Partner</h3>
<p>Visit the Microsoft Partner Center to locate a Microsoft-certified solution provider who can help you locally or remotely. </p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://support.office.com/article/496e690b-b75d-4ff5-bf34-cc32905d0364#bkmk_support" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-technical-support-4.svg" alt="Submit a technical support request for Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
<h3>Microsoft Technical Support</h3>
<p>Submit a technical support request for Microsoft 365 Business.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="#">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/bcs-partner-advanced-management-troubleshooting-3.svg" alt="Find solutions for common Microsoft 365 Business issues" />
</div>
</div>
<div class="cardText">
<h3>Troubleshoot problems - Coming soon</h3>
<p>Find solutions for common Microsoft 365 Business issues.</p>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</li>
<li>
<a href="#videos">Video tutorials</a>
<ul id="videos" class="cardsG">
<li class="fullSpan">
<div class="container intro">
<p>Some of the tasks covered in the step-by-step guides are also available as video tutorials. Follow these links to start watching.</p>
</div>
</li>
<li>
<a href="http://videoplayercdn.osi.office.net/embed/0705c337-f3e8-4d28-bb6c-530cd28e99f2_1280x720_3400.mp4" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Set up Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
<h3>Set up Microsoft 365 Business</h3>
<p>Watch how you can quickly set up Microsoft 365 Business using the setup wizard from the Microsoft 365 Business admin center.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="http://videoplayercdn.osi.office.net/embed/a5734146-620a-4cec-8618-536b3ca37972_1280x720_3400.mp4" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Secure Windows 10 devices with Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
<h3>Secure Windows 10 devices with Microsoft 365 Business</h3>
<p>Check out how to use a policy to secure Windows 10 devices and how to verify the policy is applied correctly.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="http://videoplayercdn.osi.office.net/embed/e0ee7052-e0f4-4c42-a4f1-5e91b9776ce9_1280x720_3400.mp4" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Secure Microsoft Office apps on iOS devices with Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
<h3>Secure Microsoft Office apps on iOS devices with Microsoft 365 Business</h3>
<p>See how you can use a policy to secure Office apps on iOS devices and how to verify the policy is working.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://youtu.be/oJpeTq0Dyxk" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Set up Windows devices for Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
<h3>Set up Windows devices for Microsoft 365 Business</h3>
<p>Upgrade your Windows 7, 8, or 8.1 Pro devices to Windows 10 Pro, and get your devices set up and joined to your organization.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://www.youtube.com/watch?v=qoDIyUOtZ6o" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Demo: Microsoft 365 Business first run experience" />
</div>
</div>
<div class="cardText">
<h3>Demo: Microsoft 365 Business first run experience</h3>
<p>Watch one of our customers show you how easy it is to set up Microsoft 365 Business.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://www.youtube.com/watch?v=5kH-4gX-4NU" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Demo: Secure data and end user devices with Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
<h3>Demo: Secure data and end user devices with Microsoft 365 Business</h3>
<p>See how your users can set up their mobile devices and how to remove company data once your employee leaves the organization.</p>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</li>
<li>
<a data-default="true" href="#partner-resources">Partner resources</a>
<ul id="partner-resources" class="cardsC">
<li class="fullSpan">
<div class="container intro">
<p>Looking for resources available to Microsoft 365 Business partners? Start here.</p>
</div>
</li>
<li>
<a href="https://partners.office.com/smb" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/partner-resource-training-1.svg" alt="SMB resources and training" />
</div>
</div>
<div class="cardText">
<h3>SMB resources and training</h3>
<p>Find the latest training offerings and updates, and other resources.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://partners.office.com/news" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/partner-news-2.svg" alt="News for partners" />
</div>
</div>
<div class="cardText">
<h3>News articles</h3>
<p>Read the latest news articles on Office 365 and Microsoft 365.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<!--
<li>
<a href="https://office365partnerportal-staging.azurewebsites.net/fasttrack-and-partners" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="media/hub-partner/partner-fastrack-3.svg" alt="FastTrack and partners" />
</div>
</div>
<div class="cardText">
<h3>FastTrack and partners</h3>
<p>Get the full suite of best practices, tools, remote assistance, and resources to help you and your customers move to Microsoft 365.</p>
</div>
</div>
</div>
</div>
</a>
</li>
-->
</ul>
</li>
</ul>
</li>
<li>

1
gdpr/TOC.md Normal file
View File

@ -0,0 +1 @@
# [Index](index.md)

40
gdpr/docfx.json Normal file
View File

@ -0,0 +1,40 @@
{
"build": {
"content": [
{
"files": [
"**/*.md"
],
"exclude": [
"**/obj/**",
"**/includes/**",
"README.md",
"LICENSE",
"LICENSE-CODE",
"ThirdPartyNotices"
]
}
],
"resource": [
{
"files": [
"**/*.png",
"**/*.jpg"
],
"exclude": [
"**/obj/**",
"**/includes/**"
]
}
],
"overwrite": [],
"externalReference": [],
"globalMetadata": {
"author": "eross-msft",
"ms.author": "lizross"
},
"fileMetadata": {},
"template": [],
"dest": "gdpr"
}
}

1
gdpr/index.md Normal file
View File

@ -0,0 +1 @@
# placeholder

View File

@ -7,7 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 07/27/2017
ms.date: 09/19/2017
---
# AssignedAccess CSP
@ -19,7 +19,7 @@ The AssignedAccess configuration service provider (CSP) is used set the device t
For step-by-step guide for setting up devices to run in kiosk mode, see [Set up a kiosk on Windows 10 Pro, Enterprise, or Education.](http://go.microsoft.com/fwlink/p/?LinkID=722211)
> **Note**  The AssignedAccess CSP is only supported in Windows 10 Enterprise and Windows 10 Education.
> **Note**  The AssignedAccess CSP is supported in Windows 10 Enterprise and Windows 10 Education. Starting in Windows 10, version 1709 it is also supported in Windows 10 Pro.
The following diagram shows the AssignedAccess configuration service provider in tree format

View File

@ -7,7 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/27/2017
ms.date: 09/19/2017
---
# Configuration service provider reference
@ -164,7 +164,7 @@ Footnotes:
</tr>
<tr>
<td><img src="images/crossmark.png" alt="cross mark" /></td>
<td><img src="images/crossmark.png" alt="cross mark" /></td>
<td><img src="images/checkmark.png" alt="check mark" /><sup>3</sup></td>
<td></td>
<td><img src="images/checkmark.png" alt="check mark" /></td>
<td><img src="images/checkmark.png" alt="check mark" /></td>

View File

@ -7,7 +7,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 06/19/2017
ms.date: 09/19/2017
---
# EnterpriseAPN CSP
@ -128,6 +128,149 @@ The following image shows the EnterpriseAPN configuration service provider in tr
<p style="margin-left: 20px">Supported operations are Get and Replace.</p>
## Examples
``` syntax
<!--
Copyright (c) Microsoft Corporation. All rights reserved.
-->
<!--
Use of this source code is subject to the terms of the Microsoft
premium shared source license agreement under which you licensed
this source code. If you did not accept the terms of the license
agreement, you are not authorized to use this source code.
For the terms of the license, please see the license agreement
signed by you and Microsoft.
THE SOURCE CODE IS PROVIDED "AS IS", WITH NO WARRANTIES OR INDEMNITIES.
-->
<SyncML>
<SyncBody>
<Atomic>
<CmdID>8000</CmdID>
<!-- Sub-tree 1 -->
<add>
<CmdID>8001</CmdID>
<Item>
<Target>
<LocURI>./Vendor/MSFT/EnterpriseAPN/E_APN1/APNName</LocURI>
</Target>
<Meta>
<Format xmlns="syncml:metinf">chr</Format>
</Meta>
<Data>enterprise_apn1</Data>
</Item>
</add>
<add>
<CmdID>8002</CmdID>
<Item>
<Target>
<LocURI>./Vendor/MSFT/EnterpriseAPN/E_APN1/IPType</LocURI>
</Target>
<Meta>
<Format xmlns="syncml:metinf">chr</Format>
</Meta>
<Data>IPv4</Data>
</Item>
</add>
<add>
<CmdID>8003</CmdID>
<Item>
<Target>
<LocURI>./Vendor/MSFT/EnterpriseAPN/E_APN1/IsAttachAPN</LocURI>
</Target>
<Meta>
<Format xmlns="syncml:metinf">bool</Format>
</Meta>
<Data>false</Data>
</Item>
</add>
<add>
<CmdID>8004</CmdID>
<Item>
<Target>
<LocURI>./Vendor/MSFT/EnterpriseAPN/E_APN1/ClassId</LocURI>
</Target>
<Meta>
<Format xmlns="syncml:metinf">chr</Format>
</Meta>
<Data>AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA</Data>
</Item>
</add>
<add>
<CmdID>8005</CmdID>
<Item>
<Target>
<LocURI>./Vendor/MSFT/EnterpriseAPN/E_APN1/AuthType</LocURI>
</Target>
<Meta>
<Format xmlns="syncml:metinf">chr</Format>
</Meta>
<Data>CHAP</Data>
</Item>
</add>
<add>
<CmdID>8006</CmdID>
<Item>
<Target>
<LocURI>./Vendor/MSFT/EnterpriseAPN/E_APN1/UserName</LocURI>
</Target>
<Meta>
<Format xmlns="syncml:metinf">chr</Format>
</Meta>
<Data>myusername</Data>
</Item>
</add>
<add>
<CmdID>8007</CmdID>
<Item>
<Target>
<LocURI>./Vendor/MSFT/EnterpriseAPN/E_APN1/Password</LocURI>
</Target>
<Meta>
<Format xmlns="syncml:metinf">chr</Format>
</Meta>
<Data>mypassword</Data>
</Item>
</add>
<add>
<CmdID>8008</CmdID>
<Item>
<Target>
<LocURI>./Vendor/MSFT/EnterpriseAPN/E_APN1/IccId</LocURI>
</Target>
<Meta>
<Format xmlns="syncml:metinf">chr</Format>
</Meta>
<Data>FFFFFFFFFFFFFFFFFFFF</Data>
</Item>
</add>
</Atomic>
<Final/>
</SyncBody>
<!--
===============================================================================
atomicA
add chr EnterpriseAPN/E_APN1/APNName enterprise_apn1
add chr EnterpriseAPN/E_APN1/IPType IPv4
add bool EnterpriseAPN/E_APN1/IsAttachAPN false
add chr EnterpriseAPN/E_APN1/ClassId AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA
add chr EnterpriseAPN/E_APN1/AuthType CHAP
add chr EnterpriseAPN/E_APN1/UserName myusername
add chr EnterpriseAPN/E_APN1/Password mypassword
add chr EnterpriseAPN/E_APN1/IccId FFFFFFFFFFFFFFFFFFFF
atomicZ
===============================================================================
-->
</SyncML>
```
## Related topics

View File

@ -10,7 +10,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 09/12/2017
ms.date: 09/19/2017
---
# What's new in MDM enrollment and management
@ -974,6 +974,7 @@ For details about Microsoft mobile device management protocols for Windows 10 s
<ul>
<li>Configuration</li>
</ul>
<p>Starting in Windows 10, version 1709, AssignedAccess CSP is supported in Windows 10 Pro.</p>
</td></tr>
<tr class="odd">
<td style="vertical-align:top">[DeviceManageability CSP](devicemanageability-csp.md)</td>
@ -1378,6 +1379,10 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
</ul>
<p>Added new settings to Update/BranchReadinessLevel policy in Windows 10 version 1709.</p>
</td></tr>
<tr class="even">
<td style="vertical-align:top">[AssignedAccess CSP](assignedaccess-csp.md)</td>
<td style="vertical-align:top"><p>Starting in Windows 10, version 1709, AssignedAccess CSP is also supported in Windows 10 Pro.</p>
</td></tr>
<tr class="odd">
<td style="vertical-align:top">Microsoft Store for Business</td>
<td style="vertical-align:top"><p>Windows Store for Business name changed to Microsoft Store for Business.</p>
@ -1393,6 +1398,9 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
<p>For examples, see section 4.3.1 RequestSecurityToken of the the MS-MDE2 protocol documentation.</p>
</td></tr>
<tr class="odd">
<td style="vertical-align:top">[EntepriseAPN CSP](enterpriseapn-csp.md)</td>
<td style="vertical-align:top"><p>Added a SyncML example.</p>
</td></tr>
<td style="vertical-align:top">[VPNv2 CSP](vpnv2-csp.md)</td>
<td style="vertical-align:top"><p>Added RegisterDNS setting in Windows 10, version 1709.</p>
</td></tr>
@ -1617,6 +1625,7 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
<ul>
<li>Added Configuration node</li>
</ul>
<p>Starting in Windows 10, version 1709, AssignedAccess CSP is supported in Windows 10 Pro.</p>
</td></tr>
<tr class="odd">
<td style="vertical-align:top">[SurfaceHub CSP](surfacehub-csp.md)</td>

View File

@ -6,7 +6,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 08/30/2017
ms.date: 09/20/2017
---
# Policy CSP - System
@ -303,7 +303,13 @@ ms.date: 08/30/2017
<p style="margin-left: 20px">The following tables describe the supported values:
<table style="margin-left: 20px">
Windows 8.1 Values:
- 0 - Not allowed.
- 1 Allowed, except for Secondary Data Requests.
- 2 (default) Allowed.
<!--<table style="margin-left: 20px">
<colgroup>
<col width="100%" />
</colgroup>
@ -324,10 +330,17 @@ ms.date: 08/30/2017
<td style="vertical-align:top"><p>2 (default) Allowed.</p></td>
</tr>
</tbody>
</table>
</table>-->
Windows 10 Values:
<table style="margin-left: 20px">
- 0 Security. Information that is required to help keep Windows more secure, including data about the Connected User Experience and Telemetry component settings, the Malicious Software Removal Tool, and Windows Defender.
Note: This value is only applicable to Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile Enterprise, Windows 10 IoT Core (IoT Core), and Windows Server 2016. Using this setting on other devices is equivalent to setting the value of 1.
- 1 Basic. Basic device info, including: quality-related data, app compatibility, app usage data, and data from the Security level.
- 2 Enhanced. Additional insights, including: how Windows, Windows Server, System Center, and apps are used, how they perform, advanced reliability data, and data from both the Basic and the Security levels.
- 3 Full. All data necessary to identify and help to fix problems, plus data from the Security, Basic, and Enhanced levels.
<!--<table style="margin-left: 20px">
<colgroup>
<col width="100%" />
</colgroup>
@ -354,7 +367,7 @@ ms.date: 08/30/2017
<td style="vertical-align:top"><p>3 Full. All data necessary to identify and help to fix problems, plus data from the Security, Basic, and Enhanced levels.</p></td>
</tr>
</tbody>
</table>
</table>-->
> [!IMPORTANT]

View File

@ -6,7 +6,7 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
ms.date: 08/30/2017
ms.date: 09/20/2017
---
# Policy CSP - Update
@ -595,7 +595,34 @@ This policy is accessible through the Update setting in the user interface or Gr
<p style="margin-left: 20px">If the Allow Telemetry policy is enabled and the Options value is set to 0, then the "Defer upgrades by", "Defer updates by" and "Pause Updates and Upgrades" settings have no effect.
<table style="margin-left: 20px">
OS upgrade:
- Maximum deferral: 8 months
- Deferral increment: 1 month
- Update type/notes:
- Upgrade - 3689BDC8-B205-4AF4-8D4A-A63924C5E9D5
Update:
- Maximum deferral: 1 month
- Deferral increment: 1 week
- Update type/notes:
If a machine has Microsoft Update enabled, any Microsoft Updates in these categories will also observe Defer / Pause logic.
- Security Update - 0FA1201D-4330-4FA8-8AE9-B877473B6441
- Critical Update - E6CF1350-C01B-414D-A61F-263D14D133B4
- Update Rollup - 28BC880E-0592-4CBF-8F95-C79B17911D5F
- Service Pack - 68C5B0A3-D1A6-4553-AE49-01D3A7827828
- Tools - B4832BD8-E735-4761-8DAF-37F882276DAB
- Feature Pack - B54E7D24-7ADD-428F-8B75-90A396FA584F
- Update - CD5FFD1E-E932-4E3A-BF74-18BF0B1BBD83
- Driver - EBFC1FC5-71A4-4F7B-9ACA-3B9A503104A0
Other/cannot defer:
- Maximum deferral: No deferral
- Deferral increment: No deferral
- Update type/notes:
Any update category not specifically enumerated above falls into this category.
- Definition Update - E0789628-CE08-4437-BE74-2495B842F43B
<!--<table style="margin-left: 20px">
<colgroup>
<col width="25%" />
<col width="25%" />
@ -644,7 +671,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
<p>Definition Update - E0789628-CE08-4437-BE74-2495B842F43B</p></td>
</tr>
</tbody>
</table>
</table>-->
<!--EndDescription-->
<!--EndPolicy-->

View File

@ -12,8 +12,6 @@ author: brianlic-msft
# TPM recommendations
**Applies to**
**Applies to**
- Windows 10
- Windows Server 2016
@ -98,20 +96,19 @@ For end consumers, TPM is behind the scenes but is still very relevant. TPM is u
The following table defines which Windows features require TPM support.
| Windows Features | Windows 10 TPM 1.2 | Windows 10 TPM 2.0 | Details |
|-------------------------|----------------------|----------------------|----------|
| Measured Boot | Required | Required | Measured boot requires TPM 1.2 or 2.0 and UEFI Secure Boot. |
| Bitlocker | Required | Required | TPM 1.2 or later required or a removable USB memory device such as a flash drive. Please note that TPM 2.0 requires UEFI Secure Boot in order for BitLocker to work properly. |
| Passport: Domain AADJ Join | Required | Required | Supports both versions of TPM, but requires TPM with HMAC and EK certificate for key attestation support. |
| Passport: MSA or Local Account | Required | Required | TPM 2.0 is required with HMAC and EK certificate for key attestation support. |
| Device Encryption | Not Applicable | Required | TPM 2.0 is required for all InstantGo devices. |
| Credential Guard | Required | Required | For Windows 10, version 1511, TPM 1.2 or 2.0 is highly recommended. If you don't have a TPM installed, Credential Guard will still be enabled, but the keys used to encrypt Credential Guard will not be protected by the TPM. |
| Device Health Attestation | Required | Required | |
| Windows Hello / Windows Hello for Business | Not Required | Recommended | Whenever possible, Microsoft recommends the use of TPM hardware. The TPM protects against a variety of known and potential attacks, including PIN brute-force attacks. [How keys are protected](https://docs.microsoft.com/en-us/windows/access-protection/hello-for-business/hello-how-it-works#how-keys-are-protected) |
| UEFI Secure Boot | Not Required | Recommended | |
| Platform Key Storage provider | Required | Required | |
| Virtual Smart Card | Required | Required | |
| Certificate storage (TPM bound) | Required | Required | |
| Windows Features | TPM Required | Supports TPM 1.2 | Supports TPM 2.0 | Details |
|-------------------------|--------------|--------------------|--------------------|----------|
| Measured Boot | Yes | Yes | Yes | Measured Boot requires TPM 1.2 or 2.0 and UEFI Secure Boot |
| BitLocker | Yes | Yes | Yes | TPM 1.2 or 2.0 is required |
| Device Encryption | Yes | N/A | Yes | Device Encryption requires InstantGo/Connected Standby certification, which requires TPM 2.0. |
| Device Guard | No | Yes | Yes | |
| Credential Guard | No | Yes | Yes | Windows 10, version 1507 (End of Life as of May 2017) only supported TPM 2.0 for Credential Guard. Beginning with Windows 10, version 1511, TPM 1.2 and 2.0 are supported. |
| Device Health Attestation| Yes | Yes | Yes | |
| Windows Hello/Windows Hello for Business| No | Yes | Yes | Azure AD join supports both versions of TPM, but requires TPM with keyed-hash message authentication code (HMAC) and Endorsement Key (EK) certificate for key attestation support. |
| UEFI Secure Boot | No | Yes | Yes | |
| TPM Platform Crypto Provider Key Storage Provider| Yes | Yes| Yes | |
| Virtual Smart Card | Yes | Yes | Yes | |
| Certificate storage | No | Yes | Yes | TPM is only required when the certificate is stored in the TPM. |
## OEM Status on TPM 2.0 system availability and certified parts

View File

@ -36,7 +36,6 @@
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "justinha",
"ms.date": "04/05/2017",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "MSDN.win-threat-protection"