Skip to content

Commit 9e922b4

Browse files
Merge branch 'main' into patch-1
2 parents e66af46 + e20176d commit 9e922b4

File tree

1,526 files changed

+39271
-46112
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,526 files changed

+39271
-46112
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Assign and label PR
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
name: Download and extract payload artifact
17+
if: github.repository_owner == 'MicrosoftDocs'
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
19+
with:
20+
WorkflowId: ${{ github.event.workflow_run.id }}
21+
OrgRepo: ${{ github.repository }}
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
25+
label-assign:
26+
name: Run assign and label
27+
if: github.repository_owner == 'MicrosoftDocs'
28+
needs: [download-payload]
29+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
30+
with:
31+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
32+
AutoAssignUsers: 1
33+
AutoAssignReviewers: 1
34+
AutoLabel: 1
35+
ExcludedUserList: '["user1", "user2"]'
36+
ExcludedBranchList: '["branch1", "branch2"]'
37+
secrets:
38+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
39+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
40+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

.github/workflows/AutoPublish.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ permissions:
77

88
on:
99
schedule:
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.
10+
# - cron: "25 2,5,8,11,14,17,20,22 * * *" # Times are UTC based on Daylight Saving Time (~Mar-Nov). Scheduling at :25 to account for queuing lag.
11+
- cron: "25 3,6,9,12,15,18,21,23 * * *" # Times are UTC based on Standard Time (~Nov-Mar). Scheduling at :25 to account for queuing lag.
1112

1213
workflow_dispatch:
1314

.github/workflows/BackgroundTasks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ permissions:
66

77
on:
88
pull_request_target:
9+
types: [opened, synchronize, reopened, ready_for_review]
910

1011
jobs:
1112
upload:

.openpublishing.redirection.intune.json

