Merge branch 'master' of https://github.com/MicrosoftDocs/windows-docs-pr into us1610820b

This commit is contained in:
TimShererWithAquent
2020-08-20 08:46:58 -07:00
161 changed files with 162 additions and 163 deletions

View File

@ -143,7 +143,7 @@ Example:
## PowerShell
> [!WARNING]
> If you manage your computers and devices with Intune, Configuration Manager, or other enterprise-level management platform, the management software will overwrite any conflicting PowerShell settings on startup.
> If you manage your computers and devices with Intune, Configuration Manager, or another enterprise-level management platform, the management software will overwrite any conflicting PowerShell settings on startup. To allow users to define the value using PowerShell, use the "User Defined" option for the rule in the management platform.
1. Type **powershell** in the Start menu, right-click **Windows PowerShell** and select **Run as administrator**.
@ -198,4 +198,3 @@ Example:
- [Evaluate attack surface reduction](evaluate-attack-surface-reduction.md)
- [Attack surface reduction FAQ](attack-surface-reduction.md)