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

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

Browse Source
This commit is contained in:
Beth Levin 2019-11-05 15:35:33 -08:00
commit e913d1d337
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devices/hololens/docfx.json
View File

@ -43,8 +43,9 @@
"./": { "./": {
"depot_name": "Win.itpro-hololens", "depot_name": "Win.itpro-hololens",
"folder_relative_path_in_docset": "./" "folder_relative_path_in_docset": "./"
}
} }
}
}, },
"fileMetadata": {}, "fileMetadata": {},
"template": [ "template": [
@ -52,5 +53,15 @@
], ],
"dest": "devices/hololens", "dest": "devices/hololens",
"markdownEngineName": "markdig" "markdownEngineName": "markdig"
} },
"contributors_to_exclude": [
"rjagiewich",
"traya1",
"rmca14",
"claydetels19",
"Kellylorenebaker",
"jborsecnik",
"tiburd",
"garycentric"
]
} }

12
windows/docfx.json
View File

@ -20,7 +20,17 @@
"_op_documentIdPathDepotMapping": { "_op_documentIdPathDepotMapping": {
"./": { "./": {
"depot_name": "Win.windows" "depot_name": "Win.windows"
} },
"contributors_to_exclude": [
"rjagiewich",
"traya1",
"rmca14",
"claydetels19",
"Kellylorenebaker",
"jborsecnik",
"tiburd",
"garycentric"
],
} }
}, },
"externalReference": [ "externalReference": [

4
windows/security/threat-protection/microsoft-defender-atp/mac-pua.md
View File

@ -59,8 +59,8 @@ $ mdatp --threat --type-handling potentially_unwanted_application [off|audit|blo
### Use the management console to configure PUA protection: ### Use the management console to configure PUA protection:
In your enterprise, you can configure PUA protection from a management console, such as JAMF or Intune, similarly to how other product settings are configured. For more information, see the [Threat type settings](microsoft-defender-atp-mac-preferences.md#threat-type-settings) section of the [Set preferences for Microsoft Defender ATP for Mac](microsoft-defender-atp-mac-preferences.md) topic. In your enterprise, you can configure PUA protection from a management console, such as JAMF or Intune, similarly to how other product settings are configured. For more information, see the [Threat type settings](mac-preferences.md#threat-type-settings) section of the [Set preferences for Microsoft Defender ATP for Mac](mac-preferences.md) topic.
## Related topics ## Related topics
- [Set preferences for Microsoft Defender ATP for Mac](microsoft-defender-atp-mac-preferences.md) - [Set preferences for Microsoft Defender ATP for Mac](mac-preferences.md)