From d9444b26a1fe9672efd042e323d0315a02267a34 Mon Sep 17 00:00:00 2001 From: ManikaDhiman Date: Tue, 9 Jun 2020 13:37:00 -0700 Subject: [PATCH 01/15] Added 20H1 DO policies --- ...ew-in-windows-mdm-enrollment-management.md | 13 +- .../policy-configuration-service-provider.md | 9 + .../mdm/policy-csp-deliveryoptimization.md | 262 +++++++++++++----- .../mdm/policy-csps-supported-by-iot-core.md | 3 + ...policy-csps-supported-by-iot-enterprise.md | 3 + 5 files changed, 218 insertions(+), 72 deletions(-) diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index 58d58b3935..18e004f4d3 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -105,14 +105,23 @@ For details about Microsoft mobile device management protocols for Windows 10 s Policy CSP -

Added the following new policies in Windows 10, version 2004:

+

Added and updated the following new policies in Windows 10, version 2004:

+ +

Deprecated the following policies in Windows 10, version 2004:

+ DevDetail CSP diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md index 3f32491bba..070dea30cc 100644 --- a/windows/client-management/mdm/policy-configuration-service-provider.md +++ b/windows/client-management/mdm/policy-configuration-service-provider.md @@ -1075,6 +1075,9 @@ The following diagram shows the Policy configuration service provider in tree fo
DeliveryOptimization/DOCacheHost
+
+ DeliveryOptimization/DOCacheHostSource +
DeliveryOptimization/DODelayBackgroundDownloadFromHttp
@@ -1095,6 +1098,9 @@ The following diagram shows the Policy configuration service provider in tree fo
DeliveryOptimization/DOGroupIdSource +
+
+ DeliveryOptimization/DOMaxBackgroundDownloadBandwidth
DeliveryOptimization/DOMaxCacheAge @@ -1105,6 +1111,9 @@ The following diagram shows the Policy configuration service provider in tree fo
DeliveryOptimization/DOMaxDownloadBandwidth
+
+ DeliveryOptimization/DOMaxForegroundDownloadBandwidth +
DeliveryOptimization/DOMaxUploadBandwidth
diff --git a/windows/client-management/mdm/policy-csp-deliveryoptimization.md b/windows/client-management/mdm/policy-csp-deliveryoptimization.md index 8a8184ba9a..f3b34ef7cd 100644 --- a/windows/client-management/mdm/policy-csp-deliveryoptimization.md +++ b/windows/client-management/mdm/policy-csp-deliveryoptimization.md @@ -7,7 +7,7 @@ ms.prod: w10 ms.technology: windows author: manikadhiman ms.localizationpriority: medium -ms.date: 09/27/2019 +ms.date: 06/09/2020 ms.reviewer: manager: dansimp --- @@ -31,6 +31,9 @@ manager: dansimp
DeliveryOptimization/DOCacheHost
+
+ DeliveryOptimization/DOCacheHostSource +
DeliveryOptimization/DODelayBackgroundDownloadFromHttp
@@ -52,6 +55,9 @@ manager: dansimp
DeliveryOptimization/DOGroupIdSource
+
+ DeliveryOptimization/DOMaxBackgroundDownloadBandwidth +
DeliveryOptimization/DOMaxCacheAge
@@ -61,6 +67,9 @@ manager: dansimp
DeliveryOptimization/DOMaxDownloadBandwidth
+
+ DeliveryOptimization/DOMaxForegroundDownloadBandwidth +
DeliveryOptimization/DOMaxUploadBandwidth
@@ -289,14 +298,16 @@ The following list shows the supported values: -[Reserved for future use] + +This policy allows you to configure one or more Microsoft Connected Cache servers to be used by Delivery Optimization. + +One or more values can be added as either fully qualified domain names (FQDN) or IP addresses. To add multiple values, separate each FQDN or IP address by commas. ADMX Info: -- GP English name: *[Reserved for future use] Cache Server Hostname* -- GP name: *CacheHost* -- GP element: *CacheHost* +- GP English name: *Cache Server Hostname* +- GP name: *Cache Server Hostname* - GP path: *Windows Components/Delivery Optimization* - GP ADMX file name: *DeliveryOptimization.admx* @@ -314,6 +325,83 @@ ADMX Info:
+ +**DeliveryOptimization/DOCacheHostSource** + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Windows EditionSupported?
Homecross mark
Procheck mark8
Businesscheck mark8
Enterprisecheck mark8
Educationcheck mark8
+ + +
+ + +[Scope](./policy-configuration-service-provider.md#policy-scope): + +> [!div class = "checklist"] +> * Device + +
+ + + + +This policy allows you to to configure one or more Delivery Optimization in Network Cache servers through a custom DHCP Option. One or more values can be added as either fully qualified domain names (FQDN) or IP addresses. To add multiple values, separate each FQDN or IP address by commas. + + + +ADMX Info: +- GP English name: *Cache Server Hostname* +- GP name: *Cache Server Hostname* +- GP path: *Windows Components/Delivery Optimization* +- GP ADMX file name: *DeliveryOptimization.admx* + + + +The following are the supported values: +- 1 = DHCP Option ID. +- 2 = DHCP Option ID Force. + +When DHCP Option ID (1) is set, the client will query DHCP Option ID 235 and use the returned FQDN or IP value as Cache Server Hostname value. This policy will be overridden when the Cache Server Hostname policy has been set. + +> [!Note] +> If the DHCP Option ID is formatted incorrectly, the client will fall back to the [Cache Server Hostname policy](#deliveryoptimization-docachehost) value if that value has been set. + + + + + + + + + + +
+ **DeliveryOptimization/DODelayBackgroundDownloadFromHttp** @@ -816,6 +904,67 @@ The following list shows the supported values:
+ +**DeliveryOptimization/DOMaxBackgroundDownloadBandwidth** + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Windows EditionSupported?
Homecross mark
Procheck mark8
Businesscheck mark8
Enterprisecheck mark8
Educationcheck mark8
+ + +
+ + +[Scope](./policy-configuration-service-provider.md#policy-scope): + +> [!div class = "checklist"] +> * Device + +
+ + + +This policy specifies the maximum background download bandwidth in KiloBytes/second that the device can use across all concurrent download activities using Delivery Optimization. + +The default value 0 (zero) means that Delivery Optimization dynamically adjusts to use the available bandwidth for downloads. + + + +ADMX Info: +- GP English name: *Maximum Background Download Bandwidth (in KB/s)* +- GP name: *Maximum Background Download Bandwidth (in KB/s)* +- GP path: *Windows Components/Delivery Optimization* +- GP ADMX file name: *DeliveryOptimization.admx* + + + + +
+ **DeliveryOptimization/DOMaxCacheAge** @@ -952,70 +1101,27 @@ ADMX Info: **DeliveryOptimization/DOMaxDownloadBandwidth** - - - - - - - - - - - - - - - - - - - - - - - - - -
Windows EditionSupported?
Homecross mark
Procheck mark1
Businesscheck mark1
Enterprisecheck mark1
Educationcheck mark1
+
-[Scope](./policy-configuration-service-provider.md#policy-scope): - -> [!div class = "checklist"] -> * Device -
-> [!NOTE] -> This policy is only enforced in Windows 10 Pro, Enterprise, and Education editions and not supported in Windows 10 Mobile. - - -Added in Windows 10, version 1607. Specifies the maximum download bandwidth in KiloBytes/second that the device can use across all concurrent download activities using Delivery Optimization. - -The default value 0 (zero) means that Delivery Optimization dynamically adjusts to use the available bandwidth for downloads. +This policy is deprecated. Use [DOMaxForegroundDownloadBandwidth](#deliveryoptimization-domaxforegrounddownloadbandwidth) and [DOMaxBackgroundDownloadBandwidth](#deliveryoptimization-domaxbackgrounddownloadbandwidth) policies instead. -ADMX Info: -- GP English name: *Maximum Download Bandwidth (in KB/s)* -- GP name: *MaxDownloadBandwidth* -- GP element: *MaxDownloadBandwidth* -- GP path: *Windows Components/Delivery Optimization* -- GP ADMX file name: *DeliveryOptimization.admx* -
-**DeliveryOptimization/DOMaxUploadBandwidth** +**DeliveryOptimization/DOMaxForegroundDownloadBandwidth** @@ -1029,19 +1135,19 @@ ADMX Info: - + - + - + - +
Procheck markcheck mark8
Businesscheck markcheck mark8
Enterprisecheck markcheck mark8
Educationcheck markcheck mark8
@@ -1058,20 +1164,15 @@ ADMX Info: -> [!NOTE] -> This policy is only enforced in Windows 10 Pro, Enterprise, and Education editions and not supported in Windows 10 Mobile. +This policy specifies the maximum foreground download bandwidth in KiloBytes/second that the device can use across all concurrent download activities using Delivery Optimization. - -Specifies the maximum upload bandwidth in KiloBytes/second that a device will use across all concurrent upload activity using Delivery Optimization. - -The default value is 0, which permits unlimited possible bandwidth (optimized for minimal usage of upload bandwidth). +The default value 0 (zero) means that Delivery Optimization dynamically adjusts to use the available bandwidth for downloads. ADMX Info: -- GP English name: *Max Upload Bandwidth (in KB/s)* -- GP name: *MaxUploadBandwidth* -- GP element: *MaxUploadBandwidth* +- GP English name: *Maximum Foreground Download Bandwidth (in KB/s)* +- GP name: *Maximum Foreground Download Bandwidth (in KB/s)* - GP path: *Windows Components/Delivery Optimization* - GP ADMX file name: *DeliveryOptimization.admx* @@ -1080,6 +1181,25 @@ ADMX Info:
+ +**DeliveryOptimization/DOMaxUploadBandwidth** + + + + + + + + +This policy is deprecated. + + + + + + +
+ **DeliveryOptimization/DOMinBackgroundQos** @@ -1901,12 +2021,14 @@ This policy allows an IT Admin to define the following: 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. +- 1 - Available in Windows 10, version 1607. +- 2 - Available in Windows 10, version 1703. +- 3 - Available in Windows 10, version 1709. +- 4 - Available in Windows 10, version 1803. +- 5 - Available in Windows 10, version 1809. +- 6 - Available in Windows 10, version 1903. +- 7 - Available in Windows 10, version 1909. +- 8 - Available in Windows 10, version 2004. diff --git a/windows/client-management/mdm/policy-csps-supported-by-iot-core.md b/windows/client-management/mdm/policy-csps-supported-by-iot-core.md index c37cdb1b86..da5c51c493 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-iot-core.md +++ b/windows/client-management/mdm/policy-csps-supported-by-iot-core.md @@ -31,6 +31,7 @@ ms.date: 09/16/2019 - [DeliveryOptimization/DOAbsoluteMaxCacheSize](policy-csp-deliveryoptimization.md#deliveryoptimization-doabsolutemaxcachesize) - [DeliveryOptimization/DOAllowVPNPeerCaching](policy-csp-deliveryoptimization.md#deliveryoptimization-doallowvpnpeercaching) - [DeliveryOptimization/DOCacheHost](policy-csp-deliveryoptimization.md#deliveryoptimization-docachehost) +- [DeliveryOptimization/DOCacheHostSource](policy-csp-deliveryoptimization.md#deliveryoptimization-docachehostsource) - [DeliveryOptimization/DODelayBackgroundDownloadFromHttp](policy-csp-deliveryoptimization.md#deliveryoptimization-dodelaybackgrounddownloadfromhttp) - [DeliveryOptimization/DODelayForegroundDownloadFromHttp](policy-csp-deliveryoptimization.md#deliveryoptimization-dodelayforegrounddownloadfromhttp) - [DeliveryOptimization/DODelayCacheServerFallbackBackground](policy-csp-deliveryoptimization.md#deliveryoptimization-dodelaycacheserverfallbackbackground) @@ -38,9 +39,11 @@ ms.date: 09/16/2019 - [DeliveryOptimization/DODownloadMode](policy-csp-deliveryoptimization.md#deliveryoptimization-dodownloadmode) - [DeliveryOptimization/DOGroupId](policy-csp-deliveryoptimization.md#deliveryoptimization-dogroupid) - [DeliveryOptimization/DOGroupIdSource](policy-csp-deliveryoptimization.md#deliveryoptimization-dogroupidsource) +- [DeliveryOptimization/DOMaxBackgroundDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxbackgrounddownloadbandwidth) - [DeliveryOptimization/DOMaxCacheAge](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxcacheage) - [DeliveryOptimization/DOMaxCacheSize](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxcachesize) - [DeliveryOptimization/DOMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxdownloadbandwidth) +- [DeliveryOptimization/DOMaxForegroundDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxforegrounddownloadbandwidth) - [DeliveryOptimization/DOMaxUploadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxuploadbandwidth) - [DeliveryOptimization/DOMinBackgroundQos](policy-csp-deliveryoptimization.md#deliveryoptimization-dominbackgroundqos) - [DeliveryOptimization/DOMinBatteryPercentageAllowedToUpload](policy-csp-deliveryoptimization.md#deliveryoptimization-dominbatterypercentageallowedtoupload) diff --git a/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md b/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md index f0837806da..81f8617638 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md +++ b/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md @@ -30,6 +30,7 @@ ms.date: 07/18/2019 - [DeliveryOptimization/DOAbsoluteMaxCacheSize](policy-csp-deliveryoptimization.md#deliveryoptimization-doabsolutemaxcachesize) - [DeliveryOptimization/DOAllowVPNPeerCaching](policy-csp-deliveryoptimization.md#deliveryoptimization-doallowvpnpeercaching) - [DeliveryOptimization/DOCacheHost](policy-csp-deliveryoptimization.md#deliveryoptimization-docachehost) +- [DeliveryOptimization/DOCacheHostSource](policy-csp-deliveryoptimization.md#deliveryoptimization-docachehostsource) - [DeliveryOptimization/DODelayBackgroundDownloadFromHttp](policy-csp-deliveryoptimization.md#deliveryoptimization-dodelaybackgrounddownloadfromhttp) - [DeliveryOptimization/DODelayForegroundDownloadFromHttp](policy-csp-deliveryoptimization.md#deliveryoptimization-dodelayforegrounddownloadfromhttp) - [DeliveryOptimization/DODelayCacheServerFallbackBackground](policy-csp-deliveryoptimization.md#deliveryoptimization-dodelaycacheserverfallbackbackground) @@ -37,9 +38,11 @@ ms.date: 07/18/2019 - [DeliveryOptimization/DODownloadMode](policy-csp-deliveryoptimization.md#deliveryoptimization-dodownloadmode) - [DeliveryOptimization/DOGroupId](policy-csp-deliveryoptimization.md#deliveryoptimization-dogroupid) - [DeliveryOptimization/DOGroupIdSource](policy-csp-deliveryoptimization.md#deliveryoptimization-dogroupidsource) +- [DeliveryOptimization/DOMaxBackgroundDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxbackgrounddownloadbandwidth) - [DeliveryOptimization/DOMaxCacheAge](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxcacheage) - [DeliveryOptimization/DOMaxCacheSize](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxcachesize) - [DeliveryOptimization/DOMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxdownloadbandwidth) +- [DeliveryOptimization/DOMaxForegroundDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxforegrounddownloadbandwidth) - [DeliveryOptimization/DOMaxUploadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxuploadbandwidth) - [DeliveryOptimization/DOMinBackgroundQos](policy-csp-deliveryoptimization.md#deliveryoptimization-dominbackgroundqos) - [DeliveryOptimization/DOMinBatteryPercentageAllowedToUpload](policy-csp-deliveryoptimization.md#deliveryoptimization-dominbatterypercentageallowedtoupload) From 7631c95f05e2ebb84ba8fd3cce80474449b13164 Mon Sep 17 00:00:00 2001 From: ManikaDhiman Date: Tue, 9 Jun 2020 14:00:45 -0700 Subject: [PATCH 02/15] Fixed build warnings --- .../mdm/new-in-windows-mdm-enrollment-management.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index 18e004f4d3..877fabf20d 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -109,10 +109,10 @@ For details about Microsoft mobile device management protocols for Windows 10 s DevDetail CSP From c8a91716b700ad75ef5ad673a61f8039d2053ac9 Mon Sep 17 00:00:00 2001 From: ManikaDhiman Date: Tue, 9 Jun 2020 14:21:58 -0700 Subject: [PATCH 03/15] Added one more deprecated policy to the list --- .../mdm/new-in-windows-mdm-enrollment-management.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index 877fabf20d..7ca5f2091f 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -105,11 +105,10 @@ For details about Microsoft mobile device management protocols for Windows 10 s Policy CSP -

Added and updated the following new policies in Windows 10, version 2004:

+

Added the following new policies in Windows 10, version 2004:

+

Updated the following policies in Windows 10, version 2004:

+ +

Deprecated the following policies in Windows 10, version 2004:

+
  • DeliveryOptimization/DOPercentageMaxDownloadBandwidth
    • DevDetail CSP From 70d106e446abe327f82e74c1cf3340592f7fa770 Mon Sep 17 00:00:00 2001 From: ManikaDhiman Date: Tue, 9 Jun 2020 14:45:04 -0700 Subject: [PATCH 04/15] Minor updates --- .../mdm/new-in-windows-mdm-enrollment-management.md | 2 +- .../mdm/policy-configuration-service-provider.md | 6 +++--- .../mdm/policy-csps-supported-by-iot-core.md | 6 +++--- .../mdm/policy-csps-supported-by-iot-enterprise.md | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index 7ca5f2091f..430601798d 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -117,7 +117,7 @@ For details about Microsoft mobile device management protocols for Windows 10 s
  • TextInput/ConfigureSimplifiedChineseIMEVersion
  • TextInput/ConfigureTraditionalChineseIMEVersion
    • -

    Updated the following policies in Windows 10, version 2004:

    +

    Updated the following policy in Windows 10, version 2004:

    diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md index 070dea30cc..68382e2326 100644 --- a/windows/client-management/mdm/policy-configuration-service-provider.md +++ b/windows/client-management/mdm/policy-configuration-service-provider.md @@ -1112,10 +1112,10 @@ The following diagram shows the Policy configuration service provider in tree fo DeliveryOptimization/DOMaxDownloadBandwidth
    - DeliveryOptimization/DOMaxForegroundDownloadBandwidth + DeliveryOptimization/DOMaxForegroundDownloadBandwidth (deprecated)
    - DeliveryOptimization/DOMaxUploadBandwidth + DeliveryOptimization/DOMaxUploadBandwidth (deprecated)
    DeliveryOptimization/DOMinBackgroundQos @@ -1142,7 +1142,7 @@ The following diagram shows the Policy configuration service provider in tree fo DeliveryOptimization/DOPercentageMaxBackgroundBandwidth
    - DeliveryOptimization/DOPercentageMaxDownloadBandwidth + DeliveryOptimization/DOPercentageMaxDownloadBandwidth (deprecated)
    DeliveryOptimization/DOPercentageMaxForegroundBandwidth diff --git a/windows/client-management/mdm/policy-csps-supported-by-iot-core.md b/windows/client-management/mdm/policy-csps-supported-by-iot-core.md index da5c51c493..c43363b357 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-iot-core.md +++ b/windows/client-management/mdm/policy-csps-supported-by-iot-core.md @@ -42,9 +42,9 @@ ms.date: 09/16/2019 - [DeliveryOptimization/DOMaxBackgroundDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxbackgrounddownloadbandwidth) - [DeliveryOptimization/DOMaxCacheAge](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxcacheage) - [DeliveryOptimization/DOMaxCacheSize](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxcachesize) -- [DeliveryOptimization/DOMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxdownloadbandwidth) +- [DeliveryOptimization/DOMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxdownloadbandwidth) (deprecated) - [DeliveryOptimization/DOMaxForegroundDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxforegrounddownloadbandwidth) -- [DeliveryOptimization/DOMaxUploadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxuploadbandwidth) +- [DeliveryOptimization/DOMaxUploadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxuploadbandwidth) (deprecated) - [DeliveryOptimization/DOMinBackgroundQos](policy-csp-deliveryoptimization.md#deliveryoptimization-dominbackgroundqos) - [DeliveryOptimization/DOMinBatteryPercentageAllowedToUpload](policy-csp-deliveryoptimization.md#deliveryoptimization-dominbatterypercentageallowedtoupload) - [DeliveryOptimization/DOMinDiskSizeAllowedToPeer](policy-csp-deliveryoptimization.md#deliveryoptimization-domindisksizeallowedtopeer) @@ -53,7 +53,7 @@ ms.date: 09/16/2019 - [DeliveryOptimization/DOModifyCacheDrive](policy-csp-deliveryoptimization.md#deliveryoptimization-domodifycachedrive) - [DeliveryOptimization/DOMonthlyUploadDataCap](policy-csp-deliveryoptimization.md#deliveryoptimization-domonthlyuploaddatacap) - [DeliveryOptimization/DOPercentageMaxBackgroundBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dopercentagemaxbackgroundbandwidth) -- [DeliveryOptimization/DOPercentageMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dopercentagemaxdownloadbandwidth) +- [DeliveryOptimization/DOPercentageMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dopercentagemaxdownloadbandwidth) (deprecated) - [DeliveryOptimization/DOPercentageMaxForegroundBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dopercentagemaxforegroundbandwidth) - [DeliveryOptimization/DORestrictPeerSelectionBy](policy-csp-deliveryoptimization.md#deliveryoptimization-dorestrictpeerselectionby) - [DeliveryOptimization/DOSetHoursToLimitBackgroundDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dosethourstolimitbackgrounddownloadbandwidth) diff --git a/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md b/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md index 81f8617638..617be22113 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md +++ b/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md @@ -41,9 +41,9 @@ ms.date: 07/18/2019 - [DeliveryOptimization/DOMaxBackgroundDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxbackgrounddownloadbandwidth) - [DeliveryOptimization/DOMaxCacheAge](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxcacheage) - [DeliveryOptimization/DOMaxCacheSize](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxcachesize) -- [DeliveryOptimization/DOMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxdownloadbandwidth) +- [DeliveryOptimization/DOMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxdownloadbandwidth) (deprecated) - [DeliveryOptimization/DOMaxForegroundDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxforegrounddownloadbandwidth) -- [DeliveryOptimization/DOMaxUploadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxuploadbandwidth) +- [DeliveryOptimization/DOMaxUploadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-domaxuploadbandwidth) (deprecated) - [DeliveryOptimization/DOMinBackgroundQos](policy-csp-deliveryoptimization.md#deliveryoptimization-dominbackgroundqos) - [DeliveryOptimization/DOMinBatteryPercentageAllowedToUpload](policy-csp-deliveryoptimization.md#deliveryoptimization-dominbatterypercentageallowedtoupload) - [DeliveryOptimization/DOMinDiskSizeAllowedToPeer](policy-csp-deliveryoptimization.md#deliveryoptimization-domindisksizeallowedtopeer) @@ -52,7 +52,7 @@ ms.date: 07/18/2019 - [DeliveryOptimization/DOModifyCacheDrive](policy-csp-deliveryoptimization.md#deliveryoptimization-domodifycachedrive) - [DeliveryOptimization/DOMonthlyUploadDataCap](policy-csp-deliveryoptimization.md#deliveryoptimization-domonthlyuploaddatacap) - [DeliveryOptimization/DOPercentageMaxBackgroundBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dopercentagemaxbackgroundbandwidth) -- [DeliveryOptimization/DOPercentageMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dopercentagemaxdownloadbandwidth) +- [DeliveryOptimization/DOPercentageMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dopercentagemaxdownloadbandwidth) (deprecated) - [DeliveryOptimization/DOPercentageMaxForegroundBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dopercentagemaxforegroundbandwidth) - [DeliveryOptimization/DORestrictPeerSelectionBy](policy-csp-deliveryoptimization.md#deliveryoptimization-dorestrictpeerselectionby) - [DeliveryOptimization/DOSetHoursToLimitBackgroundDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dosethourstolimitbackgrounddownloadbandwidth) From 4f7f130dc9f5990e137f8f0bf6d1ac6d0bb3adea Mon Sep 17 00:00:00 2001 From: ManikaDhiman Date: Tue, 9 Jun 2020 14:45:24 -0700 Subject: [PATCH 05/15] Update policy-configuration-service-provider.md Minor update --- .../mdm/policy-configuration-service-provider.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md index 68382e2326..bd877c1e04 100644 --- a/windows/client-management/mdm/policy-configuration-service-provider.md +++ b/windows/client-management/mdm/policy-configuration-service-provider.md @@ -1109,10 +1109,10 @@ The following diagram shows the Policy configuration service provider in tree fo DeliveryOptimization/DOMaxCacheSize
    - DeliveryOptimization/DOMaxDownloadBandwidth + DeliveryOptimization/DOMaxDownloadBandwidth (deprecated)
    - DeliveryOptimization/DOMaxForegroundDownloadBandwidth (deprecated) + DeliveryOptimization/DOMaxForegroundDownloadBandwidth
    DeliveryOptimization/DOMaxUploadBandwidth (deprecated) From 9f0c908264cb7a584afdce8150495256589944e8 Mon Sep 17 00:00:00 2001 From: ManikaDhiman Date: Tue, 9 Jun 2020 17:05:17 -0700 Subject: [PATCH 06/15] Added tech comments --- .../mdm/policy-csp-deliveryoptimization.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/windows/client-management/mdm/policy-csp-deliveryoptimization.md b/windows/client-management/mdm/policy-csp-deliveryoptimization.md index f3b34ef7cd..bbba8094f4 100644 --- a/windows/client-management/mdm/policy-csp-deliveryoptimization.md +++ b/windows/client-management/mdm/policy-csp-deliveryoptimization.md @@ -307,7 +307,8 @@ One or more values can be added as either fully qualified domain names (FQDN) or ADMX Info: - GP English name: *Cache Server Hostname* -- GP name: *Cache Server Hostname* +- GP name: *CacheHost* +- GP element: *CacheHost* - GP path: *Windows Components/Delivery Optimization* - GP ADMX file name: *DeliveryOptimization.admx* @@ -375,8 +376,9 @@ This policy allows you to to configure one or more Delivery Optimization in Netw ADMX Info: -- GP English name: *Cache Server Hostname* -- GP name: *Cache Server Hostname* +- GP English name: *Cache Server Hostname Source* +- GP name: *CacheHostSource* +- GP element: *CacheHostSource* - GP path: *Windows Components/Delivery Optimization* - GP ADMX file name: *DeliveryOptimization.admx* @@ -956,7 +958,8 @@ The default value 0 (zero) means that Delivery Optimization dynamically adjusts ADMX Info: - GP English name: *Maximum Background Download Bandwidth (in KB/s)* -- GP name: *Maximum Background Download Bandwidth (in KB/s)* +- GP name: *MaxBackgroundDownloadBandwidth* +- GP element: *MaxBackgroundDownloadBandwidth* - GP path: *Windows Components/Delivery Optimization* - GP ADMX file name: *DeliveryOptimization.admx* @@ -1172,7 +1175,8 @@ The default value 0 (zero) means that Delivery Optimization dynamically adjusts ADMX Info: - GP English name: *Maximum Foreground Download Bandwidth (in KB/s)* -- GP name: *Maximum Foreground Download Bandwidth (in KB/s)* +- GP name: *DOMaxForegroundDownloadBandwidth* +- GP element: *MaxForegroundDownloadBandwidth* - GP path: *Windows Components/Delivery Optimization* - GP ADMX file name: *DeliveryOptimization.admx* @@ -1191,7 +1195,7 @@ ADMX Info: -This policy is deprecated. +This policy is deprecated because it only applies to uploads to Internet peers (only allowed when DownloadMode is set to 3) which is not used in commercial deployments. There is no alternate policy to use. From a8cb570d7ee4863db1d9c64f15ecd34076a45b88 Mon Sep 17 00:00:00 2001 From: ManikaDhiman Date: Tue, 9 Jun 2020 17:32:05 -0700 Subject: [PATCH 07/15] minor update --- .../client-management/mdm/policy-csp-deliveryoptimization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/client-management/mdm/policy-csp-deliveryoptimization.md b/windows/client-management/mdm/policy-csp-deliveryoptimization.md index bbba8094f4..141762f884 100644 --- a/windows/client-management/mdm/policy-csp-deliveryoptimization.md +++ b/windows/client-management/mdm/policy-csp-deliveryoptimization.md @@ -1175,7 +1175,7 @@ The default value 0 (zero) means that Delivery Optimization dynamically adjusts ADMX Info: - GP English name: *Maximum Foreground Download Bandwidth (in KB/s)* -- GP name: *DOMaxForegroundDownloadBandwidth* +- GP name: *MaxForegroundDownloadBandwidth* - GP element: *MaxForegroundDownloadBandwidth* - GP path: *Windows Components/Delivery Optimization* - GP ADMX file name: *DeliveryOptimization.admx* From 425ec93914fea13c653102d885f4329d68f4eff6 Mon Sep 17 00:00:00 2001 From: ManikaDhiman Date: Wed, 10 Jun 2020 12:33:35 -0700 Subject: [PATCH 08/15] More updates --- .../mdm/policy-csp-deliveryoptimization.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows/client-management/mdm/policy-csp-deliveryoptimization.md b/windows/client-management/mdm/policy-csp-deliveryoptimization.md index 141762f884..902ef8e8be 100644 --- a/windows/client-management/mdm/policy-csp-deliveryoptimization.md +++ b/windows/client-management/mdm/policy-csp-deliveryoptimization.md @@ -388,10 +388,12 @@ The following are the supported values: - 1 = DHCP Option ID. - 2 = DHCP Option ID Force. -When DHCP Option ID (1) is set, the client will query DHCP Option ID 235 and use the returned FQDN or IP value as Cache Server Hostname value. This policy will be overridden when the Cache Server Hostname policy has been set. +When DHCP Option ID (1) is set, the client will query DHCP Option ID 235 and use the returned FQDN or IP value as Cache Server Hostname value. This policy will be overridden when the [Cache Server Hostname](#deliveryoptimization-docachehost) policy has been set. + +When DHCP Option ID Force (2) is set, the client will query DHCP Option ID 235 and use the returned FQDN or IP value as Cache Server Hostname value, and will override the Cache Server Hostname policy if it has been set. > [!Note] -> If the DHCP Option ID is formatted incorrectly, the client will fall back to the [Cache Server Hostname policy](#deliveryoptimization-docachehost) value if that value has been set. +> If the DHCP Option ID is formatted incorrectly, the client will fall back to the [Cache Server Hostname](#deliveryoptimization-docachehost) policy value if that value has been set. From fb4f3ea1686b17b6de3aa45bd751910199344d53 Mon Sep 17 00:00:00 2001 From: Thomas Raya Date: Thu, 11 Jun 2020 11:11:12 -0700 Subject: [PATCH 09/15] Add image file --- .../images/device_details_tab_1903.png | Bin 0 -> 32620 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 windows/security/information-protection/images/device_details_tab_1903.png diff --git a/windows/security/information-protection/images/device_details_tab_1903.png b/windows/security/information-protection/images/device_details_tab_1903.png new file mode 100644 index 0000000000000000000000000000000000000000..beb0337379e3c5939a3a9d129584155f03bbf660 GIT binary patch literal 32620 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 PUv;G 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 literal 0 HcmV?d00001 From f1e2e9e93a894561f5022a812c44ca8ea658dbee Mon Sep 17 00:00:00 2001 From: KC Cross Date: Thu, 11 Jun 2020 11:20:02 -0700 Subject: [PATCH 10/15] Acrolinx 2.0 GitHub API Identify guidance profiles per repo within the .edn file. --- .acrolinx-config.edn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.acrolinx-config.edn b/.acrolinx-config.edn index 4a22e37c62..61cb120716 100644 --- a/.acrolinx-config.edn +++ b/.acrolinx-config.edn @@ -1,5 +1,8 @@ {:allowed-branchname-matches ["master"] :allowed-filename-matches ["windows/"] + + :guidance-profile "d2b6c2c8-00ee-47f1-8d10-b280cc3434c1" ;; Profile ID for "M365-specific" + :acrolinx-check-settings { "languageId" "en" @@ -33,6 +36,6 @@ Click the scorecard links for each article to review the Acrolinx feedback on gr " **More info about Acrolinx** -You are helping M365 test Acrolinx while we merge to the Microsoft instance. We have set the minimum score to 20 to test that the minimum score script works. This is effectively *not* setting a minimum score. If you need to bypass this score, please contact krowley or go directly to the marveldocs-admins. Thanks for your patience while we continue with roll out! +We have set the minimum score to 20. This is effectively *not* setting a minimum score. If you need to bypass this score, please contact MARVEL PubOps. " } From 9d882212fa75af5712d87115a99482e3c7196d7d Mon Sep 17 00:00:00 2001 From: Tudor Dobrila Date: Thu, 11 Jun 2020 14:39:01 -0700 Subject: [PATCH 11/15] Release notes for 2003-2 --- .../microsoft-defender-atp/mac-exclusions.md | 13 ++++++++++--- .../microsoft-defender-atp/mac-whatsnew.md | 6 ++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md b/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md index c5927c9a88..cdb95e6464 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md +++ b/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md @@ -42,9 +42,16 @@ The follow table shows the exclusion types supported by Microsoft Defender ATP f Exclusion | Definition | Examples ---|---|--- File extension | All files with the extension, anywhere on the machine | `.test` -File | A specific file identified by the full path | `/var/log/test.log` -Folder | All files under the specified folder | `/var/log/` -Process | A specific process (specified either by the full path or file name) and all files opened by it | `/bin/cat`
    `cat` +File | A specific file identified by the full path | `/var/log/test.log`
    `/var/log/*.log`
    `/var/log/install.?.log` +Folder | All files under the specified folder | `/var/log/`
    `/var/*/` +Process | A specific process (specified either by the full path or file name) and all files opened by it | `/bin/cat`
    `cat`
    `c?t` + +File, folder, and process exclusions support the following wildcards: + +Wildcard | Description | Example | Matches +---|---|---|--- +\* | Matches any number of any characters including none | `/var/\*/\*.log` | `/var/log/system.log` +? | Matches any single character | `file?.log` | `file1.log`
    `file2.log` ## How to configure the list of exclusions diff --git a/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md b/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md index 57fde3cc75..fbf351fb3e 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md +++ b/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md @@ -26,6 +26,12 @@ ms.topic: conceptual > > If you have previously whitelisted the kernel extension as part of your remote deployment, that warning should not be presented to the end user. If you have not previously deployed a policy to whitelist the kernel extension, your users will be presented with the warning. To proactively silence the warning, you can still deploy a configuration to whitelist the kernel extension. Refer to the instructions in the [JAMF-based deployment](mac-install-with-jamf.md#approved-kernel-extension) and [Microsoft Intune-based deployment](mac-install-with-intune.md#create-system-configuration-profiles) topics. +## 101.00.31 + +- Antivirus [exclusions now support wildcards](mac-exclusions.md#supported-exclusion-types) +- Added the ability to trigger antivirus scans from the macOS contextual menu. You can now right-click a file or a folder in Finder and select **Scan with Microsoft Defender ATP** +- Other performance improvements & bug fixes + ## 100.90.27 - You can now [set an update channel](mac-updates.md#set-the-channel-name) for Microsoft Defender ATP for Mac that is different from the system-wide update channel From 79ff52480775adde4812a72f18e6cbe7b9b0f2a7 Mon Sep 17 00:00:00 2001 From: Tudor Dobrila Date: Thu, 11 Jun 2020 16:25:58 -0700 Subject: [PATCH 12/15] Updates --- .../microsoft-defender-atp/linux-exclusions.md | 8 ++++---- .../microsoft-defender-atp/mac-exclusions.md | 8 ++++---- .../microsoft-defender-atp/mac-whatsnew.md | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/windows/security/threat-protection/microsoft-defender-atp/linux-exclusions.md b/windows/security/threat-protection/microsoft-defender-atp/linux-exclusions.md index ef0797f456..b35f7ae596 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/linux-exclusions.md +++ b/windows/security/threat-protection/microsoft-defender-atp/linux-exclusions.md @@ -48,10 +48,10 @@ Process | A specific process (specified either by the full path or file name) an File, folder, and process exclusions support the following wildcards: -Wildcard | Description | Example | Matches ----|---|---|--- -\* | Matches any number of any characters including none | `/var/\*/\*.log` | `/var/log/system.log` -? | Matches any single character | `file?.log` | `file1.log`
    `file2.log` +Wildcard | Description | Example | Matches | Does not match +---|---|---|---|--- +\* | Matches any number of any characters including none (note that when this is used inside a path it will substitute only one folder) | `/var/\*/\*.log` | `/var/log/system.log` | `/var/log/nested/system.log` +? | Matches any single character | `file?.log` | `file1.log`
    `file2.log` | `file123.log` ## How to configure the list of exclusions diff --git a/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md b/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md index cdb95e6464..4e65c42654 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md +++ b/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md @@ -48,10 +48,10 @@ Process | A specific process (specified either by the full path or file name) an File, folder, and process exclusions support the following wildcards: -Wildcard | Description | Example | Matches ----|---|---|--- -\* | Matches any number of any characters including none | `/var/\*/\*.log` | `/var/log/system.log` -? | Matches any single character | `file?.log` | `file1.log`
    `file2.log` +Wildcard | Description | Example | Matches | Does not match +---|---|---|---|--- +\* | Matches any number of any characters including none (note that when this is used inside a path it will substitute only one folder) | `/var/\*/\*.log` | `/var/log/system.log` | `/var/log/nested/system.log` +? | Matches any single character | `file?.log` | `file1.log`
    `file2.log` | `file123.log` ## How to configure the list of exclusions diff --git a/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md b/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md index fbf351fb3e..40f7391213 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md +++ b/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md @@ -28,8 +28,10 @@ ms.topic: conceptual ## 101.00.31 +- Improved [product onboarding experience for Intune users](https://docs.microsoft.com/en-us/mem/intune/apps/apps-advanced-threat-protection-macos) - Antivirus [exclusions now support wildcards](mac-exclusions.md#supported-exclusion-types) - Added the ability to trigger antivirus scans from the macOS contextual menu. You can now right-click a file or a folder in Finder and select **Scan with Microsoft Defender ATP** +- In-place product downgrades are now explictily disallowed by the installer. If you need to downgrade, first uninstall the existing version and reconfigure your device - Other performance improvements & bug fixes ## 100.90.27 From e2d132d8d1b8e998daa09b064f34b604a8e0b3df Mon Sep 17 00:00:00 2001 From: Tudor Dobrila Date: Thu, 11 Jun 2020 16:27:54 -0700 Subject: [PATCH 13/15] Updates --- .../microsoft-defender-atp/linux-exclusions.md | 2 +- .../threat-protection/microsoft-defender-atp/mac-exclusions.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/security/threat-protection/microsoft-defender-atp/linux-exclusions.md b/windows/security/threat-protection/microsoft-defender-atp/linux-exclusions.md index b35f7ae596..5d04bf7089 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/linux-exclusions.md +++ b/windows/security/threat-protection/microsoft-defender-atp/linux-exclusions.md @@ -50,7 +50,7 @@ File, folder, and process exclusions support the following wildcards: Wildcard | Description | Example | Matches | Does not match ---|---|---|---|--- -\* | Matches any number of any characters including none (note that when this is used inside a path it will substitute only one folder) | `/var/\*/\*.log` | `/var/log/system.log` | `/var/log/nested/system.log` +\* | Matches any number of any characters including none (note that when this wildcard is used inside a path it will substitute only one folder) | `/var/\*/\*.log` | `/var/log/system.log` | `/var/log/nested/system.log` ? | Matches any single character | `file?.log` | `file1.log`
    `file2.log` | `file123.log` ## How to configure the list of exclusions diff --git a/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md b/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md index 4e65c42654..af6fa6157c 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md +++ b/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md @@ -50,7 +50,7 @@ File, folder, and process exclusions support the following wildcards: Wildcard | Description | Example | Matches | Does not match ---|---|---|---|--- -\* | Matches any number of any characters including none (note that when this is used inside a path it will substitute only one folder) | `/var/\*/\*.log` | `/var/log/system.log` | `/var/log/nested/system.log` +\* | Matches any number of any characters including none (note that when this wildcard is used inside a path it will substitute only one folder) | `/var/\*/\*.log` | `/var/log/system.log` | `/var/log/nested/system.log` ? | Matches any single character | `file?.log` | `file1.log`
    `file2.log` | `file123.log` ## How to configure the list of exclusions From 876846d571f557c1ad4e8f7a20d7c123d391431a Mon Sep 17 00:00:00 2001 From: Tudor Dobrila Date: Thu, 11 Jun 2020 16:28:55 -0700 Subject: [PATCH 14/15] Typo --- .../threat-protection/microsoft-defender-atp/mac-whatsnew.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md b/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md index 40f7391213..dba3915c9f 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md +++ b/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md @@ -31,7 +31,7 @@ ms.topic: conceptual - Improved [product onboarding experience for Intune users](https://docs.microsoft.com/en-us/mem/intune/apps/apps-advanced-threat-protection-macos) - Antivirus [exclusions now support wildcards](mac-exclusions.md#supported-exclusion-types) - Added the ability to trigger antivirus scans from the macOS contextual menu. You can now right-click a file or a folder in Finder and select **Scan with Microsoft Defender ATP** -- In-place product downgrades are now explictily disallowed by the installer. If you need to downgrade, first uninstall the existing version and reconfigure your device +- In-place product downgrades are now explicitly disallowed by the installer. If you need to downgrade, first uninstall the existing version and reconfigure your device - Other performance improvements & bug fixes ## 100.90.27 From aebf0bc809eafe738528da97fb3e8165ee39932b Mon Sep 17 00:00:00 2001 From: Tudor Dobrila Date: Thu, 11 Jun 2020 16:38:33 -0700 Subject: [PATCH 15/15] Remove locale from URL to Intune --- .../threat-protection/microsoft-defender-atp/mac-whatsnew.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md b/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md index dba3915c9f..b1deb73638 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md +++ b/windows/security/threat-protection/microsoft-defender-atp/mac-whatsnew.md @@ -28,7 +28,7 @@ ms.topic: conceptual ## 101.00.31 -- Improved [product onboarding experience for Intune users](https://docs.microsoft.com/en-us/mem/intune/apps/apps-advanced-threat-protection-macos) +- Improved [product onboarding experience for Intune users](https://docs.microsoft.com/mem/intune/apps/apps-advanced-threat-protection-macos) - Antivirus [exclusions now support wildcards](mac-exclusions.md#supported-exclusion-types) - Added the ability to trigger antivirus scans from the macOS contextual menu. You can now right-click a file or a folder in Finder and select **Scan with Microsoft Defender ATP** - In-place product downgrades are now explicitly disallowed by the installer. If you need to downgrade, first uninstall the existing version and reconfigure your device