Skip to content

Commit 36ebea3

Browse files
authored
Merge branch 'public' into patch-3
2 parents 99edaf5 + 09b6479 commit 36ebea3

1,224 files changed

Lines changed: 25212 additions & 14979 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: 1 addition & 1 deletion
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

.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/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)