From cadef2063bb1561295bddba9027d9805cc8d0087 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Thu, 21 Apr 2016 15:26:33 -0700 Subject: [PATCH 01/11] removing files that don't exist --- mdop/medv-v2/TOC.md | 2 -- .../med-v-2-configuration-cmdlets-stub.md | 29 ------------------- .../medv-v2/med-v-2-workspace-cmdlets-stub.md | 29 ------------------- 3 files changed, 60 deletions(-) delete mode 100644 mdop/medv-v2/med-v-2-configuration-cmdlets-stub.md delete mode 100644 mdop/medv-v2/med-v-2-workspace-cmdlets-stub.md diff --git a/mdop/medv-v2/TOC.md b/mdop/medv-v2/TOC.md index 0f1a39203e..80bb2410e7 100644 --- a/mdop/medv-v2/TOC.md +++ b/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) diff --git a/mdop/medv-v2/med-v-2-configuration-cmdlets-stub.md b/mdop/medv-v2/med-v-2-configuration-cmdlets-stub.md deleted file mode 100644 index 977e35e7ee..0000000000 --- a/mdop/medv-v2/med-v-2-configuration-cmdlets-stub.md +++ /dev/null @@ -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. - -  - -  - - - - - diff --git a/mdop/medv-v2/med-v-2-workspace-cmdlets-stub.md b/mdop/medv-v2/med-v-2-workspace-cmdlets-stub.md deleted file mode 100644 index e6d465ae3c..0000000000 --- a/mdop/medv-v2/med-v-2-workspace-cmdlets-stub.md +++ /dev/null @@ -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. - -  - -  - - - - - From 537ac829d845f9c8a7a99c0fcd695a328570ce2b Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Thu, 21 Apr 2016 15:33:00 -0700 Subject: [PATCH 02/11] fixed Powershell script conversion issue --- ...osk-for-windows-10-for-desktop-editions.md | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md b/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md index e4d8f2ceb8..33d52851d1 100644 --- a/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md +++ b/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md @@ -291,16 +291,16 @@ Alternatively, you can turn on Shell Launcher using the Deployment Image Servici Modify the following PowerShell script as appropriate and run the script on the kiosk device. ``` - $COMPUTER = "localhost" - $NAMESPACE = "root\standardcimv2\embedded" + $COMPUTER = “localhost” + $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 +310,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. @@ -327,32 +327,32 @@ Modify the following PowerShell script as appropriate and run the script on the # Set the command prompt as the default shell, and restart the device if it's 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 it's 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. From 741210005fb21a1e0ba5e29368bd00803ee07317 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Fri, 22 Apr 2016 07:35:38 -0700 Subject: [PATCH 03/11] more script fixes --- .../set-up-a-kiosk-for-windows-10-for-desktop-editions.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md b/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md index 33d52851d1..9ba96a06e8 100644 --- a/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md +++ b/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md @@ -288,7 +288,7 @@ 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” @@ -323,9 +323,9 @@ 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) @@ -335,7 +335,7 @@ Modify the following PowerShell script as appropriate and run the script on the “`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) From 7006235ef50a9e11915d51e528a17ff92ec99dda Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Fri, 22 Apr 2016 07:40:44 -0700 Subject: [PATCH 04/11] tweak spaces --- .../set-up-a-kiosk-for-windows-10-for-desktop-editions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md b/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md index 9ba96a06e8..eca37057b8 100644 --- a/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md +++ b/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md @@ -359,7 +359,7 @@ Modify the following PowerShell script as appropriate. The comments in the sampl $ShellLauncherClass.RemoveCustomShell($Admins_SID) $ShellLauncherClass.RemoveCustomShell($Cashier_SID) - ``` +``` ## Related topics From 2b15d7b44a21b5c356f5724dd078138350755b41 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Fri, 22 Apr 2016 09:20:07 -0700 Subject: [PATCH 05/11] added kiosk to change log --- .../manage/change-history-for-manage-and-update-windows-10.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/windows/manage/change-history-for-manage-and-update-windows-10.md b/windows/manage/change-history-for-manage-and-update-windows-10.md index 3e00cd0e96..339623b083 100644 --- a/windows/manage/change-history-for-manage-and-update-windows-10.md +++ b/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 [Configure telemetry and other settings in your organization](disconnect-your-organization-from-microsoft.md)

Added the font streaming section.

+ +[Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions) +

Made corrections to script and instructions for Shell Launcher.

