Merge branch 'master' of https://cpubwin.visualstudio.com/_git/it-client into FromPrivateRepo

windows/deployment/update/windows-analytics-get-started.md

@@ -8,7 +8,7 @@ ms.sitesec: library
 ms.pagetype: deploy
 author: jaimeo
 ms.author: jaimeo
-ms.date: 10/01/2018
+ms.date: 10/08/2018
 ms.localizationpriority: medium
 ---
 
@@ -53,7 +53,7 @@ To enable data sharing, configure your proxy server to whitelist the following e
 | `http://adl.windows.com` | Allows the compatibility update to receive the latest compatibility data from Microsoft. |
 | `https://watson.telemetry.microsoft.com` | Windows Error Reporting (WER); required for Device Health and Update Compliance AV reports. Not used by Upgrade Readiness. |
 | `https://oca.telemetry.microsoft.com`  | Online Crash Analysis; required for Device Health and Update Compliance AV reports. Not used by Upgrade Readiness. |
-| `https://login.live.com` | This end-point is required by Device Health to ensure data integrity and provides a more reliable device identity for all Windows Analytics solutions on Windows 10. Those who wish to disable end-user MSA access should do so by applying [policy](https://docs.microsoft.com/windows/security/identity-protection/access-control/microsoft-accounts#block-all-consumer-microsoft-account-user-authentication) rather than blocking this end-point. |
+| `https://login.live.com` | This endpoint is required by Device Health to ensure data integrity and provides a more reliable device identity for all of the Windows Analytics solutions on Windows 10. If you want to disable end-user managed service account (MSA) access, you should apply the appropriate [policy](https://docs.microsoft.com/windows/security/identity-protection/access-control/microsoft-accounts#block-all-consumer-microsoft-account-user-authentication) instead of blocking this endpoint. |
 | `https://www.msftncsi.com` | Windows Error Reporting (WER); required for Device Health to check connectivity. |
 | `https://www.msftconnecttest.com` | Windows Error Reporting (WER); required for Device Health to check connectivity.  |
 

windows/deployment/windows-autopilot/existing-devices.md

@@ -1,19 +1,19 @@
----
+---
-title: Rip and Replace
+title: Autopilot for existing devices
-description: Listing of Autopilot scenarios
+description: Listing of Autopilot scenarios
-keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune
+keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune
-ms.prod: w10
+ms.prod: w10
-ms.mktglfcycl: deploy
+ms.mktglfcycl: deploy
-ms.localizationpriority: low
+ms.localizationpriority: low
-ms.sitesec: library
+ms.sitesec: library
-ms.pagetype: deploy
+ms.pagetype: deploy
-author: greg-lindsay
+author: greg-lindsay
-ms.author: greglin
+ms.author: greglin
-ms.date: 06/01/2018
+ms.date: 10/11/2018
----
+---
-
+
-# Rip and replace
+# Autopilot for existing devices
-
+
-**Applies to: Windows 10**
+**Applies to: Windows 10**
-
+
-DO NOT PUBLISH.  Just a placeholder for now, coming with 1809.
+Placeholder. Content coming.

windows/deployment/windows-autopilot/user-driven-aad.md

@@ -9,11 +9,11 @@ ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
 ms.author: greglin
-ms.date: 06/01/2018
+ms.date: 10/11/2018
 ---
 
 # Windows Autopilot user-driven mode for Azure Active Directory
 
 **Applies to: Windows 10**
 
-DO NOT PUBLISH.  This eventually will contain the AAD-specific instuctions currently in user-driven.md.
+Placeholder. Content coming.

windows/deployment/windows-autopilot/user-driven-hybrid.md

@@ -9,7 +9,7 @@ ms.sitesec: library
 ms.pagetype: deploy
 author: greg-lindsay
 ms.author: greglin
-ms.date: 06/01/2018
+ms.date: 10/11/2018
 ---
 
 
@@ -17,4 +17,4 @@ ms.date: 06/01/2018
 
 **Applies to: Windows 10**
 
-DO NOT PUBLISH.  This eventually will contain the AD-specific (hybrid) instuctions.  This will be in preview at a later point in time.
+Placeholder. Content coming.

windows/security/threat-protection/TOC.md

@@ -404,10 +404,10 @@
 #### [Software developer FAQ](intelligence/developer-faq.md)
 #### [Software developer resources](intelligence/developer-resources.md)
 
-## Certifications
+## Windows Certifications
 
-### [FIPS 140 Validation](fips-140-validation.md)
+### [FIPS 140 Validations](fips-140-validation.md)
-### [Windows Platform Common Criteria Certification](windows-platform-common-criteria.md)
+### [Common Criteria Certifications](windows-platform-common-criteria.md)
 
 
 ## More Windows 10 security

windows/security/threat-protection/security-policy-settings/account-lockout-policy.md

@@ -8,7 +8,7 @@ ms.sitesec: library
 ms.pagetype: security
 ms.localizationpriority: medium
 author: brianlic-msft
-ms.date: 04/19/2017
+ms.date: 10/11/2018
 ---
 
 # Account Lockout Policy
@@ -22,6 +22,9 @@ Someone who attempts to use more than a few unsuccessful passwords while trying
 
 The following topics provide a discussion of each policy setting's implementation and best practices considerations, policy location, default values for the server type or Group Policy Object (GPO), relevant differences in operating system versions, and security considerations (including the possible vulnerabilities of each policy setting), countermeasures that you can implement, and the potential impact of implementing the countermeasures.
 
+>[!NOTE]
+>Account lockout settings for remote access clients can be configured separately by editing the Registry on the server that manages the remote access. For more information, see [How to configure remote access client account lockout](https://support.microsoft.com/help/816118/how-to-configure-remote-access-client-account-lockout-in-windows-serve).
+
 ## In this section
 
 | Topic | Description |