Merge branch 'master' into 7087905

mdop/agpm/resources-for-agpm.md

@@ -12,10 +12,6 @@ author: jamiejdt
 
 -   [Advanced Group Policy Management 4.0 documents](http://go.microsoft.com/fwlink/?LinkID=158931)
 
--   [Advanced Group Policy Management 3.0 documents](http://go.microsoft.com/fwlink/?LinkID=158930)
-
--   [Advanced Group Policy Management 2.5 documents](http://go.microsoft.com/fwlink/?LinkId=163556)
-
 ### Microsoft Desktop Optimization Pack resources
 
 -   [Microsoft Desktop Optimization Pack (MDOP) for Software Assurance TechCenter](http://go.microsoft.com/fwlink/?LinkID=159870) (http://www.microsoft.com/technet/mdop): Links to MDOP videos and resources.

mdop/medv-v2/TOC.md

@@ -76,8 +76,6 @@
 ### [MED-V Event Log Messages](med-v-event-log-messages.md)
 ### [Updating MED-V 2.0](updating-med-v-20.md)
 ### [Windows Virtual PC Application Exclude List](windows-virtual-pc-application-exclude-list.md)
-### [MED-V 2 Configuration Cmdlets](med-v-2-configuration-cmdlets-stub.md)
-### [MED-V 2 Workspace Cmdlets](med-v-2-workspace-cmdlets-stub.md)
 ### [Example MED-V Checklists](example-med-v-checklists.md)
 #### [Example MED-V Environment Planning Checklist](example-med-v-environment-planning-checklist.md)
 #### [Example MED-V Project Planning Checklist](example-med-v-project-planning-checklist.md)

mdop/medv-v2/med-v-2-configuration-cmdlets-stub.md

@@ -1,29 +0,0 @@
----
-title: MED-V 2 Configuration Cmdlets
-description: MED-V 2 Configuration Cmdlets
-ms.assetid: 1e90029c-4acd-4275-9f2a-2cf3358fca82
-author: jamiejdt
----
-
-# MED-V 2 Configuration Cmdlets
-
-
-Insert introduction here.
-
-## Section Heading
-
-
-Insert section body here.
-
-### Subsection Heading
-
-Insert subsection body here.
-
- 
-
- 
-
-
-
-
-

mdop/medv-v2/med-v-2-workspace-cmdlets-stub.md

@@ -1,29 +0,0 @@
----
-title: MED-V 2 Workspace Cmdlets
-description: MED-V 2 Workspace Cmdlets
-ms.assetid: 8820156f-8279-4ed0-af88-77fee95c533a
-author: jamiejdt
----
-
-# MED-V 2 Workspace Cmdlets
-
-
-Insert introduction here.
-
-## Section Heading
-
-
-Insert section body here.
-
-### Subsection Heading
-
-Insert subsection body here.
-
- 
-
- 
-
-
-
-
-

windows/deploy/usmt-scanstate-syntax.md

@@ -58,7 +58,7 @@ This section explains the syntax and usage of the **ScanState** command-line opt
 
 The **ScanState** command's syntax is:
 
-scanstate \[*StorePath*\] \[/i:\[*Path*\\\]*FileName*\] \[/o\] \[/v:*VerbosityLevel*\] \[/nocompress\] \[/localonly\] \[/encrypt /key:*KeyString*|/keyfile:\[Path\\\]*FileName*\] \[/l:\[*Path*\\\]*FileName*\] \[/progress:\[*Path*\\\]*FileName*\] \[/r:*TimesToRetry*\] \[/w:*SecondsBeforeRetry*\] \[/c\] \[/p\] \[/all\] \[/ui:\[*DomainName*|*ComputerName*\\\]*UserName*\] \[/ue:\[*DomainName*|*ComputerName*\\\]*UserName*\] \[/uel:*NumberOfDays*|*YYYY/MM/DD*|0\] \[/efs:abort|skip|decryptcopy|copyraw\] \[/genconfig:\[*Path*\\\]*FileName*\[/config:\[*Path*\\\]*FileName*\] \[/?|help\]
+scanstate \[*StorePath*\] \[/apps\] \[/ppkg:*FileName*\] \[/i:\[*Path*\\\]*FileName*\] \[/o\] \[/v:*VerbosityLevel*\] \[/nocompress\] \[/localonly\] \[/encrypt /key:*KeyString*|/keyfile:\[Path\\\]*FileName*\] \[/l:\[*Path*\\\]*FileName*\] \[/progress:\[*Path*\\\]*FileName*\] \[/r:*TimesToRetry*\] \[/w:*SecondsBeforeRetry*\] \[/c\] \[/p\] \[/all\] \[/ui:\[*DomainName*|*ComputerName*\\\]*UserName*\] \[/ue:\[*DomainName*|*ComputerName*\\\]*UserName*\] \[/uel:*NumberOfDays*|*YYYY/MM/DD*|0\] \[/efs:abort|skip|decryptcopy|copyraw\] \[/genconfig:\[*Path*\\\]*FileName*\[/config:\[*Path*\\\]*FileName*\] \[/?|help\]
 
 For example:
 
@@ -90,6 +90,14 @@ To create an encrypted store using the Config.xml file and the default migration
 <td align="left"><p>Indicates a folder where files and settings will be saved. Note that <em>StorePath</em> cannot be <strong>c:\</strong>. You must specify the <em>StorePath</em> option in the <strong>ScanState</strong> command, except when using the <strong>/genconfig</strong> option. You cannot specify more than one <em>StorePath</em> location.</p></td>
 </tr>
 <tr class="even">
+<td align="left"><p><strong>/apps</strong></p></td>
+<td align="left"><p>Scans the image for apps and includes them and their associated registry settings.</p></td>
+</tr>
+<tr class="odd">
+<td align="left"><p><strong>/ppkg</strong> [<em>&lt;FileName&gt;</em>]</p></td>
+<td align="left"><p>Exports to a specific file location.</p></td>
+</tr>
+<tr class="even">
 <td align="left"><p><strong>/o</strong></p></td>
 <td align="left"><p>Required to overwrite any existing data in the migration store or Config.xml file. If not specified, the <strong>ScanState</strong> command will fail if the migration store already contains data. You cannot use this option more than once on a command line.</p></td>
 </tr>

windows/manage/change-history-for-manage-and-update-windows-10.md

@@ -32,6 +32,10 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
 <td align="left">[Configure telemetry and other settings in your organization](disconnect-your-organization-from-microsoft.md)</td>
 <td align="left"><p>Added the font streaming section.</p></td>
 </tr>
+<tr class="odd">
+<td align="left">[Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md)</td>
+<td align="left"><p>Made corrections to script and instructions for Shell Launcher.</p></td>
+</tr>
 </tbody>
 </table>
 

windows/manage/disconnect-your-organization-from-microsoft.md

@@ -307,7 +307,7 @@ You can prevent Windows from setting the time automatically.
 
     -or-
 
--   Create a REG\_DWORD registry setting called **NoSync** in **HKEY\_LOCAL\_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\W32Time\\Parameters**, with a value of 1.
+-   Create a REG\_SZ registry setting in **HKEY\_LOCAL\_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\W32Time\\Parameters** with a value of **NoSync**.
 
 ### <a href="" id="bkmk-devinst"></a>3. Device metadata retrieval
 

windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md

@@ -16,9 +16,7 @@ author: jdeckerMS
 
 -   Windows 10
 
-**Looking for Windows Embedded 8.1 Industry information?**
+>  **Looking for Windows Embedded 8.1 Industry information?** See [Assigned Access]( http://go.microsoft.com/fwlink/p/?LinkId=613653)
-
--   [Assigned Access]( http://go.microsoft.com/fwlink/p/?LinkId=613653)
 
 A single-use device is easy to set up in Windows 10 for desktop editions (Pro, Enterprise, and Education). For a kiosk device to run a Universal Windows app, use the **assigned access** feature. For a kiosk device (Windows 10 Enterprise or Education) to run a Classic Windows application, use **Shell Launcher** to set a custom user interface as the shell. To return the device to the regular shell, see [Sign out of assigned access](#sign-out-of-assigned-access).
 
@@ -288,19 +286,19 @@ Alternatively, you can turn on Shell Launcher using the Deployment Image Servici
 
 **To set your custom shell**
 
-Modify the following PowerShell script as appropriate and run the script on the kiosk device.
+Modify the following PowerShell script as appropriate. The comments in the sample script explain the purpose of each section and tell you where you will want to change the script for your purposes. Save your script with the extension .ps1, open Windows PowerShell as administrator, and run the script on the kiosk device.
 
 ```
-    $COMPUTER = "localhost"
+    $COMPUTER = “localhost”
-    $NAMESPACE = "root\standardcimv2\embedded"
+    $NAMESPACE = “root\standardcimv2\embedded”
 
     # Create a handle to the class instance so we can call the static methods.
-    $ShellLauncherClass = [wmiclass]"\\$COMPUTER\${NAMESPACE}:WESL_UserSetting"
+    $ShellLauncherClass = [wmiclass]”\\$COMPUTER\${NAMESPACE}:WESL_UserSetting”
 
 
     # This well-known security identifier (SID) corresponds to the BUILTIN\Administrators group.
 
-    $Admins_SID = "S-1-5-32-544"
+    $Admins_SID = “S-1-5-32-544”
 
     # Create a function to retrieve the SID for a user account on a machine.
 
@@ -310,12 +308,12 @@ Modify the following PowerShell script as appropriate and run the script on the
         $NTUserSID = $NTUserObject.Translate([System.Security.Principal.SecurityIdentifier])
 
         return $NTUserSID.Value
-        
+
     }
 
-    # Get the SID for a user account named "Cashier". Rename "Cashier" to an existing account on your system to test this script.
+    # Get the SID for a user account named “Cashier”. Rename “Cashier” to an existing account on your system to test this script.
 
-    $Cashier_SID = Get-UsernameSID("Cashier")
+    $Cashier_SID = Get-UsernameSID(“Cashier”)
 
     # Define actions to take when the shell program exits.
 
@@ -323,43 +321,43 @@ Modify the following PowerShell script as appropriate and run the script on the
     $restart_device = 1
     $shutdown_device = 2
 
-    # Examples
+    # Examples. You can change these examples to use the program that you want to use as the shell.
 
-    # Set the command prompt as the default shell, and restart the device if it's closed.
+    # This example sets the command prompt as the default shell, and restarts the device if the command prompt is closed. 
 
-    $ShellLauncherClass.SetDefaultShell("cmd.exe", $restart_device)
+    $ShellLauncherClass.SetDefaultShell(“cmd.exe”, $restart_device)
 
     # Display the default shell to verify that it was added correctly.
 
     $DefaultShellObject = $ShellLauncherClass.GetDefaultShell()
 
-    "`nDefault Shell is set to " + $DefaultShellObject.Shell + " and the default action is set to " + $DefaultShellObject.defaultaction
+    “`nDefault Shell is set to “ + $DefaultShellObject.Shell + “ and the default action is set to “ + $DefaultShellObject.defaultaction
 
-    # Set Internet Explorer as the shell for "Cashier", and restart the machine if it's closed.
+    # Set Internet Explorer as the shell for “Cashier”, and restart the machine if Internet Explorer is closed.
 
-    $ShellLauncherClass.SetCustomShell($Cashier_SID, "c:\program files\internet explorer\iexplore.exe www.microsoft.com", ($null), ($null), $restart_shell)
+    $ShellLauncherClass.SetCustomShell($Cashier_SID, “c:\program files\internet explorer\iexplore.exe www.microsoft.com”, ($null), ($null), $restart_shell)
 
     # Set Explorer as the shell for administrators.
 
-    $ShellLauncherClass.SetCustomShell($Admins_SID, "explorer.exe")
+    $ShellLauncherClass.SetCustomShell($Admins_SID, “explorer.exe”)
 
     # View all the custom shells defined.
 
-    "`nCurrent settings for custom shells:"
+    “`nCurrent settings for custom shells:”
     Get-WmiObject -namespace $NAMESPACE -computer $COMPUTER -class WESL_UserSetting | Select Sid, Shell, DefaultAction
 
     # Enable Shell Launcher
 
     $ShellLauncherClass.SetEnabled($TRUE)
 
-    "`nEnabled is set to " + $DefaultShellObject.IsEnabled()
+    “`nEnabled is set to “ + $DefaultShellObject.IsEnabled()
 
     # Remove the new custom shells.
 
     $ShellLauncherClass.RemoveCustomShell($Admins_SID)
 
     $ShellLauncherClass.RemoveCustomShell($Cashier_SID)
-    ```
+```
 
 ## Related topics