diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index bc8acb0f6a..737430f195 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -15038,6 +15038,11 @@
"redirect_document_id": true
},
{
+"source_path": "windows/deployment/windows-10-architecture-posters.md",
+"redirect_url": "/windows/deployment/windows-10-deployment-scenarios",
+"redirect_document_id": true
+},
+{
"source_path": "windows/device-security/index.md",
"redirect_url": "/windows/security/threat-protection",
"redirect_document_id": true
diff --git a/browsers/edge/docfx.json b/browsers/edge/docfx.json
index 0bd095bc75..5944d644ce 100644
--- a/browsers/edge/docfx.json
+++ b/browsers/edge/docfx.json
@@ -25,7 +25,6 @@
}
],
"globalMetadata": {
- "uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/microsoft-edge/deploy/breadcrumb/toc.json",
"ROBOTS": "INDEX, FOLLOW",
"ms.technology": "microsoft-edge",
diff --git a/browsers/internet-explorer/docfx.json b/browsers/internet-explorer/docfx.json
index 7590327773..153f4be5f1 100644
--- a/browsers/internet-explorer/docfx.json
+++ b/browsers/internet-explorer/docfx.json
@@ -22,7 +22,6 @@
}
],
"globalMetadata": {
- "uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/internet-explorer/breadcrumb/toc.json",
"ROBOTS": "INDEX, FOLLOW",
"ms.author": "shortpatti",
diff --git a/devices/hololens/docfx.json b/devices/hololens/docfx.json
index 0652ccd8b0..b19110b8f2 100644
--- a/devices/hololens/docfx.json
+++ b/devices/hololens/docfx.json
@@ -29,7 +29,6 @@
"overwrite": [],
"externalReference": [],
"globalMetadata": {
- "uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/hololens/breadcrumb/toc.json",
"ms.technology": "windows",
"ms.topic": "article",
diff --git a/devices/surface-hub/docfx.json b/devices/surface-hub/docfx.json
index c5b96ab0fe..857f59487f 100644
--- a/devices/surface-hub/docfx.json
+++ b/devices/surface-hub/docfx.json
@@ -22,15 +22,12 @@
}
],
"globalMetadata": {
- "uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/surface-hub/breadcrumb/toc.json",
"ROBOTS": "INDEX, FOLLOW",
"ms.technology": "windows",
"ms.topic": "article",
"ms.mktglfcycl": "manage",
- "author": "jdeckerms",
"ms.sitesec": "library",
- "ms.author": "jdecker",
"ms.date": "05/23/2017",
"feedback_system": "GitHub",
"feedback_github_repo": "MicrosoftDocs/windows-itpro-docs",
diff --git a/devices/surface-hub/surface-hub-2s-manage-intune.md b/devices/surface-hub/surface-hub-2s-manage-intune.md
index e3a7be2b04..1853f3264d 100644
--- a/devices/surface-hub/surface-hub-2s-manage-intune.md
+++ b/devices/surface-hub/surface-hub-2s-manage-intune.md
@@ -35,11 +35,11 @@ Select Windows 10 Team for preset device restriction settings for Surface Hub an

-These settings include user experience and app behavior, Azure Log Analytics registration, Maintenance windows configuration, Session settings, and Miracast settings. For a complete list of configuration service providers (CSPs) for the Windows 10 Team operating system, see [Surface Hub CSPs in Windows 10](https://docs.microsoft.com/windows/client-management/mdm/surfacehub-csp)
+These settings include user experience and app behavior, Azure Log Analytics registration, Maintenance windows configuration, Session settings, and Miracast settings. For a complete list of available Windows 10 Team settings, see [SurfaceHub CSP](https://docs.microsoft.com/windows/client-management/mdm/surfacehub-csp).
-## Additional supported configuration service providers
+## Additional supported configuration service providers (CSPs)
-For additional supported CSPs, see [SurfaceHub CSP](https://docs.microsoft.com/windows/client-management/mdm/configuration-service-provider-reference#surfacehubcspsuppor).
+For additional supported CSPs, see [Surface Hub CSPs in Windows 10](https://docs.microsoft.com/windows/client-management/mdm/configuration-service-provider-reference#surfacehubcspsupport).
## Quality of Service (QoS) settings
diff --git a/devices/surface/docfx.json b/devices/surface/docfx.json
index 207b2119b7..75607e9f4d 100644
--- a/devices/surface/docfx.json
+++ b/devices/surface/docfx.json
@@ -22,12 +22,10 @@
}
],
"globalMetadata": {
- "uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/surface/breadcrumb/toc.json",
"ROBOTS": "INDEX, FOLLOW",
"ms.technology": "windows",
"ms.topic": "article",
- "ms.author": "jdecker",
"ms.date": "05/09/2017",
"feedback_system": "GitHub",
"feedback_github_repo": "MicrosoftDocs/windows-itpro-docs",
diff --git a/education/docfx.json b/education/docfx.json
index 5e87a91352..c336a4de5b 100644
--- a/education/docfx.json
+++ b/education/docfx.json
@@ -14,7 +14,9 @@
"resource": [
{
"files": [
- "**/images/**"
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.svg"
],
"exclude": [
"**/obj/**"
@@ -22,9 +24,7 @@
}
],
"globalMetadata": {
- "uhfHeaderId": "MSDocsHeader-WindowsIT",
"ROBOTS": "INDEX, FOLLOW",
- "ms.author": "celested",
"audience": "windows-education",
"ms.topic": "article",
"breadcrumb_path": "/education/breadcrumb/toc.json",
diff --git a/education/images/data-streamer.png b/education/images/data-streamer.png
new file mode 100644
index 0000000000..6473d9da33
Binary files /dev/null and b/education/images/data-streamer.png differ
diff --git a/education/images/education-partner-aep-2.svg b/education/images/education-partner-aep-2.svg
index 96ecbf019b..6bf0c2c3ac 100644
--- a/education/images/education-partner-aep-2.svg
+++ b/education/images/education-partner-aep-2.svg
@@ -1,4 +1,4 @@
-