diff --git a/devices/surface-hub/images/sh2-reset.png b/devices/surface-hub/images/sh2-reset.png index 203a9d9559..06b306ec5d 100644 Binary files a/devices/surface-hub/images/sh2-reset.png and b/devices/surface-hub/images/sh2-reset.png differ diff --git a/devices/surface-hub/surface-hub-2s-connect.md b/devices/surface-hub/surface-hub-2s-connect.md index 2694f641bb..3c39dc9774 100644 --- a/devices/surface-hub/surface-hub-2s-connect.md +++ b/devices/surface-hub/surface-hub-2s-connect.md @@ -21,7 +21,7 @@ Surface Hub 2S lets you connect external devices, mirror the display on Surface You can display content from your devices to Surface Hub 2S. If the source device is Windows-based, that device can also provide TouchBack and InkBack, which takes video and audio from the connected device and presents them on Surface Hub 2S. If Surface Hub 2S encounters a High-Bandwidth Digital Content Protection (HDCP) signal, such as a Blu-ray DVD player, the source is displayed as a black image. > [!NOTE] -> Surface Hub-2S uses the video input selected until a new connection is made, the existing connection is disrupted, or the Connect App is closed. +> Surface Hub 2S uses the video input selected until a new connection is made, the existing connection is disrupted, or the Connect App is closed. ## Recommended wired configurations for connecting to Surface Hub 2S @@ -29,7 +29,7 @@ In general, it’s recommended to use native cable connections whenever possible |**Mode**|**Connection**|**Functionality**|**Comments**| |:---- |:---------- |:------------ |:-------- | -| Wired “Connect” Application | USB-C (via compute module) | Video, audio, TouchBack/InkBack into Surface Hub 2S.| Provides display port video, audio, and TouchBack/InkBack on a single cable. | +| Wired “Connect” Application | USB-C (via compute module) | Video, audio, TouchBack/InkBack into Surface Hub 2S.| Provides video, audio, and TouchBack/InkBack on a single cable. | | | HDMI + USB-C | HDMI-in for Audio/Video
USB-C for TouchBack/InkBack | USB-C supports TouchBack/InkBack with the HDMI A/V connection

Use USB-C to USB-A to connect to legacy computers

