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

windows/deploy/change-history-for-deploy-windows-10.md

@@ -11,6 +11,11 @@ author: greg-lindsay
 # Change history for Deploy Windows 10
 This topic lists new and updated topics in the [Deploy Windows 10](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
 
+## January 2017
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Get started with Upgrade Analytics](upgrade-analytics-get-started.md) | Updated exit code table with suggested fixes, and added link to the Upgrade Analytics blog | 
+
 ## October 2016
 | New or changed topic | Description |
 |----------------------|-------------|

windows/deploy/provisioning-packages.md

@@ -124,7 +124,6 @@ Provisioning packages can be applied both during image deployment and during run
 - [Provision PCs with apps and certificates for initial deployments](provision-pcs-with-apps-and-certificates.md)
 - [Configure devices without MDM](../manage/configure-devices-without-mdm.md)
 - [Set up a shared or guest PC with Windows 10](../manage/set-up-shared-or-guest-pc.md)
-- [Configure devices without MDM](../manage/configure-devices-without-mdm.md)
 - [Set up a device for anyone to use (kiosk mode)](../manage/set-up-a-device-for-anyone-to-use.md)
 - [Customize Windows 10 Start and taskbar with ICD and provisioning packages](../manage/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
 - [Set up student PCs to join domain](https://technet.microsoft.com/edu/windows/set-up-students-pcs-to-join-domain)

windows/keep-secure/TOC.md

@@ -871,4 +871,5 @@
 ### [Microsoft Passport guide](microsoft-passport-guide.md)
 ### [Windows 10 Mobile security guide](windows-10-mobile-security-guide.md)
 ### [Windows 10 security overview](windows-10-security-guide.md)
+### [Windows 10 credential theft mitigation guide abstract](windows-credential-theft-mitigation-guide-abstract.md)
 ## [Change history for Keep Windows 10 secure](change-history-for-keep-windows-10-secure.md)

windows/keep-secure/windows-credential-theft-mitigation-guide-abstract.md

@@ -0,0 +1,67 @@
+---
+title: Windows 10 Credential Theft Mitigation Guide Abstract (Windows 10)
+description: Provides a summary of the Windows 10 credential theft mitigation guide.
+ms.assetid: 821ddc1a-f401-4732-82a7-40d1fff5a78a
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+author: justinha
+---
+
+# Windows 10 Credential Theft Mitigation Guide Abstract
+
+**Applies to**
+-   Windows 10
+
+This topic provides a summary of the Windows 10 credential theft mitigation guide, which can be downloaded from the Microsoft Download Center. 
+This guide explains how credential theft attacks occur and the strategies and countermeasures you can implement to mitigate them, following these security stages:
+
+- Identify high-value assets
+- Protect against known and unknown threats
+- Detect pass-the-hash and related attacks
+- Respond to suspicious activity
+- Recover from a breach
+
+![Security stages](images\security-stages.png)
+
+## Attacks that steal credentials
+
+Learn about the different types of attacks that are used to steal credentials, and the factors that can place your organization at risk. 
+The types of attacks that are covered include:
+
+- Pass the hash
+- Kerberos pass the ticket
+- Kerberos golden ticket and silver ticket
+- Key loggers
+- Shoulder surfing
+
+## Credential protection strategies
+
+This part of the guide helps you consider the mindset of the attacker, with prescriptive guidance about how to prioritize high-value accounts and computers. 
+You'll learn how to architect a defense against credential theft:
+
+- Establish a containment model for account privileges
+- Harden and restrict administrative hosts
+- Ensure that security configurations and best practices are implemented
+
+## Technical countermeasures for credential theft
+
+Objectives and expected outcomes are covered for each of these countermeasures:
+
+- Use Windows 10 with Credential Guard
+- Restrict and protect high-privilege domain accounts
+- Restrict and protect local accounts with administrative privileges
+- Restrict inbound network traffic
+
+Many other countermeasures are also covered, such as using Microsoft Passport and Windows Hello, or multifactor authentication.
+
+## Detecting credential attacks
+
+This sections covers how to detect the use of stolen credentials and how to collect computer events to help you detect credential theft.
+
+## Responding to suspicious activity
+
+Learn Microsoft's recommendations for responding to incidents, including how to recover control of compromised accounts, how to investigate attacks, and how to recover from a breach. 
+
+

windows/plan/change-history-for-plan-for-windows-10-deployment.md

@@ -13,6 +13,11 @@ author: TrudyHa
 
 This topic lists new and updated topics in the [Plan for Windows 10 deployment](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
 
+## January 2017
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Windows 10 Infrastructure Requirements](windows-10-infrastructure-requirements.md) | Added link for Windows Server 2008 R2 and Windows 7 activation and a link to Windows Server 2016 Volume Activation Tips | 
+
 ## September 2016
 
 | New or changed topic | Description |