Merge pull request #1189 from MicrosoftDocs/MDBranchSKUTransformationFix

Prerequisite fixes for SKU transformation

windows/client-management/mdm/policy-csp-kioskbrowser.md

@@ -15,7 +15,7 @@ manager: dansimp
 
 
 
-These policies currently only apply to Kiosk Browser app. Kiosk Browser is a Microsoft Store app, added in Windows 10 version 1803, that provides IT a way to customize the end user’s browsing experience to fulfill kiosk, signage, and shared device scenarios. Application developers can also create their own kiosk browser and read these policies using [NamedPolicy.GetPolicyFromPath(String, String) Method](https://docs.microsoft.com/uwp/api/windows.management.policies.namedpolicy.getpolicyfrompath#Windows_Management_Policies_NamedPolicy_GetPolicyFromPath_System_String_System_String_). 
+These policies currently only apply to Kiosk Browser app. Kiosk Browser is a Microsoft Store app, added in Windows 10 version 1803, that provides IT a way to customize the end user's browsing experience to fulfill kiosk, signage, and shared device scenarios. Application developers can also create their own kiosk browser and read these policies using [NamedPolicy.GetPolicyFromPath(String, String) Method](https://docs.microsoft.com/uwp/api/windows.management.policies.namedpolicy.getpolicyfrompath#Windows_Management_Policies_NamedPolicy_GetPolicyFromPath_System_String_System_String_). 
 
 
 <hr/>
@@ -224,7 +224,7 @@ Added in Windows 10, version 1803. Configures the default URL kiosk browsers to
 
 <!--/Scope-->
 <!--Description-->
-Shows the Kiosk Browser's end session button. When the policy is enabled, the Kiosk Browser app shows a button to reset the browser. When the user clicks on the button, the app will prompt the user for confirmation to end the session. When the user confirms, the Kiosk broswser will clear all browsing data (cache, cookies, etc.) and navigate back to the default URL.
+Shows the Kiosk Browser's end session button. When the policy is enabled, the Kiosk Browser app shows a button to reset the browser. When the user clicks on the button, the app will prompt the user for confirmation to end the session. When the user confirms, the Kiosk browser will clear all browsing data (cache, cookies, etc.) and navigate back to the default URL.
 
 <!--/Description-->
 <!--/Policy-->

windows/client-management/mdm/policy-csp-lockdown.md

@@ -65,7 +65,7 @@ manager: dansimp
 
 <!--/Scope-->
 <!--Description-->
-Added in Windows 10, version 1607. Allows the user to invoke any system user interface by swiping in from any screen edge using touch.
+Added in Windows 10, version 1607. Allows the user to invoke any system user interface by swiping in from any screen edge using touch.
 
 The easiest way to verify the policy is to restart the explorer process or to reboot after the policy is applied. And then try to swipe from the right edge of the screen. The desired result is for Action Center to not be invoked by the swipe. You can also enter tablet mode and attempt to swipe from the top of the screen to rearrange. That will also be disabled.
 

windows/client-management/mdm/policy-csp-privacy.md

@@ -922,11 +922,11 @@ Value type is integer.
 <!--/Description-->
 <!--ADMXMapped-->
 ADMX Info: 
--	GP English name: Let Windows apps access background spatial perception
+-	GP English name: *Let Windows apps access background spatial perception*
--	GP name: LetAppsAccessBackgroundSpatialPerception
+-	GP name: *LetAppsAccessBackgroundSpatialPerception*
--	GP element: LetAppsAccessBackgroundSpatialPerception_Enum
+-	GP element: *LetAppsAccessBackgroundSpatialPerception_Enum*
--	GP path: Windows Components/App Privacy
+-	GP path: *Windows Components/App Privacy*
--	GP ADMX file name: AppPrivacy.admx
+-	GP ADMX file name: *AppPrivacy.admx*
 
 
 <!--/ADMXMapped-->
@@ -989,11 +989,11 @@ Value type is chr.
 <!--/Description-->
 <!--ADMXMapped-->
 ADMX Info: 
--	GP English name: Let Windows apps access background spatial perception
+-	GP English name: *Let Windows apps access background spatial perception*
--	GP name: LetAppsAccessBackgroundSpatialPerception
+-	GP name: *LetAppsAccessBackgroundSpatialPerception*
--	GP element: LetAppsAccessBackgroundSpatialPerception_ForceAllowTheseApps_List
+-	GP element: *LetAppsAccessBackgroundSpatialPerception_ForceAllowTheseApps_List*
--	GP path: Windows Components/App Privacy
+-	GP path: *Windows Components/App Privacy*
--	GP ADMX file name: AppPrivacy.admx
+-	GP ADMX file name: *AppPrivacy.admx*
 
 
 <!--/ADMXMapped-->
@@ -1051,11 +1051,11 @@ Value type is chr.
 <!--/Description-->
 <!--ADMXMapped-->
 ADMX Info: 
--	GP English name: Let Windows apps access background spatial perception
+-	GP English name: *Let Windows apps access background spatial perception*
--	GP name: LetAppsAccessBackgroundSpatialPerception
+-	GP name: *LetAppsAccessBackgroundSpatialPerception*
--	GP element: LetAppsAccessBackgroundSpatialPerception_ForceDenyTheseApps_List
+-	GP element: *LetAppsAccessBackgroundSpatialPerception_ForceDenyTheseApps_List*
--	GP path: Windows Components/App Privacy
+-	GP path: Windows *Components/App Privacy*
--	GP ADMX file name: AppPrivacy.admx
+-	GP ADMX file name: *AppPrivacy.admx*
 <!--/ADMXMapped-->
 <!--SupportedValues-->
 
@@ -1116,11 +1116,11 @@ Value type is chr.
 <!--/Description-->
 <!--ADMXMapped-->
 ADMX Info: 
--	GP English name: Let Windows apps access background spatial perception
+-	GP English name: *Let Windows apps access background spatial perception*
--	GP name: LetAppsAccessBackgroundSpatialPerception
+-	GP name: *LetAppsAccessBackgroundSpatialPerception*
--	GP element: LetAppsAccessBackgroundSpatialPerception_UserInControlOfTheseApps_List
+-	GP element: *LetAppsAccessBackgroundSpatialPerception_UserInControlOfTheseApps_List*
--	GP path: Windows Components/App Privacy
+-	GP path: *Windows Components/App Privacy*
--	GP ADMX file name: AppPrivacy.admx
+-	GP ADMX file name: *AppPrivacy.admx*
 <!--/ADMXMapped-->
 <!--SupportedValues-->
 

windows/client-management/mdm/policy-csp-servicecontrolmanager.md

@@ -97,9 +97,6 @@ Supported values:
 
 <!--/Validation-->
 <!--/Policy-->
-
-<!--/Policies-->
-
 <hr/>
 
 Footnotes:
@@ -110,3 +107,5 @@ Footnotes:
 -   4 - Added in Windows 10, version 1803.
 -   5 - Added in Windows 10, version 1809.
 -   6 - Added in Windows 10, version 1903.
+<!--/Policies-->
+

windows/client-management/mdm/policy-csp-start.md

@@ -668,13 +668,7 @@ The following list shows the supported values:
 Enabling this policy prevents context menus from being invoked in the Start Menu.
 
 <!--/Description-->
-<!--SupportedValues-->
-The following list shows the supported values:
 
--   0 (default) – False (Do not disable).
--   1 - True (disable).
-
-<!--/SupportedValues-->
 <!--ADMXMapped-->
 ADMX Info:  
 -   GP English name: *Disable context menus in the Start Menu*
@@ -684,6 +678,10 @@ ADMX Info:
 
 <!--/ADMXMapped-->
 <!--SupportedValues-->
+The following list shows the supported values:
+
+-   0 (default) – False (Do not disable).
+-   1 - True (disable).
 
 <!--/SupportedValues-->
 <!--Example-->
@@ -1100,13 +1098,7 @@ Added in Windows 10, version 1709. Enabling this policy removes the people icon
 Value type is integer.
 
 <!--/Description-->
-<!--SupportedValues-->
-The following list shows the supported values:
 
--   0 (default) – False (do not hide).
--   1 - True (hide).
-
-<!--/SupportedValues-->
 <!--ADMXMapped-->
 ADMX Info:  
 -   GP English name: *Remove the People Bar from the taskbar*
@@ -1115,6 +1107,13 @@ ADMX Info:
 -   GP ADMX file name: *StartMenu.admx*
 
 <!--/ADMXMapped-->
+<!--SupportedValues-->
+The following list shows the supported values:
+
+-   0 (default) – False (do not hide).
+-   1 - True (hide).
+
+<!--/SupportedValues-->
 <!--/Policy-->
 
 <hr/>

windows/client-management/mdm/policy-csp-system.md

@@ -395,7 +395,7 @@ The following list shows the supported values:
 
 -   0 – Disabled.
 -   1 (default) – Permits Microsoft to configure device settings only.
--   2 – Allows Microsoft to conduct full experimentations.
+-   2 – Allows Microsoft to conduct full experimentation.
 
 <!--/SupportedValues-->
 <!--/Policy-->
@@ -532,9 +532,9 @@ ADMX Info:
 <!--SupportedValues-->
 The following list shows the supported values:
 
--   0 – Force Location Off. All Location Privacy settings are toggled off and greyed out. Users cannot change the settings, and no apps are allowed access to the Location service, including Cortana and Search.
+-   0 – Force Location Off. All Location Privacy settings are toggled off and grayed out. Users cannot change the settings, and no apps are allowed access to the Location service, including Cortana and Search.
 -   1 (default) – Location service is allowed. The user has control and can change Location Privacy settings on or off.
--   2 – Force Location On. All Location Privacy settings are toggled on and greyed out. Users cannot change the settings and all consent permissions will be automatically suppressed.
+-   2 – Force Location On. All Location Privacy settings are toggled on and grayed out. Users cannot change the settings and all consent permissions will be automatically suppressed.
 
 <!--/SupportedValues-->
 <!--/Policy-->
@@ -763,16 +763,14 @@ Specifies whether to allow the user to factory reset the device by using control
 
 Most restricted value is 0.
 
-<!--/Description-->
 > [!TIP]
 > This policy is also applicable to Windows 10 and not exclusive to phone.
-> <!--SupportedValues-->
+<!--/Description-->
-> The following list shows the supported values:
-> orted values:
 
+<!--SupportedValues-->
+The following list shows the supported values:  
 -   0 – Not allowed.
 -   1 (default) – Allowed to reset to factory default settings.
-
 <!--/SupportedValues-->
 <!--/Policy-->
 
@@ -1006,10 +1004,10 @@ This policy setting determines whether people can change their own telemetry lev
 
 If you set this policy setting to "Disable Telemetry opt-in Settings", telemetry levels are disabled in Settings, preventing people from changing them.
 
-If you set this policy setting to "Enable Telemetry opt-in Setings" or don't configure this policy setting, people can change their own telemetry levels in Settings.
+If you set this policy setting to "Enable Telemetry opt-in Settings" or don't configure this policy setting, people can change their own telemetry levels in Settings.
 
-Note:
+> [!Note]
-Set the Allow Telemetry policy setting to prevent people from sending diagnostic data to Microsoft beyond your organization's limit.
+> Set the Allow Telemetry policy setting to prevent people from sending diagnostic data to Microsoft beyond your organization's limit.
 
 <!--/Description-->
 <!--ADMXMapped-->

windows/client-management/mdm/policy-csp-troubleshooting.md

@@ -113,10 +113,11 @@ By default, this policy is not configured and the SKU based defaults are used fo
 
 <!--/SupportedValues-->
 <!--ADMXMapped-->
-ADMX Info:<br/>-   GP English name: <em>Troubleshooting: Allow users to access recommended troubleshooting for known problems</em>
+ADMX Info:  
--   GP name: <em>TroubleshootingAllowRecommendations</em>
+-   GP English name: *Troubleshooting: Allow users to access recommended troubleshooting for known problems*
--   GP path: <em>Troubleshooting and Diagnostics/Microsoft Support Diagnostic Tool</em>
+-   GP name: *TroubleshootingAllowRecommendations*
--   GP ADMX file name: <em>MSDT.admx</em>
+-   GP path: *Troubleshooting and Diagnostics/Microsoft Support Diagnostic Tool*
+-   GP ADMX file name: *MSDT.admx*
 
 <!--/ADMXMapped-->
 
@@ -127,8 +128,6 @@ ADMX Info:<br/>-   GP English name: <em>Troubleshooting: Allow users to access r
 
 <!--/Validation-->
 <!--/Policy-->
-
-<!--/Policies-->
 <hr/>
 
 Footnotes:
@@ -139,3 +138,4 @@ Footnotes:
 -   4 - Added in Windows 10, version 1803.
 -   5 - Added in Windows 10, version 1809.
 -   6 - Added in Windows 10, version 1903.
+<!--/Policies-->

windows/client-management/mdm/policy-csp-update.md

@@ -13,6 +13,8 @@ manager: dansimp
 
 # Policy CSP - Update
 
+> [!NOTE]
+> If the MSA service is disabled, Windows Update will no longer offer feature updates to devices running Windows 10 1709 or higher. See [Feature updates are not being offered while other updates are](https://docs.microsoft.com/windows/deployment/update/windows-update-troubleshooting#feature-updates-are-not-being-offered-while-other-updates-are).
 
 <hr/>
 
@@ -204,11 +206,6 @@ manager: dansimp
 
 <hr/>
 
-> [!NOTE]
-> If the MSA service is disabled, Windows Update will no longer offer feature updates to devices running Windows 10 1709 or higher. See [Feature updates are not being offered while other updates are](https://docs.microsoft.com/windows/deployment/update/windows-update-troubleshooting#feature-updates-are-not-being-offered-while-other-updates-are).
-
-<hr/>
-
 <!--Policy-->
 <a href="" id="update-activehoursend"></a>**Update/ActiveHoursEnd**  
 
@@ -1379,49 +1376,6 @@ Added in Windows 10, version 1803. Enable IT admin to configure feature update u
 
 <hr/>
 
-<!--Policy-->
-<a href="" id="update-configurefeatureupdateuninstallperiod"></a>**Update/ConfigureFeatureUpdateUninstallPeriod**  
-
-<!--SupportedSKUs-->
-<table>
-<tr>
-	<th>Home</th>
-	<th>Pro</th>
-	<th>Business</th>
-	<th>Enterprise</th>
-	<th>Education</th>
-	<th>Mobile</th>
-	<th>Mobile Enterprise</th>
-</tr>
-<tr>
-	<td><img src="images/crossmark.png" alt="cross mark" /></td>
-	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
-	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
-	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
-	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
-	<td><img src="images/crossmark.png" alt="cross mark" /></td>
-	<td><img src="images/crossmark.png" alt="cross mark" /></td>
-</tr>
-</table>
-
-<!--/SupportedSKUs-->
-<!--Scope-->
-[Scope](./policy-configuration-service-provider.md#policy-scope):
-
-> [!div class = "checklist"]
-> * Device
-
-<hr/>
-
-<!--/Scope-->
-<!--Description-->
-Added in Windows 10, version 1803. Enable IT admin to configure feature update uninstall period. Values range 2 - 60 days. Default is 10 days.
-
-<!--/Description-->
-<!--/Policy-->
-
-<hr/>
-
 <!--Policy-->
 <a href="" id="update-deferfeatureupdatesperiodindays"></a>**Update/DeferFeatureUpdatesPeriodInDays**