Lines changed: 58 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,50 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "intune/intune-service/protect/vulnerability-remediation-agent.md",
5+
"redirect_url": "/intune/agents/vulnerability-remediation-agent",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "intune/intune-service/copilot/security-copilot-agents-intune.md",
10+
"redirect_url": "/intune/agents/",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "intune/intune-service/protect/create-conditional-access-intune.md",
15+
"redirect_url": "/entra/identity/conditional-access/policy-all-users-device-compliance",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "intune/analytics/enroll-configmgr.md",
20+
"redirect_url": "/intune/intune-service/analytics/set-up?pivots=cm#enroll-devices",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "intune/analytics/enroll-intune.md",
25+
"redirect_url": "/intune/intune-service/analytics/set-up?pivots=intune#enroll-devices",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "intune/analytics/settings.md",
30+
"redirect_url": "/intune/intune-service/analytics/set-up",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "intune/intune-service/remote-actions/bulk-device-actions.md",
35+
"redirect_url": "/intune/intune-service/remote-actions",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "intune/analytics/overview.md",
40+
"redirect_url": "/intune/analytics",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "intune/intune-service/protect/windows-information-protection-configure.md",
45+
"redirect_url": "/previous-versions/windows/it-pro/windows-10/security/information-protection/windows-information-protection/protect-enterprise-data-using-wip",
46+
"redirect_document_id": false
47+
},
348
{
449
"source_path": "intune/intune-service/developer/mam-tunnel-ios-xamarin-bindings.md",
550
"redirect_url": "/intune/intune-service/developer/app-sdk-get-started",
@@ -12,7 +57,7 @@
1257
},
1358
{
1459
"source_path": "intune/intune/copilot/security-copilot-surface-portal.md",
15-
"redirect_url": "/intune/intune-service/copilot/security-copilot-surface-portal",
60+
"redirect_url": "/surface/security-copilot-surface-management-portal",
1661
"redirect_document_id": false
1762
},
1863
{
@@ -87,7 +132,7 @@
87132
},
88133
{
89134
"source_path": "intune/intune/apps/app-protection-policies-configure-windows-10.md",
90-
"redirect_url": "/intune/intune-service/apps/app-protection-policies-configure-windows-10",
135+
"redirect_url": "/previous-versions/windows/it-pro/windows-10/security/information-protection/windows-information-protection/create-wip-policy-using-intune-azure",
91136
"redirect_document_id": false
92137
},
93138
{
@@ -497,7 +542,7 @@
497542
},
498543
{
499544
"source_path": "intune/intune/apps/windows-information-protection-policy-create.md",
500-
"redirect_url": "/intune/intune-service/apps/windows-information-protection-policy-create",
545+
"redirect_url": "/previous-versions/windows/it-pro/windows-10/security/information-protection/windows-information-protection/create-wip-policy-using-intune-azure",
501546
"redirect_document_id": false
502547
},
503548
{
@@ -512,12 +557,12 @@
512557
},
513558
{
514559
"source_path": "intune/intune/configuration/administrative-templates-restrict-usb.md",
515-
"redirect_url": "/intune/intune-service/configuration/administrative-templates-restrict-usb",
560+
"redirect_url": "/intune/intune-service/configuration/settings-catalog-restrict-usb",
516561
"redirect_document_id": false
517562
},
518563
{
519564
"source_path": "intune/intune/configuration/administrative-templates-update-office.md",
520-
"redirect_url": "/intune/intune-service/configuration/administrative-templates-update-office",
565+
"redirect_url": "/intune/intune-service/configuration/settings-catalog-update-office",
521566
"redirect_document_id": false
522567
},
523568
{
@@ -1837,7 +1882,7 @@
18371882
},
18381883
{
18391884
"source_path": "intune/intune/fundamentals/intune-legacy-pc-client.md",
1840-
"redirect_url": "/intune/intune-service/fundamentals/intune-legacy-pc-client",
1885+
"redirect_url": "/intune/intune-service/fundamentals/tutorial-walkthrough-endpoint-manager",
18411886
"redirect_document_id": false
18421887
},
18431888
{
@@ -2837,7 +2882,7 @@
28372882
},
28382883
{
28392884
"source_path": "intune/intune/protect/managed-software-updates-ios-macos.md",
2840-
"redirect_url": "/intune/intune-service/protect/managed-software-updates-ios-macos",
2885+
"redirect_url": "/intune/intune-service/protect/updates/apple",
28412886
"redirect_document_id": false
28422887
},
28432888
{
@@ -3127,12 +3172,12 @@
31273172
},
31283173
{
31293174
"source_path": "intune/intune/protect/software-updates-guide-ios-ipados.md",
3130-
"redirect_url": "/intune/intune-service/protect/software-updates-guide-ios-ipados",
3175+
"redirect_url": "/intune/intune-service/protect/updates/software-updates-guide-ios-ipados",
31313176
"redirect_document_id": false
31323177
},
31333178
{
31343179
"source_path": "intune/intune/protect/software-updates-guide-macos.md",
3135-
"redirect_url": "/intune/intune-service/protect/software-updates-guide-macos",
3180+
"redirect_url": "/intune/intune-service/protect/updates/software-updates-guide-macos",
31363181
"redirect_document_id": false
31373182
},
31383183
{
@@ -3142,12 +3187,12 @@
31423187
},
31433188
{
31443189
"source_path": "intune/intune/protect/software-updates-ios.md",
3145-
"redirect_url": "/intune/intune-service/protect/software-updates-ios",
3190+
"redirect_url": "/intune/intune-service/protect/updates/software-updates-ios",
31463191
"redirect_document_id": false
31473192
},
31483193
{
31493194
"source_path": "intune/intune/protect/software-updates-macos.md",
3150-
"redirect_url": "/intune/intune-service/protect/software-updates-macos",
3195+
"redirect_url": "/intune/intune-service/protect/updates/software-updates-macos",
31513196
"redirect_document_id": false
31523197
},
31533198
{
@@ -3227,7 +3272,7 @@
32273272
},
32283273
{
32293274
"source_path": "intune/intune/protect/windows-information-protection-configure.md",
3230-
"redirect_url": "/intune/intune-service/protect/windows-information-protection-configure",
3275+
"redirect_url": "/previous-versions/windows/it-pro/windows-10/security/information-protection/windows-information-protection/protect-enterprise-data-using-wip",
32313276
"redirect_document_id": false
32323277
},
32333278
{
@@ -3417,7 +3462,7 @@
34173462
},
34183463
{
34193464
"source_path": "intune/intune/remote-actions/teamviewer-support.md",
3420-
"redirect_url": "/intune/intune-service/remote-actions/teamviewer-support",
3465+
"redirect_url": "/intune/intune-service/fundamentals/teamviewer-support",
34213466
"redirect_document_id": false
34223467
},
34233468
{

0 commit comments

Comments
 (0)