Skip to content

Commit c7cdf9b

Browse files
authored
Merge branch 'public' into gary-update-workflows
2 parents 3c35cdf + 7e15602 commit c7cdf9b

2,013 files changed

Lines changed: 91628 additions & 54862 deletions

File tree

Some content is hidden

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

.acrolinx-config.edn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you need a scoring exception for content in this PR, add the *Sign off* and t
3535
- Escalate the exception request to the Acrolinx Review Team for review.
3636
- Approve the exception and work with the GitHub Admin Team to merge the PR to the default branch.
3737
38-
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).
38+
For more information about the exception criteria and exception process, see [Minimum Acrolinx topic scores for publishing](https://review.learn.microsoft.com/en-us/office-authoring-guide/acrolinx-min-score?branch=main).
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
@@ -51,10 +51,10 @@ Select the total score link to review all feedback on clarity, consistency, tone
5151
"
5252
**More information about Acrolinx**
5353
54-
- [Install Acrolinx locally for VSCode for Magic](https://review.docs.microsoft.com/office-authoring-guide/acrolinx-vscode?branch=main)
54+
- [Install Acrolinx locally for VSCode for Magic](https://review.learn.microsoft.com/en-us/office-authoring-guide/acrolinx-vscode?branch=main)
5555
- [False positives or issues](https://aka.ms/acrolinxbug)
5656
- [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)
57+
- [Troubleshooting issues with Acrolinx](https://review.learn.microsoft.com/en-us/help/platform/acrolinx-troubleshoot?branch=main)
5858
5959
"
6060
}

.github/copilot-instructions.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Copilot Instructions for Microsoft Learn
2+
3+
These instructions define a unified style and process standard for authoring and maintaining learn.microsoft.com documentation with GitHub Copilot or other AI assistance.
4+
5+
## Learn-wide Instructions
6+
7+
Below are instructions that apply to all Microsoft Learn documentation authored with AI assistance. Learn product team will update this periodically as needed. Each repository SHOULD NOT update this to avoid being overwritten, but update the repository-specific instructions below as needed.
8+
9+
### AI Usage & Disclosure
10+
All Markdown content created or substantially modified with AI assistance must include an `ai-usage` front matter entry:
11+
- `ai-usage: ai-generated` – AI produced the initial draft with minimal human authorship
12+
- `ai-usage: ai-assisted` – Human-directed, reviewed, and edited with AI support
13+
- Omit only for purely human-authored legacy content
14+
15+
If missing, **add it**. However, do not add or update the ai-usage tag if the changes proposed are confined solely to:
16+
- Links (link text and/or URLs)
17+
- Single words or short phrases, such as entries in table cells
18+
- Less than 5% of the article's word count
19+
20+
### Writing Style
21+
22+
Follow [Microsoft Writing Style Guide](https://learn.microsoft.com/style-guide/welcome/) with these specifics:
23+
24+
#### Voice and Tone
25+
26+
- Active voice, second person addressing reader directly
27+
- Conversational tone with contractions
28+
- Present tense for instructions/descriptions
29+
- Imperative mood for instructions ("Call the method" not "You should call the method")
30+
- Use "might" instead of "may" for possibility
31+
- Avoid "we"/"our" referring to documentation authors
32+
33+
#### Structure and Format
34+
35+
- Sentence case headings (no gerunds in titles)
36+
- Be concise, break up long sentences
37+
- Oxford comma in lists
38+
- Number all ordered list items as "1." (not sequential numbering like "1.", "2.", "3.", etc.)
39+
- Complete sentences with proper punctuation in all list items
40+
- Avoid "etc." or "and so on" - provide complete lists or use "for example"
41+
- No consecutive headings without content between them
42+
43+
#### Formatting Conventions
44+
45+
- **Bold** for UI elements
46+
- `Code style` for file names, folders, custom types, non-localizable text
47+
- Raw URLs in angle brackets
48+
- Use relative links for files in this repo
49+
- Remove `https://learn.microsoft.com/en-us` from learn.microsoft.com links
50+
51+
## Repository-Specific Instructions
52+
53+
Below are instructions specific to this repository. These may be updated by repository maintainers as needed.
54+
55+
<!--- Add additional repository level instructions below. Do NOT update this line or above. --->

.github/workflows/AutoLabelAssign.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,18 @@ jobs:
2626
name: Run assign and label
2727
if: github.repository_owner == 'MicrosoftDocs'
2828
needs: [download-payload]
29-
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
29+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-test
3030
with:
3131
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
3232
AutoAssignUsers: 1
33+
AutoAssignReviewers: 1
3334
AutoLabel: 1
3435
ExcludedUserList: '["user1", "user2"]'
3536
ExcludedBranchList: '["branch1", "branch2"]'
3637
secrets:
37-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
38+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
39+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
40+
41+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
42+
43+

.github/workflows/AutoPublish.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,24 @@ 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 (~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.
1012

1113
workflow_dispatch:
1214

1315
jobs:
1416

1517
auto-publish:
1618
if: github.repository_owner == 'MicrosoftDocs' && contains(github.event.repository.topics, 'build')
17-
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublish.yml@workflows-prod
19+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublishV2.yml@workflows-prod
1820
with:
1921
PayloadJson: ${{ toJSON(github) }}
2022
EnableAutoPublish: true
23+
EnableAutoMerge: true
2124

2225
secrets:
2326
AccessToken: ${{ secrets.GITHUB_TOKEN }}

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

.github/workflows/M365Endpoints.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
TargetOrganization: "MicrosoftDocs"
6363
TargetRepository: "microsoft-365-docs-pr"
6464
TargetPath: "microsoft-365/includes"
65-
EndpointsContentOwner: "kelleyvice-msft"
65+
EndpointsContentOwner: "VargheseSivi"
6666
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
6767
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
6868
run: |
@@ -72,6 +72,7 @@ jobs:
7272
# Script updated for Azure Torus 2-September-2020 by David Strome [email protected]
7373
# Script updated for GitHub workflows 10-September-2024 by David Strome [email protected]
7474
# Script updated to use M365 Skilling Repo Management app for auth 6-March-2025 by David Strome [email protected]
75+
# Script updated to add France as an available instance 21-August-2025 by David Strome [email protected]
7576
7677
<#
7778
This script retreives Office 365 endpoint sets for each service instance
@@ -256,6 +257,7 @@ jobs:
256257
$script:siHash = @{}
257258
$siHash.China = "Office 365 operated by 21Vianet"
258259
$siHash.Germany = "Office 365 Germany"
260+
$siHash.France = "Office 365 France"
259261
$siHash.USGovDoD = "Office 365 U.S. Government DoD"
260262
$siHash.USGovGCCHigh = "Office 365 U.S. Government GCC High"
261263
$siHash.Worldwide = "Office 365 Worldwide"
@@ -563,10 +565,15 @@ jobs:
563565
function Write-ServiceAreaHeader {
564566
param($saName, $path, $file)
565567
566-
Write-Host "Write service header for $saName"
568+
If (($saName -ne "") -and ($saName -ne $Null)) {
567569
568-
# Add a header with the service area name to the output file
569-
"`n## " + $saName + "`n" | Out-File -Append -FilePath ($path + $file)
570+
Write-Host "Write service header for $saName"
571+
572+
# Add a header with the service area name to the output file
573+
"`n## " + $saName + "`n" | Out-File -Append -FilePath ($path + $file)
574+
575+
}
576+
570577
} # end function Write-ServiceAreaHeader
571578
572579
function ConvertTo-EndpointObject {
@@ -902,3 +909,7 @@ jobs:
902909
with:
903910
name: RunData
904911
path: "${{ github.workspace }}/run-data/endpoints*"
912+
913+
914+
915+

.github/workflows/StaleBranch.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: (Scheduled) Stale branch removal
22

33
permissions:
44
contents: write
5+
pull-requests: read
56

67
# This workflow is designed to be run in the days up to, and including, a "deletion day", specified by 'DeleteOnDayOfMonth' in env: in https://github.com/MicrosoftDocs/microsoft-365-docs/blob/workflows-prod/.github/workflows/Shared-StaleBranch.yml.
78
# On the days leading up to "deletion day", the workflow will report the branches to be deleted. This lets users see which branches will be deleted. On "deletion day", those branches are deleted.

.github/workflows/TierManagement.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ name: Tier management
22

33
permissions:
44
pull-requests: write
5-
contents: read
5+
contents: write
66

77
on:
88
issue_comment:
99
types: [created, edited]
1010

11+
pull_request_target:
12+
types: [opened, reopened]
13+
1114
jobs:
1215

1316
tier-mgmt:

.openpublishing.publish.config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"locale": "en-us",
88
"monikers": [],
99
"moniker_ranges": [],
10-
"open_to_public_contributors": true,
10+
"open_to_public_contributors": false,
1111
"type_mapping": {
1212
"Conceptual": "Content"
1313
},
@@ -21,7 +21,7 @@
2121
"locale": "en-us",
2222
"monikers": [],
2323
"moniker_ranges": [],
24-
"open_to_public_contributors": true,
24+
"open_to_public_contributors": false,
2525
"type_mapping": {
2626
"Conceptual": "Content"
2727
},
@@ -38,7 +38,7 @@
3838
"o365-21vianet",
3939
"o365-worldwide"
4040
],
41-
"open_to_public_contributors": true,
41+
"open_to_public_contributors": false,
4242
"type_mapping": {
4343
"Conceptual": "Content",
4444
"ManagedReference": "Content",

0 commit comments

Comments
 (0)