Merge remote-tracking branch 'refs/remotes/origin/master' into rs1

# Conflicts:
#	windows/plan/TOC.md

windows/manage/connect-to-remote-aadj-pc.md

@@ -24,7 +24,7 @@ From its release, Windows 10 has supported remote connections to PCs that are jo
 ## Set up
 
 - Both PCs (local and remote) must be running Windows 10, version 1607. Remote connection to an Azure AD-joined PC that is running earlier versions of Windows 10 is not supported.
-- Ensure [Remote Credential Guard](https://tnstage.redmond.corp.microsoft.com/en-us/itpro/windows/keep-secure/remote-credential-guard?branch=bl-7475998), a new feature in Windows 10, version 1607, is turned off on the client PC.
+- Ensure [Remote Credential Guard](../keep-secure/remote-credential-guardmd), a new feature in Windows 10, version 1607, is turned off on the client PC.
 - On the PC that you want to connect to:
   1. Open system properties for the remote PC. 
   2. Enable **Allow remote connections to this computer** and select **Allow connections only from computers running Remote Desktop with Network Level Authentication**. 

windows/manage/set-up-shared-or-guest-pc.md

@@ -1,6 +1,6 @@
 ---
 title: Set up a shared or guest PC with Windows 10 (Windows 10)
-description: tbd
+description: Windows 10, version 1607, introduces *shared PC mode*, which optimizes Windows 10 for shared use scenarios.
 keywords: ["shared pc mode"]
 ms.prod: W10
 ms.mktglfcycl: manage

windows/manage/windows-10-start-layout-options-and-policies.md

@@ -123,7 +123,7 @@ Starting in Windows 10, version 1607, you can pin additional apps to the taskbar
 
 There are three categories of apps that might be pinned to a taskbar:
 * Apps pinned by the user
-* Default Windows apps, pinned during operating system installation (Edge, File Explorer, Store)
+* Default Windows apps, pinned during operating system installation (Microsoft Edge, File Explorer, Store)
 * Apps pinned by the enterprise, such as in an unattended Windows setup
 
  **Note**  

windows/plan/TOC.md

@@ -37,9 +37,5 @@
 ##### [Testing Your Application Mitigation Packages](testing-your-application-mitigation-packages.md)
 #### [Using the Sdbinst.exe Command-Line Tool](using-the-sdbinstexe-command-line-tool.md)
 ### [Compatibility Fixes for Windows 10, Windows 8, Windows 7, and Windows Vista](compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md)
-<<<<<<< HEAD
 ## [Change history for Plan for Windows 10 deployment](change-history-for-plan-for-windows-10-deployment.md)
-=======
 
-
->>>>>>> refs/remotes/origin/master