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

fixing merge conflict

Browse Source
This commit is contained in:
Sarah 2019-09-19 14:46:29 -07:00
parent f77b1d8601
commit f33caaa2b5
1 changed files with 15392 additions and 15371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.openpublishing.redirection.json
View File

@ -626,8 +626,13 @@
"redirect_document_id": true "redirect_document_id": true
}, },
{ {
"source_path": "windows/security/threat-protection/windows-defender-exploit-guard/oldtoc.md",
"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/microsoft-defender-advanced-threat-protection",
"redirect_document_id": false
},
{
"source_path": "windows/security/threat-protection/windows-defender-exploit-guard/attack-surface-reduction-rules-in-windows-10-enterprise-e3.md", "source_path": "windows/security/threat-protection/windows-defender-exploit-guard/attack-surface-reduction-rules-in-windows-10-enterprise-e3.md",
"redirect_url": "windows/security/threat-protection/microsoft-defender-atp/attack-surface-reduction-rules-in-windows-10-enterprise-e3", "redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/attack-surface-reduction-rules-in-windows-10-enterprise-e3",
"redirect_document_id": true "redirect_document_id": true
}, },
{ {
@ -822,7 +827,7 @@
}, },
{ {
"source_path": "windows/security/threat-protection/windows-defender-exploit-guard/enable-controlled-folders-exploit-guard.md", "source_path": "windows/security/threat-protection/windows-defender-exploit-guard/enable-controlled-folders-exploit-guard.md",
"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/enable-controlled-folders-exploit-guard", "redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/enable-controlled-folders",
"redirect_document_id": true "redirect_document_id": true
}, },
{ {
@ -892,8 +897,8 @@
}, },
{ {
"source_path": "windows/security/threat-protection/windows-defender-exploit-guard/evaluate-windows-defender-exploit-guard.md", "source_path": "windows/security/threat-protection/windows-defender-exploit-guard/evaluate-windows-defender-exploit-guard.md",
"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/evaluate-windows-defender", "redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/evaluate-atp",
"redirect_document_id": true "redirect_document_id": false
}, },
{ {
"source_path": "windows/threat-protection/windows-defender-exploit-guard/event-views-exploit-guard.md", "source_path": "windows/threat-protection/windows-defender-exploit-guard/event-views-exploit-guard.md",
@ -912,7 +917,7 @@
}, },
{ {
"source_path": "windows/security/threat-protection/windows-defender-exploit-guard/exploit-protection-exploit-guard.md", "source_path": "windows/security/threat-protection/windows-defender-exploit-guard/exploit-protection-exploit-guard.md",
"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/exploit-protection-exploit-guard", "redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/exploit-protection",
"redirect_document_id": true "redirect_document_id": true
}, },
{ {
@ -1336,6 +1341,11 @@
"redirect_document_id": true "redirect_document_id": true
}, },
{ {
"source_path": "windows/security/threat-protection/microsoft-defender-atp/enable-custom-ti.md",
"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/manage-indicators",
"redirect_document_id": false
},
{
"source_path": "windows/security/threat-protection/windows-defender-atp/enable-security-analytics-windows-defender-advanced-threat-protection.md", "source_path": "windows/security/threat-protection/windows-defender-atp/enable-security-analytics-windows-defender-advanced-threat-protection.md",
"redirect_url": "/windows/security/threat-protection/windows-defender-atp/enable-secure-score-windows-defender-advanced-threat-protection", "redirect_url": "/windows/security/threat-protection/windows-defender-atp/enable-secure-score-windows-defender-advanced-threat-protection",
"redirect_document_id": true "redirect_document_id": true
@ -15376,8 +15386,19 @@
"source_path": "browsers/internet-explorer/ie11-deploy-guide/group-policy-compatability-with-ie11.md", "source_path": "browsers/internet-explorer/ie11-deploy-guide/group-policy-compatability-with-ie11.md",
"redirect_url": "/browsers/internet-explorer/ie11-deploy-guide/group-policy-compatibility-with-ie11", "redirect_url": "/browsers/internet-explorer/ie11-deploy-guide/group-policy-compatibility-with-ie11",
"redirect_document_id": true "redirect_document_id": true
},
{
"source_path": "devices/surface/surface-dock-updater.md",
"redirect_url": "surface/surface-dock-firmware-update",
"redirect_document_id": true
},
{
"source_path": "devices/surface/surface.yml",
"redirect_url": "/surface/get-started",
"redirect_document_id": true
} }
] ]
} }