Skip to content

Commit 342e2e3

Browse files
authored
Merge branch 'main' into diannegali-mdetocupdate
2 parents 31199b6 + 4519e7e commit 342e2e3

File tree

147 files changed

+1338
-888
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+1338
-888
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For more information about the exception criteria and exception process, see [Mi
3939
4040
Select the total score link to review all feedback on clarity, consistency, tone, brand, terms, spelling, grammar, readability, and inclusive language. _You should fix all spelling errors regardless of your total score_. Fixing spelling errors helps maintain customer trust in overall content quality.
4141
42-
| Article | Total score<br>(Required: 80) | Words + phrases<br>(Brand, terms) | Correctness<br>(Spelling, grammar) | Clarity<br>(Readability) |
42+
| Article | Total score<br>(Required: 80) | Terminology | Spelling and Grammar| Clarity<br>(Readability) |
4343
|---------|:--------------:|:--------------------:|:------:|:---------:|
4444
"
4545

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: PR has no warnings or errors
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
7+
on:
8+
issue_comment:
9+
types: [created]
10+
11+
jobs:
12+
13+
build-status:
14+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-BuildValidation.yml@workflows-prod
15+
with:
16+
PayloadJson: ${{ toJSON(github) }}
17+
secrets:
18+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
19+
20+
21+

ATADocs/index.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
description: Protect your enterprise using information from multiple network data-sources to learn the behavior of users and entities in your organization.
99
services: service
1010
ms.service: advanced-threat-analytics
11-
ms.subservice: ms.subservice
1211
ms.topic: landing-page
1312
ms.collection: M365-security-compliance
1413
author: batamig

ATPDocs/index.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ metadata:
66
title: Microsoft Defender for Identity documentation
77
description: Microsoft Defender for Identity cloud service helps protect your enterprise hybrid environments from multiple types of advanced targeted cyber attacks and insider threats.
88
services: service
9-
ms.service: azure-advanced-threat-protection
10-
ms.subservice: subservice
9+
ms.service: microsoft-defender-for-identity
1110
ms.topic: landing-page
1211
ms.collection: M365-security-compliance
1312
author: batamig

ATPDocs/privacy-compliance.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ For more information see: [Microsoft Defender for Identity monitored activities]
2222

2323
Defender for Identity operates in the Microsoft Azure data centers in the following locations:
2424

25-
- European Union
26-
- United Kingdom
27-
- United States
28-
- Australia
29-
- Switzerland
30-
- Singapore
31-
32-
- India
25+
- European Union (West Europe, North Europe)
26+
- United Kingdom (UK South)
27+
- United States (East US, West US, West US2)
28+
- Australia (Australia East)
29+
- Switzerland (Switzerland North)
30+
- Singapore (Southeast Asia)
31+
- India (Central India, South India)
3332

3433
Customer data collected by the service might be stored as follows:
3534

CloudAppSecurityDocs/discovery-docker-ubuntu-azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ If you require more than 10 data sources, we recommend that you split the data s
4646
To work with a network appliance that isn't listed, select **Other > Customer log format** or **Other (manual only)**. For more information, see [Working with the custom log parser](custom-log-parser.md).
4747

4848
>[!NOTE]
49-
>Integrating with secure transfer protocols (FTPS and Syslog – TLS) often requires additional settings or your firewall/proxy.
49+
>Integrating with secure transfer protocols (FTPS and Syslog – TLS) often requires additional settings on your firewall/proxy. For more information, see [Advanced log collector management](log-collector-advanced-management.md).
5050
5151
Repeat this process for each firewall and proxy whose logs can be used to detect traffic on your network.
5252

CloudAppSecurityDocs/get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Now the risk scores given to discovered apps are configured precisely according
160160
Some features work best when they're customized to your needs.
161161
Provide a better experience for your users with your own email templates. Decide what notifications you receive and customize your risk score metric to fit your organization's preferences.
162162

163-
## Step 7: Organize the data according to your needs
163+
## Step 6: Organize the data according to your needs
164164

165165
**How to page**: [Working with IP ranges and tags](ip-tags.md)
166166

CloudAppSecurityDocs/in-browser-protection.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: In-browser protection with Microsoft Edge for Business | Microsoft Defender for Cloud Apps
33
description: Learn about using in-browser protection with Microsoft Defender for Cloud Apps session policies and Microsoft Edge for Business.
4-
ms.date: 10/31/2024
4+
ms.date: 01/26/2025
55
ms.topic: conceptual
66
#customerIntent: As a Defender for Cloud Apps admin, I want to learn about the user experience with in-browser protection.
77
---
@@ -105,6 +105,8 @@ Administrators who understand the power of Microsoft Edge browser protection can
105105

106106
4. When you're finished on the **Edge for Business protection** page, select **Save**.
107107

108+
:::image type="content" source="media/in-browser-protection/edge-for-business-protection-settings.png" alt-text="Screenshot of Microsoft Edge for business protection settings." lightbox="media/in-browser-protection/edge-for-business-protection-settings.png":::
109+
108110
## Related content
109111

110112
For more information, see [Microsoft Defender for Cloud Apps Conditional Access app control](proxy-intro-aad.md).

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@ Microsoft Entra ID supports both browser-based and non browser-based policies. W
3030

3131
Repeat this procedure to create a nonbrowser based Conditional Access policy. In the **Client apps** area, toggle the **Configure** option to **Yes**. Then, under **Modern authentication clients**, clear the **Browser** option. Leave all other default selections selected.
3232

33-
Note: The Enterprise application “Microsoft Defender for Cloud Apps – Session Controls” is used internally by the Conditional Access App Control service.
34-
Please ensure the CA policy does not restrict access to this application in the **Target resources**.
35-
3633
For more information, see [Conditional Access policies](/azure/active-directory/conditional-access/overview) and [Building a Conditional Access policy](/entra/identity/conditional-access/concept-conditional-access-policies).
34+
35+
> [!NOTE]
36+
> 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+
>
40+
>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>
41+
>
42+
>To ensure your location-based conditional access policies function correctly, include the **Microsoft Defender for Cloud Apps – Session Controls** application in those policies.

CloudAppSecurityDocs/index.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
description: Microsoft Defender for Cloud Apps delivers full protection for SaaS applications, helping you monitor and protect your cloud app data, using fundamental cloud access security broker (CASB) functionality, SaaS Security Posture Management (SSPM) features, advanced threat protection, and app-to-app protection.
99
services: na
1010
ms.service: defender-for-cloud-apps
11-
ms.subservice: na
1211
ms.topic: landing-page
1312
ms.collection: na
1413
author: batamig
@@ -49,6 +48,8 @@ landingContent:
4948
links:
5049
- text: Basic setup
5150
url: general-setup.md
51+
- text: Connect cloud apps
52+
url: enable-instant-visibility-protection-and-governance-actions-for-your-apps.md
5253
- text: View and manage security posture
5354
url: security-saas.md
5455
- linkListType: concept
@@ -71,8 +72,6 @@ landingContent:
7172
links:
7273
- text: Calculate risk scores
7374
url: risk-score.md
74-
- text: Connect cloud apps
75-
url: enable-instant-visibility-protection-and-governance-actions-for-your-apps.md
7675
- text: Collect logs
7776
url: discovery-docker.md
7877
- text: Discover and manage shadow IT
@@ -138,4 +137,4 @@ landingContent:
138137
- text: Monitor and respond to unusual data usage
139138
url: app-governance-monitor-apps-unusual-data-usage.md
140139
- text: Secure apps with app hygiene
141-
url: app-governance-secure-apps-app-hygiene-features.md
140+
url: app-governance-secure-apps-app-hygiene-features.md

0 commit comments

Comments
 (0)