deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-06-21 21:33:38 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into mdatp

Browse Source
This commit is contained in:
Beth Levin
2019-04-15 10:44:23 -07:00
parent 843b9988a4 3f1f491a2a
commit fd798ded85
28 changed files with 240 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

391
.openpublishing.publish.config.json
View File

@ -2,46 +2,13 @@
"build_entry_point": "", "build_entry_point": "",
"docsets_to_publish": [ "docsets_to_publish": [
{ {
"docset_name": "bcs-VSTS", "docset_name": "education",
"build_source_folder": "bcs",
"build_output_subfolder": "bcs-VSTS",
"locale": "en-us",
"monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes"
},
{
"docset_name": "education-VSTS",
"build_source_folder": "education", "build_source_folder": "education",
"build_output_subfolder": "education-VSTS", "build_output_subfolder": "education",
"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": "eula-vsts",
"build_source_folder": "windows/eulas",
"build_output_subfolder": "eula-vsts",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [], "moniker_ranges": [],
"open_to_public_contributors": false, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
@ -51,44 +18,12 @@
"template_folder": "_themes" "template_folder": "_themes"
}, },
{ {
"docset_name": "gdpr", "docset_name": "hololens",
"build_source_folder": "gdpr",
"build_output_subfolder": "gdpr",
"locale": "en-us",
"monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": false,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes"
},
{
"docset_name": "internet-explorer-VSTS",
"build_source_folder": "browsers/internet-explorer",
"build_output_subfolder": "internet-explorer-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": "itpro-hololens-VSTS",
"build_source_folder": "devices/hololens", "build_source_folder": "devices/hololens",
"build_output_subfolder": "itpro-hololens-VSTS", "build_output_subfolder": "hololens",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -96,35 +31,32 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "keep-secure-VSTS", "docset_name": "internet-explorer",
"build_source_folder": "browsers/internet-explorer",
"build_output_subfolder": "internet-explorer",
"locale": "en-us",
"monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes"
},
{
"docset_name": "keep-secure",
"build_source_folder": "windows/keep-secure", "build_source_folder": "windows/keep-secure",
"build_output_subfolder": "keep-secure-VSTS", "build_output_subfolder": "keep-secure",
"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": "known-issues",
"build_source_folder": "windows/known-issues",
"build_output_subfolder": "known-issues",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [], "moniker_ranges": [],
"open_to_public_contributors": false, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
@ -134,11 +66,12 @@
"template_folder": "_themes" "template_folder": "_themes"
}, },
{ {
"docset_name": "mdop-VSTS", "docset_name": "mdop",
"build_source_folder": "mdop", "build_source_folder": "mdop",
"build_output_subfolder": "mdop-VSTS", "build_output_subfolder": "mdop",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -146,31 +79,12 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "microsoft-edge-VSTS", "docset_name": "microsoft-edge",
"build_source_folder": "browsers/edge", "build_source_folder": "browsers/edge",
"build_output_subfolder": "microsoft-edge-VSTS", "build_output_subfolder": "microsoft-edge",
"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": "privacy",
"build_source_folder": "windows/privacy",
"build_output_subfolder": "privacy",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [], "moniker_ranges": [],
@ -184,28 +98,12 @@
"template_folder": "_themes" "template_folder": "_themes"
}, },
{ {
"docset_name": "security", "docset_name": "smb",
"build_source_folder": "windows/security",
"build_output_subfolder": "security",
"locale": "en-us",
"monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content",
"LandingData": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes"
},
{
"docset_name": "smb-VSTS",
"build_source_folder": "smb", "build_source_folder": "smb",
"build_output_subfolder": "smb-VSTS", "build_output_subfolder": "smb",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -213,16 +111,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "store-for-business-VSTS", "docset_name": "store-for-business",
"build_source_folder": "store-for-business", "build_source_folder": "store-for-business",
"build_output_subfolder": "store-for-business-VSTS", "build_output_subfolder": "store-for-business",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -230,33 +127,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "surface-hub-VSTS", "docset_name": "surface",
"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_source_folder": "devices/surface",
"build_output_subfolder": "surface-VSTS", "build_output_subfolder": "surface",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -264,16 +143,31 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "win-access-protection-VSTS", "docset_name": "surface-hub",
"build_source_folder": "devices/surface-hub",
"build_output_subfolder": "surface-hub",
"locale": "en-us",
"monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes"
},
{
"docset_name": "win-access-protection",
"build_source_folder": "windows/access-protection", "build_source_folder": "windows/access-protection",
"build_output_subfolder": "win-access-protection-VSTS", "build_output_subfolder": "win-access-protection",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -281,16 +175,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "win-app-management-VSTS", "docset_name": "win-app-management",
"build_source_folder": "windows/application-management", "build_source_folder": "windows/application-management",
"build_output_subfolder": "win-app-management-VSTS", "build_output_subfolder": "win-app-management",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -298,16 +191,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "win-client-management-VSTS", "docset_name": "win-client-management",
"build_source_folder": "windows/client-management", "build_source_folder": "windows/client-management",
"build_output_subfolder": "win-client-management-VSTS", "build_output_subfolder": "win-client-management",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -315,16 +207,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "win-configuration-VSTS", "docset_name": "win-configuration",
"build_source_folder": "windows/configuration", "build_source_folder": "windows/configuration",
"build_output_subfolder": "win-configuration-VSTS", "build_output_subfolder": "win-configuration",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -332,16 +223,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "win-development-VSTS", "docset_name": "win-deployment",
"build_source_folder": "windows/deployment", "build_source_folder": "windows/deployment",
"build_output_subfolder": "win-development-VSTS", "build_output_subfolder": "win-deployment",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -349,16 +239,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "win-device-security-VSTS", "docset_name": "win-device-security",
"build_source_folder": "windows/device-security", "build_source_folder": "windows/device-security",
"build_output_subfolder": "win-device-security-VSTS", "build_output_subfolder": "win-device-security",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -366,16 +255,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "windows-configure-VSTS", "docset_name": "windows-configure",
"build_source_folder": "windows/configure", "build_source_folder": "windows/configure",
"build_output_subfolder": "windows-configure-VSTS", "build_output_subfolder": "windows-configure",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -383,16 +271,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "windows-deploy-VSTS", "docset_name": "windows-deploy",
"build_source_folder": "windows/deploy", "build_source_folder": "windows/deploy",
"build_output_subfolder": "windows-deploy-VSTS", "build_output_subfolder": "windows-deploy",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -400,16 +287,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "windows-hub-VSTS", "docset_name": "windows-hub",
"build_source_folder": "windows/hub", "build_source_folder": "windows/hub",
"build_output_subfolder": "windows-hub-VSTS", "build_output_subfolder": "windows-hub",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -417,16 +303,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "windows-manage-VSTS", "docset_name": "windows-manage",
"build_source_folder": "windows/manage", "build_source_folder": "windows/manage",
"build_output_subfolder": "windows-manage-VSTS", "build_output_subfolder": "windows-manage",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -434,16 +319,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "windows-plan-VSTS", "docset_name": "windows-plan",
"build_source_folder": "windows/plan", "build_source_folder": "windows/plan",
"build_output_subfolder": "windows-plan-VSTS", "build_output_subfolder": "windows-plan",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -451,16 +335,47 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "windows-update-VSTS", "docset_name": "windows-privacy",
"build_source_folder": "windows/privacy",
"build_output_subfolder": "windows-privacy",
"locale": "en-us",
"monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes"
},
{
"docset_name": "windows-security",
"build_source_folder": "windows/security",
"build_output_subfolder": "windows-security",
"locale": "en-us",
"monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content",
"ManagedReference": "Content",
"RestApi": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes"
},
{
"docset_name": "windows-update",
"build_source_folder": "windows/update", "build_source_folder": "windows/update",
"build_output_subfolder": "windows-update-VSTS", "build_output_subfolder": "windows-update",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -468,16 +383,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "win-threat-protection-VSTS", "docset_name": "win-threat-protection",
"build_source_folder": "windows/threat-protection", "build_source_folder": "windows/threat-protection",
"build_output_subfolder": "win-threat-protection-VSTS", "build_output_subfolder": "win-threat-protection",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -485,16 +399,15 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
}, },
{ {
"docset_name": "win-whats-new-VSTS", "docset_name": "win-whats-new",
"build_source_folder": "windows/whats-new", "build_source_folder": "windows/whats-new",
"build_output_subfolder": "win-whats-new-VSTS", "build_output_subfolder": "win-whats-new",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"moniker_ranges": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
@ -502,9 +415,7 @@
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes"
"moniker_groups": [],
"version": 0
} }
], ],
"notification_subscribers": [ "notification_subscribers": [
@ -544,10 +455,6 @@
"master": [ "master": [
"Publish", "Publish",
"Pdf" "Pdf"
],
"atp-api-danm": [
"Publish",
"Pdf"
] ]
}, },
"need_generate_pdf_url_template": true, "need_generate_pdf_url_template": true,
@ -558,4 +465,4 @@
}, },
"need_generate_pdf": false, "need_generate_pdf": false,
"need_generate_intellisense": false "need_generate_intellisense": false
} }

