Merge branch 'public' into patch-1

.acrolinx-config.edn

@@ -1,63 +1,59 @@
 {:allowed-branchname-matches ["main"]
  :allowed-filename-matches ["Skype/" "Teams/" "Lync/"]
 
-  :targets 
+ :use-gh-statuses true
+
+ :targets 
    {
      :counts {
-              ;;:correctness 13 ;; was spelling 10 and grammar 3
-              ;;:total 15 ;; absolute flag count but i don't know the difference between this and issues
-              ;;:issues 15 ;; coming from the platform, will need to be tested.
+              ;;:correctness 13
+              ;;:total 15 ;; 
+              ;;:issues 15 ;;
+              ;;:correctness 13 ;;
              }
      :scores {
               ;;:terminology 100
-              :qualityscore 80 ;; Confirmed with Hugo that you just comment out the single score and leave the structure in place
-              ;;:spelling 40
+              :qualityscore 80 ;; 
+              ;;:correctness 40
              }
    }
 
  :guidance-profile "d2b6c2c8-00ee-47f1-8d10-b280cc3434c1" ;; Profile ID for "M365-specific"
 
- :acrolinx-check-settings
- {
-  "languageId" "en"
-  "ruleSetName" "Standard"
-  "requestedFlagTypes" ["CORRECTNESS" "SPELLING" "GRAMMAR" "STYLE"
-                        "TERMINOLOGY_DEPRECATED"
-                        "TERMINOLOGY_VALID"
-                        "VOICE_GUIDANCE"
-                        ]
-  "termSetNames" ["M365" "Products" "Microsoft"] 
- }
-
  :template-header
 
  "
-## Acrolinx Scorecards
+
+## Acrolinx Scorecards 
  
-**The minimum Acrolinx topic score of 80 is required for all Magic team content merged to the default branch.**
+**The minimum Acrolinx topic score of 80 is required for all Magic content merged to the default branch.**
 
 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:
 
 - Work with you to resolve the issues requiring the exception.
 - Escalate the exception request to the Acrolinx Review Team for review.
 - Approve the exception and work with the GitHub Admin Team to merge the PR to the default branch.
 
-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=master).
+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).
  
-Select the scorecard links for each article to review the Acrolinx feedback on correctness (grammar and spelling), punctuation, writing style, and terminology:
+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.
 
-| Article | Score | Issues | Correctness<br>score | Scorecard | Processed |
-| ------- | ----- | ------ | ------ | --------- | --------- |
+| Article | Total score<br>(Required: 80) | Words + phrases<br>(Brand, terms) | Correctness<br>(Spelling, grammar) | Clarity<br>(Readability) |
+|---------|:--------------:|:--------------------:|:------:|:---------:|
 "
 
  :template-change
- "| ${s/file} | ${acrolinx/qualityscore} | ${acrolinx/flags/issues} | ${acrolinx/scores/correctness} | [link](${acrolinx/scorecard}) | ${s/status} |
+ "| ${s/status} ${s/file} | [${acrolinx/qualityscore}](${acrolinx/scorecard}) | ${acrolinx/scores/words_and_phrases} | ${acrolinx/scores/correctness} | ${acrolinx/scores/clarity} |
 "
 
  :template-footer
  "
-**More info about Acrolinx**
+**More information about Acrolinx**
  