*NOTE: For best results, connect HDMI before connecting USB-C cable. If the computer you are using for HDMI is not compatible with TouchBack and InkBack, you won't need a USB-C cable.* | | “Source” selection experience
(bypasses the OS, full screen requires source selection with keypad button) | USB-C (port in compute module) | Video, Audio into Surface Hub 2S | Single cable needed for A/V
Touchback/InkBack not supported
HDCP enabled | | | HDMI (in port) | Video, Audio into Surface Hub 2S | Single cable needed for A/V
TouchBack/InkBack not supported
HDCP enabled | diff --git a/devices/surface-hub/surface-hub-2s-manage-intune.md b/devices/surface-hub/surface-hub-2s-manage-intune.md index 3255c15c5d..6c4f69a022 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 ![Set device restrictions for Surface Hub 2S.](images/sh2-set-intune3.png)
-These settings include user experience and app behavior, Azure Log Analytics registration, Maintenance windows configuration, Session settings, and Miracast settings. +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) ## Additional supported configuration service providers -For a list of all available configuration service providers (CSPs), see [SurfaceHub CSP](https://docs.microsoft.com/en-us/windows/client-management/mdm/surfacehub-csp). +For addtional supported CSPs, see [SurfaceHub CSP](https://docs.microsoft.com/en-us/windows/client-management/mdm/configuration-service-provider-reference#surfacehubcspsuppor). ## Quality of Service (QoS) settings diff --git a/devices/surface-hub/surface-hub-2s-prepare-environment.md b/devices/surface-hub/surface-hub-2s-prepare-environment.md index 8031040807..009b996c6b 100644 --- a/devices/surface-hub/surface-hub-2s-prepare-environment.md +++ b/devices/surface-hub/surface-hub-2s-prepare-environment.md @@ -30,7 +30,7 @@ With the Windows 10 Team Edition operating system — that runs on Surface Hub > [!NOTE] > You can only set Device affiliation during the initial out-of-box experience (OOBE) setup. If you need to reset Device affiliation, you’ll have to repeat OOBE setup. -##3 No affiliation +## No affiliation No affiliation is like having Surface Hub 2S in a workgroup with a different local Administrator account on each Surface Hub 2S. If you choose No affiliation, you must locally save the [Bitlocker Key to a USB thumb drive](https://docs.microsoft.com/en-us/windows/security/information-protection/bitlocker/bitlocker-key-management-faq). You can still enroll the device with Intune, however only the local admin can access the Settings app using the account credentials configured during OOBE. You can change the Administrator account password from the Settings app. diff --git a/devices/surface-hub/surface-hub-2s-quick-start.md b/devices/surface-hub/surface-hub-2s-quick-start.md index f6bea38ed9..9d208ca609 100644 --- a/devices/surface-hub/surface-hub-2s-quick-start.md +++ b/devices/surface-hub/surface-hub-2s-quick-start.md @@ -41,3 +41,5 @@ Remove the lens cling from the camera and attach it to the USB-C port on the top 1. Insert the power cable into the back of the device and plug it into a power outlet. Run the cable through any cable guides on your mounting solution and remove the screen clang. 2. To begin, press the power button on the bottom right. + +![* Keypad showing source, volume and power buttons*](images/sh2-keypad.png)
diff --git a/devices/surface-hub/surface-hub-2s-recover-reset.md b/devices/surface-hub/surface-hub-2s-recover-reset.md index 239382cd24..fc5e79e345 100644 --- a/devices/surface-hub/surface-hub-2s-recover-reset.md +++ b/devices/surface-hub/surface-hub-2s-recover-reset.md @@ -14,7 +14,7 @@ ms.localizationpriority: Normal # Reset and recovery for Surface Hub 2S -If you encounter problems with Surface Hub 2S, you can reset the device to factory settings, recover from the cloud, or recover using a USB drive. +If you encounter problems with Surface Hub 2S, you can reset the device to factory settings or recover using a USB drive. To begin, sign into Surface Hub 2S with admin credentials, open the **Settings** app, select **Update & security**, and then select **Recovery**. @@ -28,14 +28,6 @@ To begin, sign into Surface Hub 2S with admin credentials, open the **Settings** ![*Reset and recovery for Surface Hub 2S*](images/sh2-reset.png)
*Figure 1. Reset and recovery for Surface Hub 2S.* -## Recover from the cloud - -1. To recover, select **Restart now**. -2. In advanced startup mode, select the option to recover the device from the cloud. Surface Hub 2S downloads the latest available customer image from the cloud and reinstalls the operating system. -3. Remain connected to the network during the recovery process. -4. Run **the first time Setup program** to reconfigure the device. -5. If you manage the device using Intune or other mobile device manager (MDM) solution, retire and delete the previous record and re-enroll the new device. For more information, see [Remove devices by using wipe, retire, or manually unenrolling the device](https://docs.microsoft.com/en-us/intune/devices-wipe). - ## Recover Surface Hub 2S using USB recovery drive New in Surface Hub 2S, you can now reinstall the device using a recovery image. @@ -46,7 +38,7 @@ Surface Hub 2S lets you reinstall the device using a recovery image, which allow 1. Begin with a USB 3.0 drive with 8 GB or 16 GB of storage, formatted as FAT32. 2. Download recovery image from the Surface Recovery website onto the USB drive and connect it to any USB-C or USB A port on Surface Hub 2S. -3. Turn off the device, hold the Volume down button, and then press the Power. Keep holding the Volume down button until you see circling dots below the Windows logo. +3. Turn off the device. While holding down the Volume down button, press the Power button. Keep holding both buttons until you see the Windows logo. Release the Power button but continue to hold the Volume until the Install UI begins. ![*Use Volume down and power buttons to initiate recovery*](images/sh2-keypad.png)
diff --git a/devices/surface-hub/surface-hub-2s-site-planning.md b/devices/surface-hub/surface-hub-2s-site-planning.md index 93163c1bd8..b3a0143877 100644 --- a/devices/surface-hub/surface-hub-2s-site-planning.md +++ b/devices/surface-hub/surface-hub-2s-site-planning.md @@ -20,7 +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, 8-element 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. +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 size** | **Participants** | **Proximity** | **Additional peripherals** | diff --git a/devices/surface-hub/surface-hub-2s-techspecs.md b/devices/surface-hub/surface-hub-2s-techspecs.md index 107c6e7f85..e009e2d514 100644 --- a/devices/surface-hub/surface-hub-2s-techspecs.md +++ b/devices/surface-hub/surface-hub-2s-techspecs.md @@ -33,4 +33,4 @@ ms.localizationpriority: Normal |**Warranty**| 1-year limited hardware warranty | > [!NOTE] -> 1 System software uses significant storage space. Available storage is subject to change based on system software updates and apps usage. 1 GB= 1 billion bytes. See Surface.com/Storage for more details.
2 Software license required for some features. Sold separately.
3 Tilt functionality is currently available +> 1 System software uses significant storage space. Available storage is subject to change based on system software updates and apps usage. 1 GB= 1 billion bytes. See Surface.com/Storage for more details.
2 Software license required for some features. Sold separately.
diff --git a/windows/security/threat-protection/microsoft-defender-atp/data-retention-settings.md b/windows/security/threat-protection/microsoft-defender-atp/data-retention-settings.md index eac5c12814..249bf4cfb4 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/data-retention-settings.md +++ b/windows/security/threat-protection/microsoft-defender-atp/data-retention-settings.md @@ -30,7 +30,7 @@ ms.date: 04/24/2018 During the onboarding process, a wizard takes you through the general settings of Microsoft Defender ATP. After onboarding, you might want to update the data retention settings. -1. In the navigation pane, select **Settings** > **Data rention**. +1. In the navigation pane, select **Settings** > **Data retention**. 2. Select the data retention duration from the drop-down list.