Merge pull request #10074 from MicrosoftDocs/main

merge to live
MicrosoftDocs · Aug 1, 2024 · 1676a20 · 1676a20
2 parents dd26d18 + 380a216
commit 1676a20
Show file tree

Hide file tree

Showing 35 changed files with 158 additions and 34,204 deletions.
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -1272,7 +1272,7 @@
     },
     {
       "source_path": "windows/configure/basic-level-windows-diagnostic-events-and-fields-1703.md",
-      "redirect_url": "/windows/configuration/basic-level-windows-diagnostic-events-and-fields",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1703",
       "redirect_document_id": false
     },
     {
@@ -1302,7 +1302,7 @@
     },
     {
       "source_path": "windows/configure/configure-windows-telemetry-in-your-organization.md",
-      "redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization",
+      "redirect_url": "/windows/privacy/configure-windows-diagnostic-data-in-your-organization",
       "redirect_document_id": false
     },
     {
@@ -1527,7 +1527,7 @@
     },
     {
       "source_path": "windows/configure/windows-diagnostic-data-1703.md",
-      "redirect_url": "/windows/configuration/windows-diagnostic-data",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1703",
       "redirect_document_id": false
     },
     {
@@ -10372,7 +10372,7 @@
     },
     {
       "source_path": "windows/manage/configure-windows-telemetry-in-your-organization.md",
-      "redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization",
+      "redirect_url": "/windows/privacy/configure-windows-diagnostic-data-in-your-organization",
       "redirect_document_id": false
     },
     {

diff --git a/.openpublishing.redirection.windows-configuration.json b/.openpublishing.redirection.windows-configuration.json
@@ -2,17 +2,17 @@
   "redirections": [
     {
       "source_path": "windows/configuration/basic-level-windows-diagnostic-events-and-fields-1703.md",
-      "redirect_url": "/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1703",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1703",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/configuration/basic-level-windows-diagnostic-events-and-fields-1709.md",
-      "redirect_url": "/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1709",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1709",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/configuration/basic-level-windows-diagnostic-events-and-fields.md",
-      "redirect_url": "/windows/privacy/basic-level-windows-diagnostic-events-and-fields",
+      "redirect_url": "/windows/privacy/index",
       "redirect_document_id": false
     },
     {
@@ -27,7 +27,7 @@
     },
     {
       "source_path": "windows/configuration/configure-windows-telemetry-in-your-organization.md",
-      "redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization",
+      "redirect_url": "/windows/privacy/configure-windows-diagnostic-data-in-your-organization",
       "redirect_document_id": false
     },
     {
@@ -47,7 +47,7 @@
     },
     {
       "source_path": "windows/configuration/gdpr-win10-whitepaper.md",
-      "redirect_url": "/windows/privacy/gdpr-win10-whitepaper",
+      "redirect_url": "/windows/privacy/windows-privacy-compliance-guide",
       "redirect_document_id": false
     },
     {
@@ -72,7 +72,7 @@
     },
     {
       "source_path": "windows/configuration/manage-windows-endpoints-version-1709.md",
-      "redirect_url": "/windows/privacy/manage-windows-endpoints",
+      "redirect_url": "/windows/privacy/index",
       "redirect_document_id": false
     },
     {
@@ -262,17 +262,17 @@
     },
     {
       "source_path": "windows/configuration/windows-diagnostic-data-1703.md",
-      "redirect_url": "/windows/privacy/windows-diagnostic-data-1703",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1703",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/configuration/windows-diagnostic-data-1709.md",
-      "redirect_url": "/windows/configuration/windows-diagnostic-data",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1709",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/configuration/windows-diagnostic-data.md",
-      "redirect_url": "/windows/privacy/windows-diagnostic-data",
+      "redirect_url": "/windows/privacy/index",
       "redirect_document_id": false
     },
     {

diff --git a/.openpublishing.redirection.windows-privacy.json b/.openpublishing.redirection.windows-privacy.json
@@ -2,22 +2,22 @@
   "redirections": [
     {
       "source_path": "windows/privacy/basic-level-windows-diagnostic-events-and-fields.md",
-      "redirect_url": "/windows/privacy/required-windows-diagnostic-data-events-and-fields-2004",
+      "redirect_url": "/windows/privacy/index",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/privacy/deploy-data-processor-service-windows.md",
-      "redirect_url": "/windows/privacy/windows-10-and-privacy-compliance",
+      "redirect_url": "/windows/privacy/windows-privacy-compliance-guide",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/privacy/gdpr-it-guidance.md",
-      "redirect_url": "/windows/privacy/windows-10-and-privacy-compliance",
+      "redirect_url": "/windows/privacy/windows-privacy-compliance-guide",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/privacy/gdpr-win10-whitepaper.md",
-      "redirect_url": "/windows/privacy/windows-10-and-privacy-compliance",
+      "redirect_url": "/windows/privacy/windows-privacy-compliance-guide",
       "redirect_document_id": false
     },
     {
@@ -27,38 +27,138 @@
     },
     {
       "source_path": "windows/privacy/manage-windows-1709-endpoints.md",
-      "redirect_url": "/windows/privacy/manage-windows-21h2-endpoints",
+      "redirect_url": "/windows/privacy/index",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/privacy/manage-windows-1803-endpoints.md",
-      "redirect_url": "/windows/privacy/manage-windows-21h2-endpoints",
+      "redirect_url": "/windows/privacy/index",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/privacy/manage-windows-endpoints.md",
-      "redirect_url": "/windows/privacy/manage-windows-2004-endpoints",
+      "redirect_url": "/windows/privacy/index",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/privacy/windows-endpoints-1709-non-enterprise-editions.md",
-      "redirect_url": "/windows/privacy/windows-endpoints-21h1-non-enterprise-editions",
+      "redirect_url": "/windows/privacy/index",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/privacy/windows-endpoints-1803-non-enterprise-editions.md",
-      "redirect_url": "/windows/privacy/windows-endpoints-21h1-non-enterprise-editions",
+      "redirect_url": "/windows/privacy/index",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/privacy/windows-personal-data-services-configuration.md",
-      "redirect_url": "/windows/privacy/windows-10-and-privacy-compliance",
+      "redirect_url": "/windows/privacy/windows-privacy-compliance-guide",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/privacy/enhanced-diagnostic-data-windows-analytics-events-and-fields.md",
       "redirect_url": "https://techcommunity.microsoft.com/t5/windows-it-pro-blog/preview-app-and-driver-compatibility-insights-in-endpoint/ba-p/3482136",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/basic-level-windows-diagnostic-events-and-fields-1703.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1703",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/basic-level-windows-diagnostic-events-and-fields-1709.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1709",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/basic-level-windows-diagnostic-events-and-fields-1803.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1803",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/basic-level-windows-diagnostic-events-and-fields-1903.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1903",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/manage-windows-1903-endpoints.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/manage-windows-1903-endpoints",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/manage-windows-1909-endpoints.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/manage-windows-1909-endpoints",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/manage-windows-2004-endpoints.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/manage-windows-2004-endpoints",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/manage-windows-20H2-endpoints.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/manage-windows-20H2-endpoints",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/manage-windows-21H1-endpoints.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/manage-windows-21H1-endpoints",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/windows-endpoints-1809-non-enterprise-editions.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/windows-endpoints-1809-non-enterprise-editions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/windows-endpoints-1903-non-enterprise-editions.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/windows-endpoints-1903-non-enterprise-editions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/windows-endpoints-1909-non-enterprise-editions.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/windows-endpoints-1909-non-enterprise-editions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/windows-endpoints-2004-non-enterprise-editions.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/windows-endpoints-2004-non-enterprise-editions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/windows-endpoints-20H2-non-enterprise-editions.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/windows-endpoints-20H2-non-enterprise-editions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/windows-endpoints-21H1-non-enterprise-editions.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/windows-endpoints-21H1-non-enterprise-editions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/windows-diagnostic-data-1703.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/basic-level-windows-diagnostic-events-and-fields-1703",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/changes-to-windows-diagnostic-data-collection.md",
+      "redirect_url": "/previous-versions/windows/it-pro/privacy/changes-to-windows-diagnostic-data-collection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/privacy/windows-10-and-privacy-compliance.md",
+      "redirect_url": "/windows/privacy/windows-privacy-compliance-guide",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "windows/privacy/windows-diagnostic-data.md",
+      "redirect_url": "/windows/privacy/optional-diagnostic-data",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "windows/privacy/Microsoft-DiagnosticDataViewer.md",
+      "redirect_url": "/windows/privacy/diagnostic-data-viewer-powershell",
+      "redirect_document_id": true
     }
   ]
 }
diff --git a/windows/hub/index.yml b/windows/hub/index.yml
@@ -91,7 +91,7 @@ productDirectory:
           text: Diagnostic Data Viewer
         - url: /windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services
           text: Manage connections to Microsoft services
-        - url: /windows/privacy/windows-10-and-privacy-compliance
+        - url: /windows/privacy/windows-privacy-compliance-guide
           text: Windows privacy compliance guide
         - url: /windows/privacy
           text: Learn more about privacy in Windows >