Merge branch 'master' into api-legal

windows/client-management/mdm/TOC.md

@@ -257,6 +257,7 @@
 #### [TaskScheduler](policy-csp-taskscheduler.md)
 #### [TextInput](policy-csp-textinput.md)
 #### [TimeLanguageSettings](policy-csp-timelanguagesettings.md)
+#### [Troubleshooting](policy-csp-troubleshooting.md)
 #### [Update](policy-csp-update.md)
 #### [UserRights](policy-csp-userrights.md)
 #### [Wifi](policy-csp-wifi.md)

windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md

@@ -120,6 +120,7 @@ For details about Microsoft mobile device management protocols for Windows 10 s
 <li>[ServiceControlManager/SvchostProcessMitigation](policy-csp-servicecontrolmanager.md#servicecontrolmanager-svchostprocessmitigation)</li>
 <li>[System/AllowCommercialDataPipeline](policy-csp-system.md#system-allowcommercialdatapipeline)</li>
 <li>[System/TurnOffFileHistory](policy-csp-system.md#system-turnofffilehistory)</li>
+<li>[Troubleshooting/AllowRecommendations](policy-csp-troubleshooting.md#troubleshooting-allowrecommendations)</li>
 <li>[Update/AutomaticMaintenanceWakeUp](policy-csp-update.md#update-automaticmaintenancewakeup)</li>
 <li>[Update/ConfigureDeadlineForFeatureUpdates](policy-csp-update.md#update-configuredeadlineforfeatureupdates)</li>
 <li>[Update/ConfigureDeadlineForQualityUpdates](policy-csp-update.md#update-configuredeadlineforqualityupdates)</li>
@@ -1880,6 +1881,7 @@ How do I turn if off? | The service can be stopped from the "Services" console o
 |[Policy CSP - Search](policy-csp-search.md)|Added the following new policy:<br>AllowFindMyFiles.|
 |[Policy CSP - ServiceControlManager](policy-csp-servicecontrolmanager.md)|Added the following new policy:<br>SvchostProcessMitigation.|
 |[Policy CSP - System](policy-csp-system.md)|Added the following new policies:<br>AllowCommercialDataPipeline, TurnOffFileHistory.|
+|[Policy CSP - Troubleshooting](policy-csp-troubleshooting.md)|Added the following new policy:<br>AllowRecommendations.|
 |[Policy CSP - Update](policy-csp-update.md)|Added the following new policies:<br>AutomaticMaintenanceWakeUp, ConfigureDeadlineForFeatureUpdates, ConfigureDeadlineForQualityUpdates, ConfigureDeadlineGracePeriod, ConfigureDeadlineNoAutoReboot.|
 |[Policy CSP - WindowsLogon](policy-csp-windowslogon.md)|Added the following new policies:<br>AllowAutomaticRestartSignOn, ConfigAutomaticRestartSignOn, EnableFirstLogonAnimation.|
 

windows/client-management/mdm/policy-configuration-service-provider.md

@@ -3385,6 +3385,14 @@ The following diagram shows the Policy configuration service provider in tree fo
   </dd>
 </dl>
 
+### Troubleshooting policies
+
+<dl>
+   <dd>
+    <a href="./policy-csp-troubleshooting.md#troubleshooting-allowrecommendations" id="troubleshooting-allowrecommendations">Troubleshooting/AllowRecommendations</a>
+  </dd>
+</dl>
+
 ### Update policies
 
 <dl>
@@ -5013,6 +5021,7 @@ The following diagram shows the Policy configuration service provider in tree fo
 -   [SystemServices/ConfigureXboxLiveNetworkingServiceStartupMode](./policy-csp-systemservices.md#systemservices-configurexboxlivenetworkingservicestartupmode)
 -   [TextInput/AllowLanguageFeaturesUninstall](./policy-csp-textinput.md#textinput-allowlanguagefeaturesuninstall)
 -   [TextInput/AllowLinguisticDataCollection](./policy-csp-textinput.md#textinput-allowlinguisticdatacollection)
+-   [Troubleshooting/AllowRecommendations](./policy-csp-troubleshooting.md#troubleshooting-allowrecommendations)
 -   [Update/ActiveHoursEnd](./policy-csp-update.md#update-activehoursend)
 -   [Update/ActiveHoursMaxRange](./policy-csp-update.md#update-activehoursmaxrange)
 -   [Update/ActiveHoursStart](./policy-csp-update.md#update-activehoursstart)

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

@@ -0,0 +1,142 @@
+---
+title: Policy CSP - Troubleshooting
+description: Policy CSP - Troubleshooting
+ms.author: maricia
+ms.topic: article
+ms.prod: w10
+ms.technology: windows
+author: MariciaAlforque
+ms.date: 05/21/2019
+---
+
+# Policy CSP - Troubleshooting
+
+
+<hr/>
+
+<!--Policies-->
+## Troubleshooting policies  
+
+<dl>
+  <dd>
+    <a href="#troubleshooting-allowrecommendations">Troubleshooting/AllowRecommendations</a>
+  </dd>
+</dl>
+
+
+<hr/>
+
+<!--Policy-->
+<a href="" id="troubleshooting-allowrecommendations"></a>**Troubleshooting/AllowRecommendations**  
+
+<!--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>6</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>6</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>6</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>6</sup></td>
+	<td></td>
+	<td></td>
+</tr>
+</table>
+
+<!--/SupportedSKUs-->
+<!--Scope-->
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+<hr/>
+
+<!--/Scope-->
+<!--Description-->
+This policy setting allows IT admins to configure how to apply recommended troubleshooting for known problems on the devices in their domains or IT environments.
+
+<!--/Description-->
+
+<!--SupportedValues-->
+This is a numeric policy setting with merge algorithm (lowest value is the most secure) that uses the most restrictive settings for complex manageability scenarios.
+
+Supported values:  
+-   0 (default) - Turn this feature off.
+-   1 - Turn this feature off but still apply critical troubleshooting.
+-   2 - Notify users when recommended troubleshooting is available, then allow the user to run or ignore it.
+-   3 - Run recommended troubleshooting automatically and notify the user after it ran successfully.
+-   4 - Run recommended troubleshooting automatically without notifying the user.
+-   5 - Allow the user to choose their own recommended troubleshooting settings.
+
+By default, this policy is not configured and the SKU based defaults are used for managed devices. Current policy values for SKU's are as follows:
+<table>
+<tr>
+    <th>SKU</th>
+	<th>Unmanaged Default</th>
+	<th>Managed Default</th>
+</tr>
+<tr>
+	<td>Home</td>
+	<td>Prompt (OOBE)</td>
+	<td>Off</td>
+</tr>
+<tr>
+	<td>Pro</td>
+	<td>Prompt (OOBE)</td>
+	<td>Off</td>
+</tr>
+<tr>
+	<td>Education</td>
+	<td>On (auto)</td>
+	<td>Off</td>
+</tr>
+<tr>
+	<td>Enterprise</td>
+	<td>Off</td>
+	<td>Off</td>
+</tr>
+<tr>
+	<td>Government</td>
+	<td>Off</td>
+	<td>Off</td>
+</tr>
+</table>
+ 
+<!--/SupportedValues-->
+<!--ADMXMapped-->
+ADMX Info:  
+-   GP English name: *Troubleshooting: Allow users to access recommended troubleshooting for known problems*
+-   GP name: *TroubleshootingAllowRecommendations*
+-   GP path: *Troubleshooting and Diagnostics/Microsoft Support Diagnostic Tool*
+-   GP ADMX file name: *MSDT.admx*
+
+<!--/ADMXMapped-->
+
+<!--Example-->
+
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--/Policy-->
+
+<!--/Policies-->
+<hr/>
+
+Footnotes:
+
+-   1 - Added in Windows 10, version 1607.
+-   2 - Added in Windows 10, version 1703.
+-   3 - Added in Windows 10, version 1709.
+-   4 - Added in Windows 10, version 1803.
+-   5 - Added in Windows 10, version 1809.
+-   6 - Added in Windows 10, version 1903.