-Use the Acrolinx extension, or sidebar, in Visual Studio Code to check correctness (including spelling and 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.learn.microsoft.com/en-us/office-authoring-guide/acrolinx-vscode?branch=main).
+- [Install Acrolinx locally for VSCode for Magic](https://review.docs.microsoft.com/office-authoring-guide/acrolinx-vscode?branch=main)
+- [False positives or issues](https://aka.ms/acrolinxbug)
+- [Request a new Acrolinx term](https://microsoft.sharepoint.com/teams/M365Dev2/SitePages/M365-terminology.aspx)
+- [Troubleshooting issues with Acrolinx](https://review.docs.microsoft.com/help/contribute/acrolinx-error-messages)
+
 "
 }

.github/workflows/AutoLabelAssign.yml

@@ -0,0 +1,41 @@
+name: Assign and label PR
+
+permissions:
+  pull-requests: write
+  contents: read
+  actions: read
+
+on: 
+    workflow_run:
+        workflows: [Background tasks]
+        types:
+            - completed
+
+jobs:
+    download-payload:
+        name: Download and extract payload artifact
+        uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
+        with:
+            WorkflowId: ${{ github.event.workflow_run.id }}
+            OrgRepo: ${{ github.repository }}
+        secrets:
+            AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+    label-assign:
+        name: Run assign and label
+        needs: [download-payload]
+        uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
+        with:
+            PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
+            AutoAssignUsers: 1
+            AutoLabel: 1
+            ExcludedUserList: '["user1", "user2"]'
+            ExcludedBranchList: '["branch1", "branch2"]'
+        secrets:
+            AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+
+
+
+
+

.github/workflows/AutoLabelMsftContributor.yml

@@ -0,0 +1,40 @@
+name: Auto label Microsoft contributors
+
+permissions:
+  pull-requests: write
+  contents: read
+  actions: read
+
+on: 
+    workflow_run:
+        workflows: [Background tasks]
+        types:
+            - completed
+
+jobs:
+    download-payload:
+        if: github.repository_visibility == 'public'
+        name: Download and extract payload artifact
+        uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
+        with:
+            WorkflowId: ${{ github.event.workflow_run.id }}
+            OrgRepo: ${{ github.repository }}
+        secrets:
+            AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+    label-msft:
+        name: Label Microsoft contributors
+        if: github.repository_visibility == 'public'
+        needs: [download-payload]
+        uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
+        with:
+          PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
+        secrets:
+          AccessToken: ${{ secrets.GITHUB_TOKEN }}
+          TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}
+
+
+
+
+
+

.github/workflows/BackgroundTasks.yml

@@ -0,0 +1,26 @@
+name: Background tasks
+
+permissions:
+  pull-requests: write
+  contents: read
+
+on:
+  pull_request_target:
+
+jobs:
+  upload:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Save payload data
+        env:
+          PayloadJson: ${{ toJSON(github) }}
+          AccessToken: ${{ github.token }}
+        run: |
+          mkdir -p ./pr
+          echo $PayloadJson > ./pr/PayloadJson.json
+          sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
+      - uses: actions/upload-artifact@v4
+        with:
+          name: PayloadJson
+          path: pr/

.github/workflows/LiveMergeCheck.yml

@@ -0,0 +1,22 @@
+name: PR can merge into branch
+
+permissions:
+  pull-requests: write
+  statuses: write
+  contents: read
+
+on: 
+  pull_request_target:
+    types: [opened, reopened, synchronize, edited]
+
+jobs:
+
+  live-merge:
+    uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
+    with:
+      PayloadJson: ${{ toJSON(github) }}
+    secrets:
+      AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+
+

.github/workflows/PrFileCount.yml

@@ -0,0 +1,22 @@
+name: PR file count less than limit
+
+permissions:
+  pull-requests: write
+  statuses: write
+  contents: read
+
+on: 
+  pull_request_target:
+    types: [opened, reopened, synchronize, labeled, unlabeled, edited]
+
+jobs:
+
+  file-count:
+    uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
+    with:
+      PayloadJson: ${{ toJSON(github) }}
+    secrets:
+      AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+
+

.github/workflows/ProtectedFiles.yml

@@ -0,0 +1,20 @@
+name: PR has no protected files
+
+permissions:
+  pull-requests: write
+  statuses: write
+  contents: read
+
+on: [pull_request_target]
+
+jobs:
+
+  protected-files:
+    uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
+    with:
+      PayloadJson: ${{ toJSON(github) }}
+    secrets:
+      AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+
+

.github/workflows/Stale.yml

@@ -0,0 +1,45 @@
+name: Mark stale pull requests
+
+permissions:
+  issues: write
+  pull-requests: write
+
+on:
+  schedule:
+  - cron: "0 */6 * * *"
+  workflow_dispatch:
+
+jobs:
+  stale-private:
+
+    runs-on: ubuntu-latest
+    if: github.repository_visibility == 'private'
+    steps:
+    - uses: actions/stale@v9
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        debug-only: true
+        operations-per-run: 1000
+        days-before-issue-stale: -1
+        days-before-issue-close: -1
+        days-before-pr-stale: 180
+        days-before-pr-close: 14
+        stale-pr-label: Inactive
+        close-pr-label: Auto closed
+        exempt-pr-labels: Keep open
+        stale-pr-message: >
+          This pull request has been inactive for 180 days, and an **Inactive** label has been added to it. If this PR remains inactive with no new comments, commits, or updates from main, it will be closed automatically in 14 days.
+          <br/>
+          If you're ready to merge this PR, add the **Sign off** label to have the PR reviewed and merged by PubOps.
+          <br/>
+          If you're not ready to merge this PR yet and want to keep it open, click on **Update branch** at the bottom of this PR to bring it up to date with the main branch.
+          <br/>
+          Thank you!
+          <br/>
+          PS: Mention **@marveldocs-pubops** in the comments if you need assistance.
+        close-pr-message: >
+          This pull request has been inactive for 14 days, and an **Auto Closed** label has been added. At this time, the system is closing the PR automatically. If you decide to continue working on your changes, that's no problem. At the bottom of the pull request, simply select the **Reopen pull request** button.
+          <br/>
+          Thank you!
+          <br/>
+          PS: Mention **@marveldocs-pubops** in the comments if you need assistance.