Merge branch 'master' into dansimp-new-gummi-bear

This commit is contained in:
Thomas Raya
2021-10-04 12:38:47 -07:00
committed by GitHub
81 changed files with 11956 additions and 1608 deletions

View File

@ -13,6 +13,7 @@ manager: dansimp
audience: ITPro
ms.collection: M365-security-compliance
ms.topic: article
ms.date: 10/04/2021
search.appverid: met150
ms.technology: mde
---
@ -174,7 +175,7 @@ Microsoft uses specific categories and the category definitions to classify soft
* **Torrent software (Enterprise only):** Software that is used to create or download torrents or other files specifically used with peer-to-peer file-sharing technologies.
* **Cryptomining software:** Software that uses your device resources to mine cryptocurrencies.
* **Cryptomining software (Enterprise only):** Software that uses your device resources to mine cryptocurrencies.
* **Bundling software:** Software that offers to install other software that is not developed by the same entity or not required for the software to run. Also, software that offers to install other software that qualifies as PUA based on the criteria outlined in this document.