diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index 1fe80284d7..0c4909bd02 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/devices/surface-hub/surface-hub-2s-manage-intune.md b/devices/surface-hub/surface-hub-2s-manage-intune.md
index 6c4f69a022..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 addtional supported CSPs, see [SurfaceHub CSP](https://docs.microsoft.com/en-us/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-hub/surface-hub-2s-site-planning.md b/devices/surface-hub/surface-hub-2s-site-planning.md
index 52ca16a3ba..4da20953a0 100644
--- a/devices/surface-hub/surface-hub-2s-site-planning.md
+++ b/devices/surface-hub/surface-hub-2s-site-planning.md
@@ -20,16 +20,7 @@ Designed for team collaboration, Surface Hub 2S can transform the way you work
## Room considerations
-Designed for interactive use in smaller conference rooms and huddle spaces, Surface Hub 2S provides a 4K camera, microphone array, crystal clear speakers, and a brilliant 4K+ resolution display. Optimizing the user experience in larger spaces with more people further away from the display may require peripherals such as an extra camera, microphone, or room systems solution such as Microsoft Teams Rooms. Use the following proximity guidance to determine if you need to plan for peripherals.
-
-
-| **Room/Space** | **Participants** | **Proximity** | **Additional peripherals** |
-| ---------------------------- | ------------ | -------------------- | -------------------------- |
-| Collaboration – Huddle space | 1-3 | 1–2 meters | None |
-| Collaboration – Lounge space | 3-6 | More than 2.3m | Peripherals Recommended |
-| Small meeting room | 4-6 | Up to 2.3 meters | None |
-| Medium, Larger meeting rooms | 6 + | More than 2.3 meters | Peripherals recommended |
-
+Designed for interactive use in smaller conference rooms and huddle spaces, Surface Hub 2S provides a 4K camera, microphone array, crystal clear speakers, and a brilliant 4K+ resolution display. Optimizing the user experience in larger spaces with more people further away from the display may require peripherals such as an extra camera, microphone, or room systems solution such as Microsoft Teams Rooms.
As a general guideline, install Surface Hub 2S in a space that meets the following criteria:
diff --git a/education/docfx.json b/education/docfx.json
index 5e87a91352..7a2761cf2e 100644
--- a/education/docfx.json
+++ b/education/docfx.json
@@ -14,7 +14,9 @@
"resource": [
{
"files": [
- "**/images/**"
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.svg"
],
"exclude": [
"**/obj/**"
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 @@
-