Skip to content

Commit 67a3f6d

Browse files
Merge branch 'public' into patch-6
2 parents 0ed2d27 + 51f8635 commit 67a3f6d

File tree

12,976 files changed

+230585
-379150
lines changed

Some content is hidden

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

12,976 files changed

+230585
-379150
lines changed

.acrolinx-config.edn

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,33 @@
1-
{:allowed-branchname-matches ["main"]
2-
:allowed-filename-matches ["microsoft-365/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
1+
{:changed-files-limit 60
2+
:allowed-branchname-matches ["main" "release-.*"]
3+
:allowed-filename-matches ["microsoft-365/" "copilot/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
34

45
:use-gh-statuses true
56

67
:targets
78
{
89
:counts {
910
;;:correctness 13
10-
;;:total 15 ;; absolute flag count but i don't know the difference between this and issues
11-
;;:issues 15 ;; coming from the platform, will need to be tested.
12-
;;:correctness 13 ;; combined spelling and grammar
11+
;;:total 15 ;;
12+
;;:issues 15 ;;
13+
;;:correctness 13 ;;
1314
}
1415
:scores {
1516
;;:terminology 100
16-
:qualityscore 80 ;; Confirmed with Hugo that you just comment out the single score and leave the structure in place
17+
:qualityscore 80 ;;
1718
;;:correctness 40
1819
}
1920
}
2021

2122
:guidance-profile "d2b6c2c8-00ee-47f1-8d10-b280cc3434c1" ;; Profile ID for "M365-specific"
22-
23-
:acrolinx-check-settings
24-
25-
{
26-
"languageId" "en"
27-
"ruleSetName" "Standard"
28-
"requestedFlagTypes" ["CORRECTNESS" "SPELLING" "GRAMMAR" "STYLE"
29-
"TERMINOLOGY_DEPRECATED"
30-
"TERMINOLOGY_VALID"
31-
"VOICE_GUIDANCE"
32-
]
33-
"termSetNames" ["M365" "Products" "Microsoft"]
34-
}
3523

3624
:template-header
3725

3826
"
3927
4028
## Acrolinx Scorecards
4129
42-
**The minimum Acrolinx topic score of 80 is required for all MAGIC content merged to the default branch.**
30+
**The minimum Acrolinx topic score of 80 is required for all Magic content merged to the default branch.**
4331
4432
If you need a scoring exception for content in this PR, add the *Sign off* and the *Acrolinx exception* labels to the PR. The PubOps Team will review the exception request and may take one or more of the following actions:
4533
@@ -49,20 +37,24 @@ If you need a scoring exception for content in this PR, add the *Sign off* and t
4937
5038
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).
5139
52-
Select the scorecard links for each article to review the Acrolinx feedback on grammar, spelling, punctuation, writing style, and terminology:
40+
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.
5341
54-
| Article | Score | Issues | Correctness<br>score | Scorecard | Processed |
55-
| ------- | ----- | ------ | ------ | --------- | --------- |
42+
| Article | Total score<br>(Required: 80) | Terminology | Spelling and Grammar | Clarity<br>(Readability) |
43+
|---------|:--------------:|:--------------------:|:------:|:---------:|
5644
"
5745

5846
:template-change
59-
"| ${s/file} | ${acrolinx/qualityscore} | ${acrolinx/flags/issues} | ${acrolinx/scores/correctness} | [link](${acrolinx/scorecard}) | ${s/status} |
47+
"| ${s/status} ${s/file} | [${acrolinx/qualityscore}](${acrolinx/scorecard}) | ${acrolinx/scores/words_and_phrases} | ${acrolinx/scores/correctness} | ${acrolinx/scores/clarity} |
6048
"
6149

6250
:template-footer
6351
"
64-
**More info about Acrolinx**
52+
**More information about Acrolinx**
6553
66-
Use the Acrolinx extension, or sidebar, in Visual Studio Code to check spelling, grammar, style, tone, clarity, and key terminology when you're creating or updating content. For more information, see [Use the Visual Studio Code extension to run Acrolinx locally](https://review.docs.microsoft.com/en-us/office-authoring-guide/acrolinx-vscode?branch=main).
54+
- [Install Acrolinx locally for VSCode for Magic](https://review.docs.microsoft.com/office-authoring-guide/acrolinx-vscode?branch=main)
55+
- [False positives or issues](https://aka.ms/acrolinxbug)
56+
- [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)
58+
6759
"
6860
}

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: New feedback experience
4+
url: https://learn.microsoft.com/office/new-feedback
5+
about: We’re transitioning our feedback experience away from GitHub Issues. For more information, select Open.

.github/pull_request_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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+
AutoLabel: 1
34+
ExcludedUserList: '["user1", "user2"]'
35+
ExcludedBranchList: '["branch1", "branch2"]'
36+
secrets:
37+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Auto label Microsoft contributors
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+
if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'public'
17+
name: Download and extract payload artifact
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-msft:
26+
name: Label Microsoft contributors
27+
if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'public'
28+
needs: [download-payload]
29+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
30+
with:
31+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
32+
secrets:
33+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
35+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}

.github/workflows/AutoPublish.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: (Scheduled) Publish to live
2+
3+
permissions:
4+
contents: write
5+
pull-requests: write
6+
7+
on:
8+
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+
11+
workflow_dispatch:
12+
13+
jobs:
14+
15+
auto-publish:
16+
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+
with:
19+
PayloadJson: ${{ toJSON(github) }}
20+
EnableAutoPublish: true
21+
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
25+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Background tasks
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
7+
on:
8+
pull_request_target:
9+
10+
jobs:
11+
upload:
12+
if: github.repository_owner == 'MicrosoftDocs'
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Save payload data
17+
env:
18+
PayloadJson: ${{ toJSON(github) }}
19+
AccessToken: ${{ github.token }}
20+
run: |
21+
mkdir -p ./pr
22+
echo $PayloadJson > ./pr/PayloadJson.json
23+
sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
24+
- uses: actions/upload-artifact@v4
25+
with:
26+
name: PayloadJson
27+
path: pr/
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
if: github.repository_owner == 'MicrosoftDocs'
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-BuildValidation.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: PR can merge into branch
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, edited]
11+
12+
jobs:
13+
14+
live-merge:
15+
if: github.repository_owner == 'MicrosoftDocs'
16+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
17+
with:
18+
PayloadJson: ${{ toJSON(github) }}
19+
secrets:
20+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)