Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs

windows/keep-secure/TOC.md

@@ -572,7 +572,7 @@
 ###### [Domain member: Maximum machine account password age](domain-member-maximum-machine-account-password-age.md)
 ###### [Domain member: Require strong (Windows 2000 or later) session key](domain-member-require-strong-windows-2000-or-later-session-key.md)
 ###### [Interactive logon: Display user information when the session is locked](interactive-logon-display-user-information-when-the-session-is-locked.md)
-###### [Interactive logon: Do not display last user name](interactive-logon-do-not-display-last-user-name.md)
+###### [Interactive logon: Don\'t display last signed-in](interactive-logon-do-not-display-last-user-name.md)
 ###### [Interactive logon: Do not require CTRL+ALT+DEL](interactive-logon-do-not-require-ctrl-alt-del.md)
 ###### [Interactive logon: Machine account lockout threshold](interactive-logon-machine-account-lockout-threshold.md)
 ###### [Interactive logon: Machine inactivity limit](interactive-logon-machine-inactivity-limit.md)

windows/keep-secure/interactive-logon-display-user-information-when-the-session-is-locked.md

@@ -17,9 +17,9 @@ author: brianlic-msft
 Describes the best practices, location, values, and security considerations for the **Interactive logon: Display user information when the session is locked** security policy setting.
 
 ## Reference
-This setting controls whether details such as email address or domain\username appear with the username on the sign-in screen. 
+This security setting controls whether details such as email address or domain\username appear with the username on the sign-in screen. 
 For clients that run Windows 10 version 1511 and 1507 (RTM), this setting works similarly to previous versions of Windows. 
-Due to a new **Privacy** setting in Windows 10 version 1607, this setting affects those clients differently. 
+However, because of a new **Privacy** setting introduced in Windows 10 version 1607, this security setting affects those clients differently. 
 
 ### Changes in Windows 10 version 1607
 
@@ -36,7 +36,7 @@ This setting has these possible values:
 -   **User display name, domain and user names**
 
     For a local logon, the user's full name is displayed. 
-    If the user signed in using a Microsoft Account, the user's email address is displayed. 
+    If the user signed in using a Microsoft account, the user's email address is displayed. 
     For a domain logon, the domain\username is displayed. 
     This has the same effect as turning on the **Privacy** setting. 
 
@@ -51,7 +51,7 @@ This setting has these possible values:
     Beginning with Windows 10 version 1607, this option is not supported. 
     If this option is chosen, the full name of the user who locked the session is displayed instead. 
     This change makes this setting consistent with the functionality of the new **Privacy** setting. 
-    To have no user information displayed, enable the Group Policy setting **Interactive logon: Don't display last signed-in**.
+    To display no user information, enable the Group Policy setting **Interactive logon: Don't display last signed-in**.
 
 -   Blank.
 
@@ -71,7 +71,7 @@ There are related Group Policy settings:
 
 - **Computer Configuration\Policies\Administrative Templates\System\Logon\Block user from showing account details on sign-in** prevents users from showing account details on the sign-in screen. 
 - **Computer Configuration\Windows Settings\Security Settings\Local Policies\Security Options\Don’t display last signed-in** prevents the username of the last user to sign in from being shown.
-- **Computer Configuration\Windows Settings\Security Settings\Local Policies\Security Options\Don’t display user name at sign in** prevents the username from being shown at Windows sign-in and immediately after credentials are entered and before the desktop appears. 
+- **Computer Configuration\Windows Settings\Security Settings\Local Policies\Security Options\Don’t display username at sign-in** prevents the username from being shown at Windows sign-in and immediately after credentials are entered and before the desktop appears. 
 
 ### Interaction with related Group Policy settings
 

windows/manage/waas-delivery-optimization.md

@@ -99,6 +99,8 @@ Download mode dictates which download sources clients are allowed to use when do
 By default, peer sharing on clients using the group download mode is limited to the same domain in Windows 10, version 1511, and the same domain and AD DS site in Windows 10, version 1607. By using the Group ID setting, you can optionally create a custom group that contains devices that should participate in Delivery Optimization but do not fall within those domain or AD DS site boundaries, including devices in another domain. Using Group ID, you can further restrict the default group (for example create a sub-group representing an office building), or extend the group beyond the domain, allowing devices in multiple domains in your organization to peer. This setting requires the custom group to be specified as a GUID on each device that participates in the custom group. 
 
 >[!NOTE]
+>To generate a GUID using Powershell, use [```[guid]::NewGuid()```](https://blogs.technet.microsoft.com/heyscriptingguy/2013/07/25/powertip-create-a-new-guid-by-using-powershell/)
+>
 >This configuration is optional and not required for most implementations of Delivery Optimization.
     
 ### Max Cache Age

windows/manage/waas-optimize-windows-10-updates.md

@@ -61,7 +61,7 @@ For OS updates that support Express, there are two versions of the file payload
 1. **Full-file version** - essentially replacing the local versions of the update binaries.
 2. **Express version** - containing the deltas needed to patch the existing binaries on the device.
 
-Both the full-file version and the Express version are referenced in the udpate's metadata, which has been downloaded to the client as part of the scan phase.
+Both the full-file version and the Express version are referenced in the update's metadata, which has been downloaded to the client as part of the scan phase.
 
 **Express download works as follows:**