5
browsers/edge/docfx.json
View File

@ -24,7 +24,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "Win.microsoft-edge" "depot_name": "Win.microsoft-edge",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -34,4 +35,4 @@
"dest": "browsers/edge", "dest": "browsers/edge",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

5
browsers/internet-explorer/docfx.json
View File

@ -27,7 +27,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "Win.internet-explorer" "depot_name": "Win.internet-explorer",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -37,4 +38,4 @@
"dest": "edges/internet-explorer", "dest": "edges/internet-explorer",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

3
devices/hololens/docfx.json
View File

@ -40,7 +40,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "Win.itpro-hololens" "depot_name": "Win.itpro-hololens",
"folder_relative_path_in_docset": "./"
} }
} }
}, },

5
devices/surface-hub/docfx.json
View File

@ -29,7 +29,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "Win.surface-hub" "depot_name": "Win.surface-hub",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -39,4 +40,4 @@
"dest": "devices/surface-hub", "dest": "devices/surface-hub",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

5
devices/surface/docfx.json
View File

@ -26,7 +26,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "Win.surface" "depot_name": "Win.surface",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -36,4 +37,4 @@
"dest": "devices/surface", "dest": "devices/surface",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

3
education/docfx.json
View File

@ -26,7 +26,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "Win.education" "depot_name": "Win.education",
"folder_relative_path_in_docset": "./"
} }
} }
}, },

