Skip to content

Commit bb1d806

Browse files
author
RoseHJM
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ade-default-catalog-updates
2 parents 7dbcd2a + b8a63e2 commit bb1d806

File tree

17,341 files changed

+293282
-224174
lines changed

Some content is hidden

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

17,341 files changed

+293282
-224174
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: 56 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",
@@ -509,7 +521,7 @@
509521
{
510522
"path_to_root": "azureml-examples-temp-fix",
511523
"url": "https://github.com/Azure/azureml-examples",
512-
"branch": "temp-fix-doc-error",
524+
"branch": "temp-fix",
513525
"branch_mapping": {}
514526
},
515527
{
@@ -986,12 +998,36 @@
986998
"branch": "main",
987999
"branch_mapping": {}
9881000
},
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+
},
9891007
{
9901008
"path_to_root": "cosmos-db-nosql-python-samples",
9911009
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
9921010
"branch": "main",
9931011
"branch_mapping": {}
9941012
},
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+
},
9951031
{
9961032
"path_to_root": "cosmos-db-mongodb-dotnet-samples",
9971033
"url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
@@ -1157,6 +1193,7 @@
11571193
"name": "docfx_v3"
11581194
},
11591195
"redirection_files": [
1196+
".openpublishing.redirection.json",
11601197
".openpublishing.redirection.active-directory.json",
11611198
".openpublishing.redirection.api-management.json",
11621199
".openpublishing.redirection.app-service.json",
@@ -1175,24 +1212,29 @@
11751212
".openpublishing.redirection.azure-vmware.json",
11761213
".openpublishing.redirection.azure-web-pubsub.json",
11771214
".openpublishing.redirection.baremetal-infrastructure.json",
1215+
".openpublishing.redirection.container-service.json",
11781216
".openpublishing.redirection.defender-for-cloud.json",
11791217
".openpublishing.redirection.defender-for-iot.json",
1218+
".openpublishing.redirection.guidance.json",
11801219
".openpublishing.redirection.iot-hub-device-update.json",
1181-
".openpublishing.redirection.json",
11821220
".openpublishing.redirection.key-vault.json",
11831221
".openpublishing.redirection.machine-configuration.json",
1222+
".openpublishing.redirection.marketplace.json",
11841223
".openpublishing.redirection.openshift.json",
11851224
".openpublishing.redirection.security-benchmark.json",
11861225
".openpublishing.redirection.sql-database.json",
11871226
".openpublishing.redirection.virtual-desktop.json",
11881227
".openpublishing.redirection.devops-project.json",
11891228
".openpublishing.redirection.sentinel.json",
1229+
"articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
11901230
"articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
11911231
"articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
11921232
"articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
11931233
"articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
11941234
"articles/ai-services/.openpublishing.redirection.cognitive-services.json",
1235+
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
11951236
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
1237+
"articles/azure-functions/.openpublishing.redirection.azure-functions.json",
11961238
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
11971239
"articles/azure-relay/.openpublishing.redirection.relay.json",
11981240
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
@@ -1209,8 +1251,13 @@
12091251
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
12101252
"articles/dev-box/.openpublishing.redirection.dev-box.json",
12111253
"articles/digital-twins/.openpublishing.redirection.digital-twins.json",
1254+
"articles/energy-data-services/.openpublishing.redirection.energy-data-services.json",
12121255
"articles/event-grid/.openpublishing.redirection.event-grid.json",
12131256
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
1257+
"articles/governance/policy/.openpublishing.redirection.policy.json",
1258+
"articles/governance/policy/.openpublishing.redirection.resource-graph.json",
1259+
"articles/governance/blueprints/.openpublishing.redirection.blueprints.json",
1260+
"articles/governance/management-groups/.openpublishing.redirection.management-groups.json",
12141261
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
12151262
"articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
12161263
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
@@ -1223,28 +1270,33 @@
12231270
"articles/iot/.openpublishing.redirection.iot.json",
12241271
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
12251272
"articles/iot-operations/.openpublishing.redirection.iot-operations.json",
1273+
"articles/lab-services/.openpublishing.redirection.lab-services.json",
12261274
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
12271275
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
12281276
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
12291277
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
12301278
"articles/mariadb/.openpublishing.redirection.mariadb.json",
1231-
"articles/marketplace/.openpublishing.redirection.marketplace.json",
12321279
"articles/mysql/.openpublishing.redirection.mysql.json",
12331280
"articles/network-watcher/.openpublishing.redirection.network-watcher.json",
12341281
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
1282+
"articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
12351283
"articles/peering-service/.openpublishing.redirection.peering-service.json",
12361284
"articles/postgresql/.openpublishing.redirection.postgresql.json",
12371285
"articles/purview/.openpublishing.redirection.purview.json",
12381286
"articles/route-server/.openpublishing.redirection.route-server.json",
12391287
"articles/sap/.openpublishing.redirection.sap.json",
1288+
"articles/security/.openpublishing.redirection.security.json",
12401289
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
1290+
"articles/site-recovery/.openpublishing.redirection.site-recovery.json",
12411291
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
12421292
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
12431293
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
12441294
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1295+
"articles/storsimple/.openpublishing.redirection.storsimple.json",
12451296
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
12461297
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
12471298
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1248-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
1299+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1300+
"articles/virtual-network/.openpublishing.redirection.virtual-network.json"
12491301
]
12501302
}

0 commit comments

Comments
 (0)