deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-13 13:57:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into v-gmoor-fixes-for-pr-4478

Browse Source
This commit is contained in:
Gary Moore 2020-12-30 21:34:34 -08:00 committed by GitHub
commit 72da39b182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
windows/client-management/mdm/policy-csp-defender.md
View File

@ -2317,6 +2317,15 @@ Added in Windows 10, version 1607. Specifies the level of detection for potenti
> Potentially unwanted applications (PUA) are a category of software that can cause your machine to run slowly, display unexpected ads, or at worst, install other software which might be unexpected or unwanted. By default in Windows 10 (version 2004 and later), Microsoft Defender Antivirus blocks apps that are considered PUA, for Enterprise (E5) devices. For more information about PUA, see [Detect and block potentially unwanted applications](https://docs.microsoft.com/windows/security/threat-protection/microsoft-defender-antivirus/detect-block-potentially-unwanted-apps-microsoft-defender-antivirus). > Potentially unwanted applications (PUA) are a category of software that can cause your machine to run slowly, display unexpected ads, or at worst, install other software which might be unexpected or unwanted. By default in Windows 10 (version 2004 and later), Microsoft Defender Antivirus blocks apps that are considered PUA, for Enterprise (E5) devices. For more information about PUA, see [Detect and block potentially unwanted applications](https://docs.microsoft.com/windows/security/threat-protection/microsoft-defender-antivirus/detect-block-potentially-unwanted-apps-microsoft-defender-antivirus).
<!--/Description--> <!--/Description-->
<!--ADMXMapped-->
ADMX Info:
- GP English name: *Configure detection for potentially unwanted applications*
- GP name: *Root_PUAProtection*
- GP element: *Root_PUAProtection*
- GP path: *Windows Components/Microsoft Defender Antivirus*
- GP ADMX file name: *WindowsDefender.admx*
<!--/ADMXMapped-->
<!--SupportedValues--> <!--SupportedValues-->
The following list shows the supported values: The following list shows the supported values:
@ -3112,6 +3121,7 @@ Footnotes:
- 6 - Available in Windows 10, version 1903. - 6 - Available in Windows 10, version 1903.
- 7 - Available in Windows 10, version 1909. - 7 - Available in Windows 10, version 1909.
- 8 - Available in Windows 10, version 2004. - 8 - Available in Windows 10, version 2004.
- 9 - Available in Windows 10, version 20H2.
<!--/Policies--> <!--/Policies-->

6
windows/deployment/deploy-enterprise-licenses.md
View File

@ -32,10 +32,10 @@ This topic describes how to deploy Windows 10 Enterprise E3 or E5 licenses with
## Firmware-embedded activation key ## Firmware-embedded activation key
To determine if the computer has a firmware-embedded activation key, type the following command at an elevated Windows PowerShell prompt To determine if the computer has a firmware-embedded activation key, type the following command at an elevated Windows PowerShell prompt:
```powershell ```PowerShell
(Get-WmiObject -query ‘select * from SoftwareLicensingService’).OA3xOriginalProductKey (Get-CimInstance -query ‘select * from SoftwareLicensingService’).OA3xOriginalProductKey
``` ```
If the device has a firmware-embedded activation key, it will be displayed in the output. If the output is blank, the device does not have a firmware embedded activation key. Most OEM-provided devices designed to run Windows 8 or later will have a firmware-embedded key. If the device has a firmware-embedded activation key, it will be displayed in the output. If the output is blank, the device does not have a firmware embedded activation key. Most OEM-provided devices designed to run Windows 8 or later will have a firmware-embedded key.