5
mdop/docfx.json
View File

@ -27,7 +27,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "Win.mdop" "depot_name": "Win.mdop",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -37,4 +38,4 @@
"dest": "mdop", "dest": "mdop",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

5
smb/docfx.json
View File

@ -36,7 +36,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "TechNet.smb" "depot_name": "TechNet.smb",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -45,4 +46,4 @@
"dest": "smb", "dest": "smb",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

5
store-for-business/docfx.json
View File

@ -43,7 +43,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.store-for-business" "depot_name": "MSDN.store-for-business",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -52,4 +53,4 @@
"dest": "store-for-business", "dest": "store-for-business",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

5
windows/access-protection/docfx.json
View File

@ -38,7 +38,8 @@
"ms.author": "justinha", "ms.author": "justinha",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.win-access-protection" "depot_name": "MSDN.win-access-protection",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -46,4 +47,4 @@
"template": [], "template": [],
"dest": "win-access-protection" "dest": "win-access-protection"
} }
} }

5
windows/application-management/docfx.json
View File

@ -41,7 +41,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.win-app-management" "depot_name": "MSDN.win-app-management",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -50,4 +51,4 @@
"dest": "win-app-management", "dest": "win-app-management",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

5
windows/client-management/docfx.json
View File

@ -40,7 +40,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.win-client-management" "depot_name": "MSDN.win-client-management",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -49,4 +50,4 @@
"dest": "win-client-management", "dest": "win-client-management",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

5
windows/configuration/docfx.json
View File

@ -41,7 +41,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.win-configuration" "depot_name": "MSDN.win-configuration",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -50,4 +51,4 @@
"dest": "win-configuration", "dest": "win-configuration",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

5
windows/deploy/docfx.json
View File

@ -32,7 +32,8 @@
"globalMetadata": { "globalMetadata": {
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.windows-deploy" "depot_name": "MSDN.windows-deploy",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -40,4 +41,4 @@
"template": [], "template": [],
"dest": "windows-deploy" "dest": "windows-deploy"
} }
} }

5
windows/deployment/docfx.json
View File

