Merge branch 'master' into live

devices/surface-hub/device-reset-surface-hub.md

@@ -31,8 +31,16 @@ Initiating a reset will return the device to the last cumulative Windows update,
 
 **To reset a Surface Hub**
 1.	On your Surface Hub, open **Settings**. 
-2.	Click **Update & Security**. 
-3.	Click **Recovery**, and then click **Reset Device**. 
+
+    ![Image showing Settings app for Surface Hub.](images/sh-settings.png)
+ 
+2.	Click **Update & Security**.
+
+    ![Image showing Update & Security group in Settings app for Surface Hub.](images/sh-settings-update-security.png)
+ 
+3.	Click **Recovery**, and then click **Get started**.
+
+    ![Image showing Reset device option in Settings app for Surface Hub.](images/sh-settings-reset-device.png) 
 
 **Important Note**</br>
 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.

devices/surface/deploy-surface-app-with-windows-store-for-business.md

@@ -81,6 +81,8 @@ Figure 5 shows the required frameworks for the Surface app.
 
 *Figure 5. Required frameworks for the Surface app*
 
+>**Note:**  The version numbers of the Surface app and required frameworks will change as the apps are updated. Check for the latest version of Surface app and each framework in Windows Store for Business. Always use the Surface app and recommended framework versions as provided by Windows Store for Business. Using outdated frameworks or the incorrect versions may result in errors or application crashes.
+
 To download the required frameworks for the Surface app, follow these steps:
 1.	Click the **Download** button under **Microsoft.VCLibs.140.00_14.0.23816.0_x64__8wekyb3d8bbwe**. This downloads the Microsoft.VCLibs.140.00_14.0.23816.0_x64__8wekyb3d8bbwe.Appx file to your specified folder.
 2.	Click the **Download** button under **Microsoft.NET.Native.Runtime.1.1_1.1.23406.0_x64__8wekyb3d8bbwe**. This downloads the Microsoft.NET.Native.Runtime.1.1_1.1.23406.0_x64__8wekyb3d8bbwe.Appx file to your specified folder.

windows/keep-secure/windows-security-baselines.md

@@ -12,7 +12,7 @@ author: brianlic-msft
 
 Microsoft is dedicated to provide our customers with a secure operating system, such as Windows 10 and Windows Server, as well as secure apps, such as Microsoft Edge. In addition to the security assurance of its products, Microsoft also enables you to have fine control of your environments by providing various configuration capabilities. Even though Windows and Windows Server are designed to be secure out-of-the-box, a large number of organizations still want more granular control of their security configurations. To navigate these large number of controls, organizations need guidance for configuring various security features. Microsoft provides this guidance in the form of security baselines.
 
-We recommend implementing an industry-standard configuration that is broadly known and well-tested, such as a Mirosoft security baseline, as opposed to creating one yourself. This helps increase flexibility and reduce costs.  
+We recommend implementing an industry-standard configuration that is broadly known and well-tested, such as a Microsoft security baseline, as opposed to creating one yourself. This helps increase flexibility and reduce costs.  
 
 ## What are security baselines?