Skip to content

Commit 772e4d5

Browse files
authored
Merge branch 'main' into docs-editor/linux-install-manually-1742800914
2 parents f0d0b57 + d19bfca commit 772e4d5

File tree

1,508 files changed

+27744
-17761
lines changed

Some content is hidden

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

1,508 files changed

+27744
-17761
lines changed

.acrolinx-config.edn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you need a scoring exception for content in this PR, add the *Sign off* and t
3535
- Escalate the exception request to the Acrolinx Review Team for review.
3636
- Approve the exception and work with the GitHub Admin Team to merge the PR to the default branch.
3737
38-
For more information about the exception criteria and exception process, see [Minimum Acrolinx topic scores for publishing](https://review.docs.microsoft.com/en-us/office-authoring-guide/acrolinx-min-score?branch=main).
38+
For more information about the exception criteria and exception process, see [Minimum Acrolinx topic scores for publishing](https://review.learn.microsoft.com/en-us/office-authoring-guide/acrolinx-min-score?branch=main).
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
@@ -51,10 +51,10 @@ Select the total score link to review all feedback on clarity, consistency, tone
5151
"
5252
**More information about Acrolinx**
5353
54-
- [Install Acrolinx locally for VSCode for Magic](https://review.docs.microsoft.com/office-authoring-guide/acrolinx-vscode?branch=main)
54+
- [Install Acrolinx locally for VSCode for Magic](https://review.learn.microsoft.com/office-authoring-guide/acrolinx-vscode?branch=main)
5555
- [False positives or issues](https://aka.ms/acrolinxbug)
5656
- [Request a new Acrolinx term](https://microsoft.sharepoint.com/teams/M365Dev2/SitePages/M365-terminology.aspx)
57-
- [Troubleshooting issues with Acrolinx](https://review.docs.microsoft.com/help/contribute/acrolinx-error-messages)
57+
- [Troubleshooting issues with Acrolinx](https://review.learn.microsoft.com/help/platform/acrolinx-troubleshoot?branch=main)
5858
5959
"
6060
}

.github/workflows/AutoPublish.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@ name: (Scheduled) Publish to live
33
permissions:
44
contents: write
55
pull-requests: write
6+
checks: read
67

78
on:
89
schedule:
9-
- cron: "25 5,11,17,22 * * *" # Times are UTC based on Daylight Saving Time. Need to be adjusted for Standard Time. Scheduling at :25 to account for queuing lag.
10+
- cron: "25 2,5,8,11,14,17,20,22 * * *" # Times are UTC based on Daylight Saving Time. Need to be adjusted for Standard Time. Scheduling at :25 to account for queuing lag.
1011

1112
workflow_dispatch:
1213

1314
jobs:
1415

1516
auto-publish:
1617
if: github.repository_owner == 'MicrosoftDocs' && contains(github.event.repository.topics, 'build')
17-
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublish.yml@workflows-prod
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublishV2.yml@workflows-prod
1819
with:
1920
PayloadJson: ${{ toJSON(github) }}
2021
EnableAutoPublish: true
22+
EnableAutoMerge: true
2123

2224
secrets:
2325
AccessToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/StaleBranch.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: (Scheduled) Stale branch removal
22

33
permissions:
44
contents: write
5+
pull-requests: read
56

67
# This workflow is designed to be run in the days up to, and including, a "deletion day", specified by 'DeleteOnDayOfMonth' in env: in https://github.com/MicrosoftDocs/microsoft-365-docs/blob/workflows-prod/.github/workflows/Shared-StaleBranch.yml.
78
# On the days leading up to "deletion day", the workflow will report the branches to be deleted. This lets users see which branches will be deleted. On "deletion day", those branches are deleted.

.github/workflows/TierManagement.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ name: Tier management
22

33
permissions:
44
pull-requests: write
5-
contents: read
5+
contents: write
66

77
on:
88
issue_comment:
99
types: [created, edited]
1010

11+
pull_request_target:
12+
types: [opened, reopened]
13+
1114
jobs:
1215

1316
tier-mgmt:

.openpublishing.publish.config.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"build_output_subfolder": "ATA-Docs",
77
"locale": "en-us",
88
"monikers": [],
9-
"open_to_public_contributors": true,
9+
"open_to_public_contributors": false,
1010
"type_mapping": {
1111
"Conceptual": "Content"
1212
},
@@ -191,6 +191,8 @@
191191
".openpublishing.redirection.defender-cloud-apps.json",
192192
".openpublishing.redirection.defender-endpoint.json",
193193
".openpublishing.redirection.defender-office-365.json",
194-
".openpublishing.redirection.defender-xdr.json"
194+
".openpublishing.redirection.defender-xdr.json",
195+
".openpublishing.redirection.unified-secops.json"
196+
195197
]
196198
}

.openpublishing.redirection.ata-atp.json

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,21 @@
1515
"redirect_url": "deploy/active-directory-federation-services",
1616
"redirect_document_id": false
1717
},
18+
{
19+
"source_path": "ATPDocs/deploy/quick-installation-guide.md",
20+
"redirect_url": "deploy/deploy-defender-identity",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "ATPDocs/deploy/prerequisites.md",
25+
"redirect_url": "deploy/prerequisites-sensor-version-2",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "ATPDocs/deploy/activate-capabilities.md",
30+
"redirect_url": "deploy/activate-sensor",
31+
"redirect_document_id": false
32+
},
1833
{
1934
"source_path": "ATPDocs/configure-event-collection.md",
2035
"redirect_url": "deploy/configure-event-collection",
@@ -125,6 +140,31 @@
125140
"redirect_url": "manage-security-alerts",
126141
"redirect_document_id": false
127142
},
143+
{
144+
"source_path": "ATPDocs/credential-access-alerts.md",
145+
"redirect_url": "alerts-overview",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path": "ATPDocs/persistence-privilege-escalation-alerts.md",
150+
"redirect_url": "alerts-overview",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path": "ATPDocs/reconnaissance-discovery-alerts.md",
155+
"redirect_url": "alerts-overview",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path": "ATPDocs/lateral-movement-alerts.md",
160+
"redirect_url": "alerts-overview",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path": "ATPDocs/other-alerts.md",
165+
"redirect_url": "alerts-overview",
166+
"redirect_document_id": false
167+
},
128168
{
129169
"source_path": "ATPDocs/classic-activities-filtering-mcas.md",
130170
"redirect_url": "/previous-versions/defender-for-identity/classic-activities-filtering-mcas",
@@ -1039,6 +1079,11 @@
10391079
"source_path": "ATPDocs/security-assessment-legacy-protocols.md",
10401080
"redirect_url": "/defender-for-identity/security-assessment",
10411081
"redirect_document_id": false
1042-
}
1082+
},
1083+
{
1084+
"source_path": "ATPDocs/manage-security-alerts.md",
1085+
"redirect_url": "/defender-for-identity/understanding-security-alerts",
1086+
"redirect_document_id": false
1087+
},
10431088
]
10441089
}

.openpublishing.redirection.defender-cloud-apps.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,11 @@
10091009
"source_path": "CloudAppSecurityDocs/troubleshooting-api-connectors-using-error-messages.md",
10101010
"redirect_url": "/defender-cloud-apps/troubleshooting-api-connectors-errors",
10111011
"redirect_document_id": true
1012-
}
1012+
},
1013+
{
1014+
"source_path": "CloudAppSecurityDocs/connector-platform.md",
1015+
"redirect_url": "/defender-cloud-apps/enable-instant-visibility-protection-and-governance-actions-for-your-apps",
1016+
"redirect_document_id": true
1017+
},
10131018
]
10141019
}

.openpublishing.redirection.defender-office-365.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
"source_path": "defender-office-365/step-by-step-guides/deploy-and-configure-the-report-message-add-in.md",
6060
"redirect_url": "/defender-office-365/submissions-outlook-report-messages",
6161
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "defender-office-365/tenant-wide-setup-for-increased-security.md",
65+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-overview",
66+
"redirect_document_id": false
6267
}
6368
]
6469
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path": "unified-secops-platform/mto-tenantgroups.md",
5+
"redirect_url": "mto-distribution-profiles",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

ATADocs/ATA-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: Explains the different support options for Microsoft Advanced Threa
77

88

99
ms.date: 01/10/2023
10-
ms.topic: conceptual
10+
ms.topic: article
1111
ms.service: advanced-threat-analytics
1212

1313
# optional metadata

0 commit comments

Comments
 (0)