Merge branch 'master' into App-v-revision

This commit is contained in:
Heidi Lohr 2018-02-15 09:15:41 -08:00
commit ff5098f020

View File

@ -4907,7 +4907,7 @@
}, },
{ {
"source_path": "windows/manage/configure-windows-telemetry-in-your-organization.md", "source_path": "windows/manage/configure-windows-telemetry-in-your-organization.md",
"redirect_url": "/windows/configuration/configure-windows-telemetry-in-your-organization", "redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization",
"redirect_document_id": true "redirect_document_id": true
}, },
{ {
@ -5932,7 +5932,12 @@
}, },
{ {
"source_path": "windows/configure/configure-windows-telemetry-in-your-organization.md", "source_path": "windows/configure/configure-windows-telemetry-in-your-organization.md",
"redirect_url": "/windows/configuration/configure-windows-telemetry-in-your-organization", "redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization",
"redirect_document_id": true
},
{
"source_path": "windows/configuration/configure-windows-telemetry-in-your-organization.md",
"redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization",
"redirect_document_id": true "redirect_document_id": true
}, },
{ {