Skip to content

Commit 84465c9

Browse files
authored
Merge branch 'MicrosoftDocs:main' into master
2 parents dabcd48 + 658b318 commit 84465c9

File tree

18,981 files changed

+430125
-289518
lines changed

Some content is hidden

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

18,981 files changed

+430125
-289518
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main" "release-.*"]
2-
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md))" "includes/"]}
2+
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}

.github/workflows/stale.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: Mark stale pull requests
22

3+
permissions:
4+
issues: write
5+
pull-requests: write
6+
37
on:
48
schedule:
59
- cron: "0 */6 * * *"
@@ -8,7 +12,7 @@ jobs:
812
stale:
913

1014
runs-on: ubuntu-latest
11-
15+
1216
steps:
1317
- uses: actions/stale@v3
1418
with:

.openpublishing.publish.config.json

Lines changed: 73 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,24 @@
176176
"branch": "master",
177177
"branch_mapping": {}
178178
},
179+
{
180+
"path_to_root": "azure_powershell_scripts",
181+
"url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
182+
"branch": "main",
183+
"branch_mapping": {}
184+
},
179185
{
180186
"path_to_root": "powershell_scripts",
181187
"url": "https://github.com/Azure/azure-docs-powershell-samples",
182188
"branch": "master",
183189
"branch_mapping": {}
184190
},
191+
{
192+
"path_to_root": "new_powershell_scripts",
193+
"url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
194+
"branch": "main",
195+
"branch_mapping": {}
196+
},
185197
{
186198
"path_to_root": "policy-templates",
187199
"url": "https://github.com/Azure/azure-policy",
@@ -230,6 +242,12 @@
230242
"branch": "master",
231243
"branch_mapping": {}
232244
},
245+
{
246+
"path_to_root": "function-app-arm-templates",
247+
"url": "https://github.com/Azure-Samples/function-app-arm-templates",
248+
"branch": "main",
249+
"branch_mapping": {}
250+
},
233251
{
234252
"path_to_root": "functions-azure-product",
235253
"url": "https://github.com/Azure/Azure-Functions",
@@ -503,7 +521,7 @@
503521
{
504522
"path_to_root": "azureml-examples-temp-fix",
505523
"url": "https://github.com/Azure/azureml-examples",
506-
"branch": "temp-fix-doc-error",
524+
"branch": "temp-fix",
507525
"branch_mapping": {}
508526
},
509527
{
@@ -938,6 +956,12 @@
938956
"branch": "main",
939957
"branch_mapping": {}
940958
},
959+
{
960+
"path_to_root": "msdocs-quarkus-postgresql-sample-app",
961+
"url": "https://github.com/Azure-Samples/msdocs-quarkus-postgresql-sample-app",
962+
"branch": "main",
963+
"branch_mapping": {}
964+
},
941965
{
942966
"path_to_root": "azuresignalr-samples",
943967
"url": "https://github.com/aspnet/AzureSignalR-samples",
@@ -974,12 +998,36 @@
974998
"branch": "main",
975999
"branch_mapping": {}
9761000
},
1001+
{
1002+
"path_to_root": "cosmos-db-nosql-nodejs-quickstart",
1003+
"url": "https://github.com/azure-samples/cosmos-db-nosql-nodejs-quickstart",
1004+
"branch": "main",
1005+
"branch_mapping": {}
1006+
},
9771007
{
9781008
"path_to_root": "cosmos-db-nosql-python-samples",
9791009
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
9801010
"branch": "main",
9811011
"branch_mapping": {}
9821012
},
1013+
{
1014+
"path_to_root": "cosmos-db-nosql-python-quickstart",
1015+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-quickstart",
1016+
"branch": "main",
1017+
"branch_mapping": {}
1018+
},
1019+
{
1020+
"path_to_root": "cosmos-db-nosql-java-quickstart",
1021+
"url": "https://github.com/azure-samples/cosmos-db-nosql-java-quickstart",
1022+
"branch": "main",
1023+
"branch_mapping": {}
1024+
},
1025+
{
1026+
"path_to_root": "cosmos-db-nosql-go-quickstart",
1027+
"url": "https://github.com/azure-samples/cosmos-db-nosql-go-quickstart",
1028+
"branch": "main",
1029+
"branch_mapping": {}
1030+
},
9831031
{
9841032
"path_to_root": "cosmos-db-mongodb-dotnet-samples",
9851033
"url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
@@ -1123,6 +1171,12 @@
11231171
"url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
11241172
"branch": "main",
11251173
"branch_mapping": {}
1174+
},
1175+
{
1176+
"path_to_root": "azure-iot-operations-samples",
1177+
"url": "https://github.com/Azure-Samples/explore-iot-operations",
1178+
"branch": "main",
1179+
"branch_mapping": {}
11261180
}
11271181
],
11281182
"branch_target_mapping": {
@@ -1139,6 +1193,7 @@
11391193
"name": "docfx_v3"
11401194
},
11411195
"redirection_files": [
1196+
".openpublishing.redirection.json",
11421197
".openpublishing.redirection.active-directory.json",
11431198
".openpublishing.redirection.api-management.json",
11441199
".openpublishing.redirection.app-service.json",
@@ -1157,23 +1212,26 @@
11571212
".openpublishing.redirection.azure-vmware.json",
11581213
".openpublishing.redirection.azure-web-pubsub.json",
11591214
".openpublishing.redirection.baremetal-infrastructure.json",
1215+
".openpublishing.redirection.container-service.json",
11601216
".openpublishing.redirection.defender-for-cloud.json",
11611217
".openpublishing.redirection.defender-for-iot.json",
11621218
".openpublishing.redirection.iot-hub-device-update.json",
1163-
".openpublishing.redirection.json",
11641219
".openpublishing.redirection.key-vault.json",
11651220
".openpublishing.redirection.machine-configuration.json",
1221+
".openpublishing.redirection.marketplace.json",
11661222
".openpublishing.redirection.openshift.json",
11671223
".openpublishing.redirection.security-benchmark.json",
11681224
".openpublishing.redirection.sql-database.json",
11691225
".openpublishing.redirection.virtual-desktop.json",
11701226
".openpublishing.redirection.devops-project.json",
11711227
".openpublishing.redirection.sentinel.json",
1228+
"articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
11721229
"articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
11731230
"articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
11741231
"articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
11751232
"articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
11761233
"articles/ai-services/.openpublishing.redirection.cognitive-services.json",
1234+
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
11771235
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
11781236
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
11791237
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -1191,8 +1249,13 @@
11911249
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
11921250
"articles/dev-box/.openpublishing.redirection.dev-box.json",
11931251
"articles/digital-twins/.openpublishing.redirection.digital-twins.json",
1252+
"articles/energy-data-services/.openpublishing.redirection.energy-data-services.json",
11941253
"articles/event-grid/.openpublishing.redirection.event-grid.json",
11951254
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
1255+
"articles/governance/policy/.openpublishing.redirection.policy.json",
1256+
"articles/governance/policy/.openpublishing.redirection.resource-graph.json",
1257+
"articles/governance/blueprints/.openpublishing.redirection.blueprints.json",
1258+
"articles/governance/management-groups/.openpublishing.redirection.management-groups.json",
11961259
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
11971260
"articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
11981261
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
@@ -1204,28 +1267,34 @@
12041267
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
12051268
"articles/iot/.openpublishing.redirection.iot.json",
12061269
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
1270+
"articles/iot-operations/.openpublishing.redirection.iot-operations.json",
1271+
"articles/lab-services/.openpublishing.redirection.lab-services.json",
12071272
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
12081273
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
12091274
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
12101275
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
12111276
"articles/mariadb/.openpublishing.redirection.mariadb.json",
1212-
"articles/marketplace/.openpublishing.redirection.marketplace.json",
12131277
"articles/mysql/.openpublishing.redirection.mysql.json",
12141278
"articles/network-watcher/.openpublishing.redirection.network-watcher.json",
12151279
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
1280+
"articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
12161281
"articles/peering-service/.openpublishing.redirection.peering-service.json",
12171282
"articles/postgresql/.openpublishing.redirection.postgresql.json",
12181283
"articles/purview/.openpublishing.redirection.purview.json",
12191284
"articles/route-server/.openpublishing.redirection.route-server.json",
12201285
"articles/sap/.openpublishing.redirection.sap.json",
1286+
"articles/security/.openpublishing.redirection.security.json",
12211287
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
1288+
"articles/site-recovery/.openpublishing.redirection.site-recovery.json",
12221289
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
12231290
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
12241291
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
12251292
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1293+
"articles/storsimple/.openpublishing.redirection.storsimple.json",
12261294
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
12271295
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
12281296
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1229-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
1297+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1298+
"articles/virtual-network/.openpublishing.redirection.virtual-network.json"
12301299
]
12311300
}

0 commit comments

Comments
 (0)