@ -42,7 +42,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.win-development" "depot_name": "MSDN.win-development",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -51,4 +52,4 @@
"dest": "win-development", "dest": "win-development",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

BIN
windows/deployment/images/wada.PNG
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 223 KiB

5
windows/device-security/docfx.json
View File

@ -39,7 +39,8 @@
"ms.date": "04/05/2017", "ms.date": "04/05/2017",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.win-device-security" "depot_name": "MSDN.win-device-security",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -47,4 +48,4 @@
"template": [], "template": [],
"dest": "win-device-security" "dest": "win-device-security"
} }
} }

5
windows/hub/docfx.json
View File

@ -44,7 +44,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.windows-hub" "depot_name": "MSDN.windows-hub",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -53,4 +54,4 @@
"dest": "windows-hub", "dest": "windows-hub",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

5
windows/keep-secure/docfx.json
View File

@ -32,7 +32,8 @@
"globalMetadata": { "globalMetadata": {
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.keep-secure" "depot_name": "MSDN.keep-secure",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -40,4 +41,4 @@
"template": [], "template": [],
"dest": "keep-secure" "dest": "keep-secure"
} }
} }

5
windows/manage/docfx.json
View File

@ -32,7 +32,8 @@
"globalMetadata": { "globalMetadata": {
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.windows-manage" "depot_name": "MSDN.windows-manage",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -40,4 +41,4 @@
"template": [], "template": [],
"dest": "windows-manage" "dest": "windows-manage"
} }
} }

5
windows/plan/docfx.json
View File

@ -32,7 +32,8 @@
"globalMetadata": { "globalMetadata": {
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.windows-plan" "depot_name": "MSDN.windows-plan",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -40,4 +41,4 @@
"template": [], "template": [],
"dest": "windows-plan" "dest": "windows-plan"
} }
} }

12
windows/privacy/docfx.json
View File

@ -36,13 +36,19 @@
"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json", "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
"ms.technology": "windows", "ms.technology": "windows",
"ms.topic": "article", "ms.topic": "article",
"feedback_system": "GitHub", "feedback_system": "GitHub",
"feedback_github_repo": "MicrosoftDocs/windows-itpro-docs", "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" "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "MSDN.privacy",
"folder_relative_path_in_docset": "./"
}
}
}, },
"fileMetadata": {}, "fileMetadata": {},
"template": [], "template": [],
"dest": "privacy", "dest": "privacy",
"markdownEngineName": "markdig" "markdownEngineName": "markdig"
} }
} }

12
windows/privacy/windows-diagnostic-data.md
View File