+ From 2b7512a4e71da7913c641a015c10352764d47664 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Fri, 22 Apr 2016 09:23:28 -0700 Subject: [PATCH 06/11] tweak ref --- .../set-up-a-kiosk-for-windows-10-for-desktop-editions.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md b/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md index eca37057b8..b88902b04f 100644 --- a/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md +++ b/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?** - -- [Assigned Access]( http://go.microsoft.com/fwlink/p/?LinkId=613653) +> **Looking for Windows Embedded 8.1 Industry information?** See [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). From f860d2add2dfb24efb4aef7ae3418e9146f3726d Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Fri, 22 Apr 2016 09:37:09 -0700 Subject: [PATCH 07/11] fix link --- .../manage/change-history-for-manage-and-update-windows-10.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/manage/change-history-for-manage-and-update-windows-10.md b/windows/manage/change-history-for-manage-and-update-windows-10.md index 339623b083..18be77205f 100644 --- a/windows/manage/change-history-for-manage-and-update-windows-10.md +++ b/windows/manage/change-history-for-manage-and-update-windows-10.md @@ -33,7 +33,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in

Added the font streaming section.

-[Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions) +[Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md)

Made corrections to script and instructions for Shell Launcher.

From d47f7d286d210d5fd87d9bbb6de0816f04a4cb4b Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Apr 2016 13:12:16 -0700 Subject: [PATCH 08/11] added params to scanstate syntax topic --- windows/deploy/usmt-scanstate-syntax.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/windows/deploy/usmt-scanstate-syntax.md b/windows/deploy/usmt-scanstate-syntax.md index 09eb224de7..95594ff971 100644 --- a/windows/deploy/usmt-scanstate-syntax.md +++ b/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: @@ -89,6 +89,14 @@ To create an encrypted store using the Config.xml file and the default migration

StorePath

Indicates a folder where files and settings will be saved. Note that StorePath cannot be c:\. You must specify the StorePath option in the ScanState command, except when using the /genconfig option. You cannot specify more than one StorePath location.

+ +

/apps

+

Scans the image for apps and includes them and their associated registry settings.

+ + +

/ppkg [<FileName>]

+

Exports to a specific file location.

+

/o

Required to overwrite any existing data in the migration store or Config.xml file. If not specified, the ScanState command will fail if the migration store already contains data. You cannot use this option more than once on a command line.

From 97e8a98f7af64fe4e6574b49cef5af2dca407a37 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Apr 2016 13:19:37 -0700 Subject: [PATCH 09/11] fixed even row in table --- windows/deploy/usmt-scanstate-syntax.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/usmt-scanstate-syntax.md b/windows/deploy/usmt-scanstate-syntax.md index 95594ff971..ff2636ee8c 100644 --- a/windows/deploy/usmt-scanstate-syntax.md +++ b/windows/deploy/usmt-scanstate-syntax.md @@ -89,7 +89,7 @@ To create an encrypted store using the Config.xml file and the default migration

StorePath

Indicates a folder where files and settings will be saved. Note that StorePath cannot be c:\. You must specify the StorePath option in the ScanState command, except when using the /genconfig option. You cannot specify more than one StorePath location.

- +

/apps

Scans the image for apps and includes them and their associated registry settings.

From db0a455bcf7f02c83e76eb8ea2d7e2c7655de080 Mon Sep 17 00:00:00 2001 From: Maggie Evans Date: Fri, 22 Apr 2016 15:21:20 -0700 Subject: [PATCH 10/11] Removed links to old content --- mdop/agpm/resources-for-agpm.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mdop/agpm/resources-for-agpm.md b/mdop/agpm/resources-for-agpm.md index a87c1701fd..def2f4bf52 100644 --- a/mdop/agpm/resources-for-agpm.md +++ b/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. From aefb6f66b9744231f98c1e75510ff89fedfb9426 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Mon, 25 Apr 2016 09:08:47 -0700 Subject: [PATCH 11/11] VSO bug# 7007957 --- windows/manage/disconnect-your-organization-from-microsoft.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/manage/disconnect-your-organization-from-microsoft.md b/windows/manage/disconnect-your-organization-from-microsoft.md index 925e0f6684..3ef46d052e 100644 --- a/windows/manage/disconnect-your-organization-from-microsoft.md +++ b/windows/manage/disconnect-your-organization-from-microsoft.md @@ -370,7 +370,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**. ### 3. Device metadata retrieval