Skip to content

Commit 3be486d

Browse files
denisebmsftdenisebmsft
authored
Merge branch 'main' into docs-editor/edr-in-block-mode-1738975244
2 parents 2e3d575 + 41e0e7e commit 3be486d

File tree

14 files changed

+69
-28
lines changed

14 files changed

+69
-28
lines changed

‎ATADocs/docfx.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@
4848
"uhfHeaderId": "MSDocsHeader-M365-IT",
4949
"searchScope": ["ATA"],
5050
"contributors_to_exclude": [
51-
"beccarobins"
51+
"beccarobins",
52+
"rjagiewich",
53+
"claydetels19",
54+
"garycentric",
55+
"padmagit77",
56+
"aditisrivastava07",
57+
"Ruchika-mittal01"
5258
]
5359
},
5460
"markdownEngineName": "markdig"

‎CloudAppSecurityDocs/dcs-inspection.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ Microsoft Defender for Cloud Apps enables you to natively use the Microsoft Data
1313
>[!NOTE]
1414
> This feature is currently available in the US, Europe, Australia, India, Canada, Japan, and APAC.
1515
16+
>[!NOTE]
17+
> To enable the Data Classification Service option in File Policies, the "Microsoft 365" App Connector is required.
18+
1619
## Enable content inspection with Data Classification Services
1720

1821
You can set the **Inspection method** to use the **Microsoft Data Classification Service** with no additional configuration required. This option is useful when creating a data leak prevention policy for your files in Microsoft Defender for Cloud Apps.

‎CloudAppSecurityDocs/docfx.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,13 @@
4444
"ms.service": "defender-for-cloud-apps",
4545
"ms.suite": "ems",
4646
"contributors_to_exclude": [
47-
"beccarobins"
47+
"beccarobins",
48+
"rjagiewich",
49+
"claydetels19",
50+
"garycentric",
51+
"padmagit77",
52+
"aditisrivastava07",
53+
"Ruchika-mittal01"
4854
]
4955
},
5056
"fileMetadata": {},

‎CloudAppSecurityDocs/includes/entra-conditional-access-policy.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ For more information, see [Conditional Access policies](/azure/active-directory/
3434

3535
> [!NOTE]
3636
> Microsoft Defender for Cloud Apps utilizes the application **Microsoft Defender for Cloud Apps - Session Controls** as part of the Conditional Access App Control service for user sign-in. This application is located within the 'Enterprise Applications' section of Entra ID.
37-
To protect your SaaS applications with Session Controls, you must allow access to this application.
38-
If you block access to this application through an Entra ID Conditional Access policy, end users won't be able to access the protected applications under session controls. <br>
39-
>
37+
To protect your SaaS applications with Session Controls, you must allow access to this application.
38+
>
39+
>If you have any Conditional Access policies that have **“Block Access”** selected in the **“Grant Access”** Control under a Microsoft Entra ID Conditional Access policy scoped to this app, end users will not be able to access the protected applications under session controls. <br><br>
4040
>It's important to ensure that this application isn't unintentionally restricted by any Conditional Access policies. For policies that restrict all or certain applications, please ensure this application is listed as an exception in the **Target resources** or confirm that the blocking policy is deliberate.<br>
4141
>
4242
>To ensure your location-based conditional access policies function correctly, include the **Microsoft Defender for Cloud Apps – Session Controls** application in those policies.

‎defender-business/docfx.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,19 @@
5151
"searchScope": ["Microsoft Defender Business"],
5252
"contributors_to_exclude": [
5353
"dstrome",
54-
"shdyas",
54+
"shydas",
5555
"rjagiewich",
56-
"American-Dipper",
56+
"American-Dipper",
5757
"claydetels19",
5858
"jborsecnik",
59-
"v-stchambers",
59+
"v-stchambers",
6060
"Stacyrch140",
6161
"garycentric",
6262
"alekyaj",
63-
"beccarobins"
63+
"beccarobins",
64+
"padmagit77",
65+
"aditisrivastava07",
66+
"Ruchika-mittal01"
6467
]
6568
},
6669
"fileMetadata": {},

‎defender-endpoint/docfx.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,17 @@
5353
"dstrome",
5454
"shdyas",
5555
"rjagiewich",
56-
"American-Dipper",
5756
"claydetels19",
57+
"American-Dipper",
5858
"jborsecnik",
5959
"v-stchambers",
60-
"Stacyrch140",
60+
"Stacyrch140",
6161
"garycentric",
6262
"alekyaj",
63-
"beccarobins"
63+
"beccarobins",
64+
"padmagit77",
65+
"aditisrivastava07",
66+
"Ruchika-mittal01"
6467
]
6568
},
6669
"fileMetadata": {},

‎defender-endpoint/linux-support-offline-security-intelligence-update.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.collection:
1515
- mde-linux
1616
ms.topic: conceptual
1717
search.appverid: met150
18-
ms.date: 01/30/2025
18+
ms.date: 02/07/2025
1919
---
2020

2121
# Configure offline security intelligence update for Microsoft Defender for Endpoint on Linux
@@ -237,7 +237,7 @@ offline_definition_update_fallback_to_cloud : false[managed]
237237

238238
### Automatic update
239239

240-
- If the fields `automaticDefinitionUpdateEnabled` and `offline_definition_update` in the managed json are set to `true`, then the "offline security intelligence updates" are triggered automatically at periodic intervals.
240+
- If the [enforcement level for the antivirus engine](/defender-endpoint/linux-preferences#enforcement-level-for-antivirus-engine) is set to `real_time`, and the fields `automaticDefinitionUpdateEnabled` and `offline_definition_update` in the managed json are set to `true`, then the offline security intelligence updates are triggered automatically at periodic intervals.
241241
- By default, this periodic interval is **8 hours**. But it can be configured by setting the `definitionUpdatesInterval` parameter in the managed json.
242242

243243
### Manual update

‎defender-for-cloud/docfx.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,20 @@
5353
],
5454
"contributors_to_exclude": [
5555
"dstrome",
56-
"shdyas",
56+
"shdyas",
5757
"rjagiewich",
5858
"American-Dipper",
59+
"jborsecnic",
5960
"claydetels19",
6061
"jborsecnik",
6162
"v-stchambers",
62-
"Stacyrch140",
63+
"Stacyrch140",
6364
"garycentric",
6465
"alekyaj",
65-
"beccarobins"
66+
"beccarobins",
67+
"padmagit77",
68+
"aditisrivastava07",
69+
"Ruchika-mittal01"
6670
]
6771
},
6872
"fileMetadata": {},

‎defender-for-iot/docfx.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@
6262
"Stacyrch140",
6363
"garycentric",
6464
"alekyaj",
65-
"beccarobins"
65+
"beccarobins",
66+
"aditisrivastava07",
67+
"padmagit77",
68+
"Ruchika-mittal01"
6669
]
6770
},
6871
"fileMetadata": {},

‎defender-vulnerability-management/docfx.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,13 @@
5757
"claydetels19",
5858
"jborsecnik",
5959
"v-stchambers",
60-
"Stacyrch140",
60+
"Stacyrch140",
6161
"garycentric",
6262
"alekyaj",
63-
"beccarobins"
63+
"beccarobins",
64+
"padmagit77",
65+
"aditisrivastava07",
66+
"Ruchika-mittal01"
6467
]
6568
},
6669
"fileMetadata": {},

0 commit comments

Comments
 (0)