Skip to content

Commit 0ec7a41

Browse files
authored
Merge branch 'main' into patch-30
2 parents 29259d0 + 36c666a commit 0ec7a41

File tree

746 files changed

+2493
-1846
lines changed

Some content is hidden

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

746 files changed

+2493
-1846
lines changed

.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 }}

.openpublishing.redirection.ata-atp.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1039,6 +1039,11 @@
10391039
"source_path": "ATPDocs/security-assessment-legacy-protocols.md",
10401040
"redirect_url": "/defender-for-identity/security-assessment",
10411041
"redirect_document_id": false
1042-
}
1042+
},
1043+
{
1044+
"source_path": "ATPDocs/manage-security-alerts.md",
1045+
"redirect_url": "/defender-for-identity/understanding-security-alerts",
1046+
"redirect_document_id": false
1047+
},
10431048
]
10441049
}

ATADocs/ATA-versions.md

Lines changed: 1 addition & 1 deletion

ATADocs/ata-architecture.md

Lines changed: 1 addition & 1 deletion

ATADocs/ata-database-management.md

Lines changed: 1 addition & 1 deletion

ATADocs/ata-health-center.md

Lines changed: 1 addition & 1 deletion

ATADocs/ata-privacy-compliance.md

Lines changed: 1 addition & 1 deletion

ATADocs/ata-resources.md

Lines changed: 1 addition & 1 deletion

ATADocs/ata-role-groups.md

Lines changed: 1 addition & 1 deletion

ATADocs/ata-update-1.5-migration-guide.md

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)