@ -22,13 +22,13 @@ Applies to:
- Windows 10, version 1803 - Windows 10, version 1803
- Windows 10, version 1709 - Windows 10, version 1709
Microsoft uses Windows diagnostic data to keep Windows secure and up-to-date, troubleshoot problems, and make product improvements. For users who have turned on "Tailored experiences", it can also be used to offer you personalized tips, ads, and recommendations to enhance Microsoft products and services for your needs. This article describes all types of diagnostic data collected by Windows at the Full level (inclusive of data collected at Basic), with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 10, version 1803 Basic level diagnostic events and fields](https://docs.microsoft.com/windows/configuration/basic-level-windows-diagnostic-events-and-fields). Microsoft uses Windows diagnostic data to keep Windows secure and up-to-date, troubleshoot problems, and make product improvements. For users who have turned on "Tailored experiences", it can also be used to offer you personalized tips, ads, and recommendations to enhance Microsoft products and services for your needs. This article describes all types of diagnostic data collected by Windows at the Full level (inclusive of data collected at Basic), with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 10, version 1809 Basic level diagnostic events and fields](https://docs.microsoft.com/windows/configuration/basic-level-windows-diagnostic-events-and-fields).
In addition, this article provides references to equivalent definitions for the data types and examples from [ISO/IEC 19944:2017 Information technology -- Cloud computing -- Cloud services and devices: Data flow, data categories and data use](https://www.iso.org/standard/66674.html). Each data type also has a Data Use statement, for diagnostics and for Tailored experiences on the device, using the terms as defined by the standard. These Data Use statements define the purposes for which Microsoft processes each type of Windows diagnostic data, using a uniform set of definitions referenced at the end of this document and based on the ISO standard. Reference to the ISO standard provides additional clarity about the information collected, and allows easy comparison with other services or guidance that also references the standard. In addition, this article provides references to equivalent definitions for the data types and examples from [ISO/IEC 19944:2017 Information technology -- Cloud computing -- Cloud services and devices: Data flow, data categories and data use](https://www.iso.org/standard/66674.html). Each data type also has a Data Use statement, for diagnostics and for Tailored experiences on the device, using the terms as defined by the standard. These Data Use statements define the purposes for which Microsoft processes each type of Windows diagnostic data, using a uniform set of definitions referenced at the end of this document and based on the ISO standard. Reference to the ISO standard provides additional clarity about the information collected, and allows easy comparison with other services or guidance that also references the standard.
The data covered in this article is grouped into the following types: The data covered in this article is grouped into the following types:
- Common data (diagnostic header information) - Common data extensions (diagnostic header information)
- Device, Connectivity, and Configuration data - Device, Connectivity, and Configuration data
- Product and Service Usage data - Product and Service Usage data
- Product and Service Performance data - Product and Service Performance data
@ -36,15 +36,15 @@ The data covered in this article is grouped into the following types:
- Browsing History data - Browsing History data
- Inking, Typing, and Speech Utterance data - Inking, Typing, and Speech Utterance data
## Common data ## Common data extensions
Most diagnostic events contain a header of common data. In each example, the info in parentheses provides the equivalent definition for ISO/IEC 19944:2017. Most diagnostic events contain a header of common data. In each example, the info in parentheses provides the equivalent definition for ISO/IEC 19944:2017.
**Data Use for Common data** **Data Use for Common data extensions**
Header data supports the use of data associated with all diagnostic events. Therefore, Common data is used to [provide](#provide) Windows 10, and may be used to [improve](#improve), [personalize](#personalize), [recommend](#recommend), [offer](#offer), or [promote](#promote) Microsoft and third-party products and services, depending on the uses described in the **Data Use** statements for each data category. Header data supports the use of data associated with all diagnostic events. Therefore, Common data is used to [provide](#provide) Windows 10, and may be used to [improve](#improve), [personalize](#personalize), [recommend](#recommend), [offer](#offer), or [promote](#promote) Microsoft and third-party products and services, depending on the uses described in the **Data Use** statements for each data category.
### Data Description for Common data type ### Data Description for Common data extensions type
#### Common data type #### Common data extensions type
Information that is added to most diagnostic events, if relevant and available: Information that is added to most diagnostic events, if relevant and available:

12
windows/security/docfx.json
View File

@ -38,12 +38,18 @@
"ms.topic": "article", "ms.topic": "article",
"feedback_system": "GitHub", "feedback_system": "GitHub",
"feedback_github_repo": "MicrosoftDocs/windows-itpro-docs", "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", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"ms.author": "justinha" "ms.author": "justinha",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "MSDN.security",
"folder_relative_path_in_docset": "./"
}
}
}, },
"fileMetadata": {}, "fileMetadata": {},
"template": [], "template": [],
"dest": "security", "dest": "security",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }

5
windows/threat-protection/docfx.json
View File

@ -39,7 +39,8 @@
"ms.date": "04/05/2017", "ms.date": "04/05/2017",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.win-threat-protection" "depot_name": "MSDN.win-threat-protection",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -47,4 +48,4 @@
"template": [], "template": [],
"dest": "win-threat-protection" "dest": "win-threat-protection"
} }
} }

5
windows/update/docfx.json
View File

@ -32,7 +32,8 @@
"globalMetadata": { "globalMetadata": {
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.windows-update" "depot_name": "MSDN.windows-update",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -40,4 +41,4 @@
"template": [], "template": [],
"dest": "windows-update" "dest": "windows-update"
} }
} }

5
windows/whats-new/docfx.json
View File

@ -41,7 +41,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app", "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "MSDN.win-whats-new" "depot_name": "MSDN.win-whats-new",
"folder_relative_path_in_docset": "./"
} }
} }
}, },
@ -50,4 +51,4 @@
"dest": "win-whats-new", "dest": "win-whats-new",
"markdownEngineName": "dfm" "markdownEngineName": "dfm"
} }
} }