From acbc5a31db0d732e3cd83087901cc3d251da6287 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Wed, 6 Jul 2016 10:55:57 -0700 Subject: [PATCH 1/4] Added a link to OMS --- windows/keep-secure/windows-security-baselines.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows/keep-secure/windows-security-baselines.md b/windows/keep-secure/windows-security-baselines.md index 770c21fa50..8de10f121a 100644 --- a/windows/keep-secure/windows-security-baselines.md +++ b/windows/keep-secure/windows-security-baselines.md @@ -49,8 +49,10 @@ To help faster deployments and increase the ease of managing Windows, Microsoft - [Windows 10, Version 1511 security baseline](http://go.microsoft.com/fwlink/p/?LinkID=799381) - [Windows 10, Version 1507 security baseline](http://go.microsoft.com/fwlink/p/?LinkID=799380) - + + ### Windows Server security baselines - + - [Windows Server 2012 R2 security baseline](http://go.microsoft.com/fwlink/p/?LinkID=799382) +>**Note:** Microsoft’s Operation Management Services (OMS) helps you monitor security baseline deployments across your servers. To find out more, check out [Operations Management Suite](https://aka.ms/omssecscm). \ No newline at end of file From 4cc171a06c7449b77b6d7bfdf4c0c77a9ce5ed25 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Wed, 6 Jul 2016 16:11:36 -0700 Subject: [PATCH 2/4] tech review feedback for OMS section --- windows/keep-secure/windows-security-baselines.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/windows/keep-secure/windows-security-baselines.md b/windows/keep-secure/windows-security-baselines.md index 8de10f121a..6570271f0a 100644 --- a/windows/keep-secure/windows-security-baselines.md +++ b/windows/keep-secure/windows-security-baselines.md @@ -36,15 +36,14 @@ To help faster deployments and increase the ease of managing Windows, Microsoft You can use security baselines to: - Ensure that user and device configuration settings are compliant with the baseline. - - Set configuration settings. For example, you can use Group Policy, System Center Configuration Manager, or Microsoft Intune to configure a device with the setting values specified in the baseline. - + - Set configuration settings. For example, you can use Group Policy, System Center Configuration Manager, or Microsoft Intune to configure a device with the setting values specified in the baseline. ## Where can I get the security baselines? Here's a list of security baselines that are currently available. > **Note:** If you want to know what has changed with each security baseline, or if you want to stay up-to-date on what’s happening with them, check out the [Microsoft Security Guidance](http://blogs.technet.microsoft.com/secguide) blog. - + ### Windows 10 security baselines - [Windows 10, Version 1511 security baseline](http://go.microsoft.com/fwlink/p/?LinkID=799381) @@ -55,4 +54,7 @@ To help faster deployments and increase the ease of managing Windows, Microsoft - [Windows Server 2012 R2 security baseline](http://go.microsoft.com/fwlink/p/?LinkID=799382) ->**Note:** Microsoft’s Operation Management Services (OMS) helps you monitor security baseline deployments across your servers. To find out more, check out [Operations Management Suite](https://aka.ms/omssecscm). \ No newline at end of file +## How can I monitor the security baseline deployment on my servers? + + Microsoft’s Operation Management Services (OMS) helps you monitor security baseline deployments across your servers. To find out more, check out [Operations Management Suite](https://aka.ms/omssecscm). + \ No newline at end of file From 1b55c24bd040d51bbbd22732d79a0891ea1f4cb6 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Thu, 7 Jul 2016 09:27:53 -0700 Subject: [PATCH 3/4] tech review feedback --- windows/keep-secure/windows-security-baselines.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows/keep-secure/windows-security-baselines.md b/windows/keep-secure/windows-security-baselines.md index 6570271f0a..3a4beedd20 100644 --- a/windows/keep-secure/windows-security-baselines.md +++ b/windows/keep-secure/windows-security-baselines.md @@ -54,7 +54,9 @@ To help faster deployments and increase the ease of managing Windows, Microsoft - [Windows Server 2012 R2 security baseline](http://go.microsoft.com/fwlink/p/?LinkID=799382) -## How can I monitor the security baseline deployment on my servers? +## How can I monitor security baseline deployments? - Microsoft’s Operation Management Services (OMS) helps you monitor security baseline deployments across your servers. To find out more, check out [Operations Management Suite](https://aka.ms/omssecscm). +Microsoft’s Operation Management Services (OMS) helps you monitor security baseline deployments across your servers. To find out more, check out [Operations Management Suite](https://aka.ms/omssecscm). + +You can use [System Center Configuration Manager](https://www.microsoft.com/cloud-platform/system-center-configuration-manager) to monitor security baseline deployments on client devices within your organization. \ No newline at end of file From 9bf467f887464832378dfeb2bb707f612d6f8bce Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Thu, 7 Jul 2016 09:45:03 -0700 Subject: [PATCH 4/4] add procedure for reset device; fix typo; add alt text to provisioning pkg topic --- devices/surface-hub/device-reset-surface-hub.md | 7 ++++++- .../prepare-your-environment-for-surface-hub.md | 4 ++-- .../provisioning-packages-for-certificates-surface-hub.md | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/devices/surface-hub/device-reset-surface-hub.md b/devices/surface-hub/device-reset-surface-hub.md index e630d1f23b..f5b26ffc1a 100644 --- a/devices/surface-hub/device-reset-surface-hub.md +++ b/devices/surface-hub/device-reset-surface-hub.md @@ -29,10 +29,15 @@ Initiating a reset will return the device to the last cumulative Windows update, - Local admins on the device - Configurations from MDM or the Settings app +**To reset a Surface Hub** +1. On your Surface Hub, open **Settings**. +2. Click **Update & Security**. +3. Click **Recovery**, and then click **Reset Device**. + **Important Note**
Performing a device reset may take up to 6 hours. Do not interrupt the reset process. Interrupting the process will render the device inoperable, requiring warranty service to return to normal functionality. -After the reset, you'll be taken through the [first run program](first-run-program-surface-hub.md) again. +After the reset, Surface Hub restarts the [first run program](first-run-program-surface-hub.md) again. ## Related topics diff --git a/devices/surface-hub/prepare-your-environment-for-surface-hub.md b/devices/surface-hub/prepare-your-environment-for-surface-hub.md index 8656c33064..d4af065b4b 100644 --- a/devices/surface-hub/prepare-your-environment-for-surface-hub.md +++ b/devices/surface-hub/prepare-your-environment-for-surface-hub.md @@ -29,7 +29,7 @@ In order to function properly, the Surface Hub must have access to a wired or wi - Can receive an IP address using DHCP - Open ports: - HTTPS: 443 - - HTTP: 8080 + - HTTP: 80 A wired connection is preferred. @@ -79,7 +79,7 @@ In order to ensure that your environment is ready for the Surface Hub, verify th - It must have these ports open: - HTTPS: 443 - - HTTP: 8080 + - HTTP: 80 If your network runs through a proxy, you'll need the proxy address or script information as well. diff --git a/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md b/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md index 8dbaf9a681..0d7c350af6 100644 --- a/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md +++ b/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md @@ -236,15 +236,15 @@ The following two methods for deploying provisioning packages apply to any kind 3. Navigate to **System > Work Access**. Under the header **Related settings**, click on **Add or remove a management package**. 4. Here, click the button for **Add a package**. - ![](images/provisioningpackagesettings-01.png) + ![Image showing provisioining packages page in Settings.](images/provisioningpackagesettings-01.png) 5. Click **Removable media** from the dropdown list. You will see a list of available provisioning packages on the **Settings** page. - ![](images/provisioningpackagesettings-02.png) + ![Image showing add a package page in Settings.](images/provisioningpackagesettings-02.png) 6. Choose your package and click **Add**. - ![](images/provisioningpackagesettings-03.png) + ![Image showing select a package box.](images/provisioningpackagesettings-03.png) 7. You may have to re-enter the admin credentials if User Access Control (UAC) asks for them. 8. You’ll see a confirmation dialog box. Click **Yes, add it**. The certificate will be installed.