Skip to content

Commit 3e5432e

Browse files
kole-strkole-str
authored
Merge branch 'public' into patch-1
2 parents 4723bbe + 0b218dc commit 3e5432e

File tree

1,175 files changed

+25848
-28507
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,175 files changed

+25848
-28507
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

‎.github/workflows/AutoLabelMsftContributor.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ jobs:
3131
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
3232
secrets:
3333
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34-
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}
34+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
35+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}

‎.github/workflows/BuildValidation.yml‎

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+

‎.github/workflows/M365Endpoints.yml‎

Lines changed: 202 additions & 67 deletions
Large diffs are not rendered by default.

‎.github/workflows/StaleBranch.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: (Scheduled) Stale branch removal
2+
3+
permissions:
4+
contents: write
5+
6+
on:
7+
schedule:
8+
- cron: "0 */12 * * *"
9+
10+
workflow_dispatch:
11+
12+
13+
jobs:
14+
15+
stale-branch:
16+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-StaleBranch.yml@workflows-prod
17+
with:
18+
PayloadJson: ${{ toJSON(github) }}
19+
RepoBranchSkipList: '[
20+
"ExampleBranch1",
21+
"ExampleBranch2"
22+
]'
23+
ReportOnly: true
24+
secrets:
25+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.openpublishing.publish.config.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,21 +113,22 @@
113113
".openpublishing.redirection.commerce.json",
114114
".openpublishing.redirection.compliance.json",
115115
".openpublishing.redirection.contentunderstanding.json",
116+
".openpublishing.redirection.copilot.json",
117+
".openpublishing.redirection.defender.json",
116118
".openpublishing.redirection.enterprise.json",
117119
".openpublishing.redirection.frontline.json",
118120
".openpublishing.redirection.knowledge.json",
119121
".openpublishing.redirection.learning.json",
120122
".openpublishing.redirection.lighthouse.json",
121123
".openpublishing.redirection.loop.json",
124+
".openpublishing.redirection.lti.json",
122125
".openpublishing.redirection.managed-desktop.json",
126+
".openpublishing.redirection.scheduler.json",
123127
".openpublishing.redirection.security.json",
124128
".openpublishing.redirection.solutions.json",
125129
".openpublishing.redirection.syntex.json",
126-
".openpublishing.redirection.topics.json",
127-
".openpublishing.redirection.lti.json",
128-
".openpublishing.redirection.viva.json",
129130
".openpublishing.redirection.test-base.json",
130-
".openpublishing.redirection.scheduler.json",
131-
".openpublishing.redirection.defender.json"
131+
".openpublishing.redirection.topics.json",
132+
".openpublishing.redirection.viva.json"
132133
]
133134
}

‎.openpublishing.redirection.admin.json‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1315,6 +1315,11 @@
13151315
"redirect_url": "/microsoft-365/admin/support-contact-info",
13161316
"redirect_document_id": false
13171317
},
1318+
{
1319+
"source_path": "microsoft-365/admin/support-contact-info.md",
1320+
"redirect_url": "https://support.microsoft.com/topic/customer-service-phone-numbers-c0389ade-5640-e588-8b0e-28de8afeb3f2#ID0EBBD=signinorgid",
1321+
"redirect_document_id": false
1322+
},
13181323
{
13191324
"source_path": "microsoft-365/admin/misc/sign-up-for-online-services.md",
13201325
"redirect_url": "/microsoft-365/admin/misc/remove-a-domain-from-another-account",
@@ -2194,6 +2199,26 @@
21942199
"source_path": "microsoft-365/admin/activity-reports/agent-usage.md",
21952200
"redirect_url": "/microsoft-365/admin/activity-reports/microsoft-365-copilot-agents",
21962201
"redirect_document_id": true
2197-
}
2202+
},
2203+
{
2204+
"source_path": "microsoft-365/admin/misc/places-ios-mobile.md",
2205+
"redirect_url": "/microsoft-365/admin/",
2206+
"redirect_document_id": false
2207+
},
2208+
{
2209+
"source_path": "microsoft-365/admin/misc/admin-controls-profile-videos.md",
2210+
"redirect_url": "/microsoft-365/admin/add-users/change-user-profile-photos.md",
2211+
"redirect_document_id": false
2212+
},
2213+
{
2214+
"source_path": "microsoft-365/admin/manage/change-contact-preferences.md",
2215+
"redirect_url": "/microsoft-365/admin/manage/change-address-contact-and-more",
2216+
"redirect_document_id": false
2217+
},
2218+
{
2219+
"source_path": "microsoft-365/admin/manage/use-qr-code-download-outlook.md",
2220+
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=2309759",
2221+
"redirect_document_id": false
2222+
}
21982223
]
21992224
}

‎.openpublishing.redirection.commerce.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,16 @@
959959
"source_path": "microsoft-365/commerce/licenses/product-keys-faq.yml",
960960
"redirect_url": "/microsoft-365/commerce/licenses/product-keys-for-vl",
961961
"redirect_document_id": false
962+
},
963+
{
964+
"source_path": "microsoft-365/commerce/licenses/manage-license-requests-faq.yml",
965+
"redirect_url": "/microsoft-365/commerce/licenses/manage-license-reservations-vl",
966+
"redirect_document_id": false
967+
},
968+
{
969+
"source_path": "microsoft-365/commerce/licenses/user-roles-faq.yml",
970+
"redirect_url": "/microsoft-365/commerce/licenses/manage-user-roles-vl",
971+
"redirect_document_id": false
962972
}
963973
]
964974
}

‎.openpublishing.redirection.copilot.json‎

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": "copilot/mutliple-account-access.md",
5+
"redirect_url": "/copilot/microsoft-365/multiple-account-access",
6+
"redirect_document_id": true
7+
}
8+
]
9+
}

‎.openpublishing.redirection.enterprise.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,11 @@
14241424
"source_path": "microsoft-365/enterprise/tune-microsoft-365-performance.md",
14251425
"redirect_url": "/microsoft-365/enterprise/index",
14261426
"redirect_document_id": false
1427+
},
1428+
{
1429+
"source_path": "microsoft-365/enterprise/contoso-win10.md",
1430+
"redirect_url": "/microsoft-365/enterprise/contoso-win11",
1431+
"redirect_document_id": false
14271432
}
14281433
]
14291434
}

0 commit comments

Comments
 (0)