Skip to content

Commit bd0d4ae

Browse files
mairawmairaw
authored
Merge branch 'main' into dotnet-urls
2 parents 8ccfe05 + c4492c6 commit bd0d4ae

File tree

5,997 files changed

+138909
-64389
lines changed

Some content is hidden

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

5,997 files changed

+138909
-64389
lines changed

Diff for: ‎.openpublishing.publish.config.json

+30-4
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,12 @@
410410
"branch": "main",
411411
"branch_mapping": {}
412412
},
413+
{
414+
"path_to_root": "azureml-examples-vj",
415+
"url": "https://github.com/azure/azureml-examples",
416+
"branch": "vijetajo-patch-2",
417+
"branch_mapping": {}
418+
},
413419
{
414420
"path_to_root": "azureml-examples-batch-pup",
415421
"url": "https://github.com/azure/azureml-examples",
@@ -440,6 +446,12 @@
440446
"branch": "main",
441447
"branch_mapping": {}
442448
},
449+
{
450+
"path_to_root": "azureml-examples-featurestore",
451+
"url": "https://github.com/Azure/azureml-examples",
452+
"branch": "featurestore/pup",
453+
"branch_mapping": {}
454+
},
443455
{
444456
"path_to_root": "terraform",
445457
"url": "https://github.com/Azure/terraform",
@@ -734,6 +746,12 @@
734746
"branch": "main",
735747
"branch_mapping": {}
736748
},
749+
{
750+
"path_to_root": "web-apps-node-iot-hub-data-visualization",
751+
"url": "https://github.com/azure-samples/web-apps-node-iot-hub-data-visualization",
752+
"branch": "master",
753+
"branch_mapping": {}
754+
},
737755
{
738756
"path_to_root": "ImmersiveReaderSdk",
739757
"url": "https://github.com/microsoft/immersive-reader-sdk",
@@ -903,9 +921,9 @@
903921
"branch_mapping": {}
904922
},
905923
{
906-
"path_to_root": "ms-identity-python-webapp",
924+
"path_to_root": "ms-identity-python-webapp-quickstart",
907925
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
908-
"branch": "main",
926+
"branch": "0.7.0",
909927
"branch_mapping": {}
910928
},
911929
{
@@ -985,7 +1003,13 @@
9851003
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
9861004
"branch": "main",
9871005
"branch_mapping": {}
988-
}
1006+
},
1007+
{
1008+
"path_to_root": "azure-actions-workflow-samples",
1009+
"url": "https://github.com/Azure/actions-workflow-samples",
1010+
"branch": "master",
1011+
"branch_mapping": {}
1012+
}
9891013
],
9901014
"branch_target_mapping": {
9911015
"live": ["Publish", "PDF"],
@@ -1062,6 +1086,7 @@
10621086
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10631087
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
10641088
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1089+
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
10651090
"articles/mariadb/.openpublishing.redirection.mariadb.json",
10661091
"articles/marketplace/.openpublishing.redirection.marketplace.json",
10671092
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -1079,6 +1104,7 @@
10791104
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
10801105
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
10811106
"articles/dev-box/.openpublishing.redirection.dev-box.json",
1082-
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json"
1107+
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
1108+
"articles/network-watcher/.openpublishing.redirection.network-watcher.json"
10831109
]
10841110
}

Diff for: ‎.openpublishing.redirection.active-directory.json

+64-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/active-directory/develop/active-directory-enterprise-app-role-management.md",
5+
"redirect_url": "/azure/active-directory/develop/enterprise-app-role-management",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/active-directory/develop/active-directory-schema-extensions.md",
10+
"redirect_url": "/azure/active-directory/develop/schema-extensions",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/active-directory/develop/active-directory-optional-claims.md",
15+
"redirect_url": "/azure/active-directory/develop/optional-claims",
16+
"redirect_document_id": false
17+
},
318
{
419
"source_path_from_root": "/articles/active-directory/develop/active-directory-jwt-claims-customization.md",
520
"redirect_url": "/azure/active-directory/develop/jwt-claims-customization",
@@ -3175,6 +3190,11 @@
31753190
"redirect_url": "/azure/active-directory/develop/quickstart-v1-android",
31763191
"redirect_document_id": true
31773192
},
3193+
{
3194+
"source_path_from_root": "/articles/active-directory/develop/howto-get-list-of-all-active-directory-auth-library-apps.md",
3195+
"redirect_url": "/azure/active-directory/develop/howto-get-list-of-all-auth-library-apps",
3196+
"redirect_document_id": true
3197+
},
31783198
{
31793199
"source_path_from_root": "/articles/active-directory/develop/active-directory-devquickstarts-angular.md",
31803200
"redirect_url": "/azure/active-directory/develop/quickstart-v1-angularjs-spa",
@@ -3199,7 +3219,7 @@
31993219
"source_path_from_root": "/articles/active-directory/develop/active-directory-integrating-applications.md",
32003220
"redirect_url": "/azure/active-directory/develop/quickstart-v1-integrate-apps-with-azure-ad",
32013221
"redirect_document_id": false
3202-
},
3222+
},
32033223
{
32043224
"source_path_from_root": "/articles/active-directory/develop/active-directory-devquickstarts-ios.md",
32053225
"redirect_url": "/azure/active-directory/develop/quickstart-v1-ios",
@@ -6575,6 +6595,11 @@
65756595
"redirect_url": "/troubleshoot/azure/active-directory/troubleshoot-adding-apps",
65766596
"redirect_document_id": false
65776597
},
6598+
{
6599+
"source_path_from_root": "/articles/active-directory/manage-apps/scripts/powershell-export-apps-with-expriring-secrets.md",
6600+
"redirect_url": "/troubleshoot/azure/active-directory/manage-apps/scripts/powershell-export-apps-with-expiring-secrets",
6601+
"redirect_document_id": false
6602+
},
65786603
{
65796604
"source_path_from_root": "/articles/active-directory/application-config-add-app-problem-problem-adding-gallery-app.md",
65806605
"redirect_url": "/troubleshoot/azure/active-directory/troubleshoot-adding-apps",
@@ -10235,6 +10260,31 @@
1023510260
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
1023610261
"redirect_document_id": false
1023710262
},
10263+
{
10264+
"source_path_from_root": "/articles/active-directory/fundamentals/azure-ad-data-residency.md",
10265+
"redirect_url": "/azure/active-directory/fundamentals/data-residency",
10266+
"redirect_document_id": true
10267+
},
10268+
{
10269+
"source_path_from_root": "/articles/active-directory/fundamentals/five-steps-to-full-application-integration-with-azure-ad.md",
10270+
"redirect_url": "/azure/active-directory/fundamentals/five-steps-to-full-application-integration",
10271+
"redirect_document_id": true
10272+
},
10273+
{
10274+
"source_path_from_root": "/articles/active-directory/fundamentals/service-accounts-governing-azure.md",
10275+
"redirect_url": "/azure/active-directory/fundamentals/govern-service-accounts",
10276+
"redirect_document_id": true
10277+
},
10278+
{
10279+
"source_path_from_root": "/articles/active-directory/fundamentals/service-accounts-introduction-azure.md",
10280+
"redirect_url": "/azure/active-directory/fundamentals/secure-service-accounts",
10281+
"redirect_document_id": true
10282+
},
10283+
{
10284+
"source_path_from_root": "/articles/active-directory/fundamentals/whats-deprecated-azure-ad.md",
10285+
"redirect_url": "/azure/active-directory/fundamentals/what-is-deprecated",
10286+
"redirect_document_id": true
10287+
},
1023810288
{
1023910289
"source_path_from_root": "/articles/active-directory/saas-apps/clarizen-provisioning-tutorial.md",
1024010290
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -12474,7 +12524,19 @@
1247412524
"source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-complete-azure-ad-roles-and-resource-roles-review.md",
1247512525
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-complete-roles-and-resource-roles-review",
1247612526
"redirect_document_id": false
12527+
},
12528+
12529+
{
12530+
"source_path_from_root": "/articles/active-directory-domain-services/concepts-migration-benefits.md",
12531+
"redirect_url": "/azure/active-directory-domain-services/overview",
12532+
"redirect_document_id": false
12533+
},
12534+
12535+
{
12536+
"source_path_from_root": "/articles/active-directory-domain-services/migrate-from-classic-vnet.md",
12537+
"redirect_url": "/azure/active-directory-domain-services/overview",
12538+
"redirect_document_id": false
1247712539
}
1247812540

12479-
]
12541+
]
1248012542
}

Diff for: ‎.openpublishing.redirection.azure-monitor.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -6150,7 +6150,16 @@
61506150
"source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
61516151
"redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",
61526152
"redirect_document_id": false
6153+
},
6154+
{
6155+
"source_path_from_root": "/articles/azure-monitor/app/opentelemetry-dotnet-exporter.md",
6156+
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
6157+
"redirect_document_id": false
6158+
},
6159+
{
6160+
"source_path_from_root": "/articles/azure-monitor/logs/api/app-insights-azure-ad-api.md",
6161+
"redirect_url": "/azure/azure-monitor/app/app-insights-azure-ad-api",
6162+
"redirect_document_id": false
61536163
}
6154-
61556164
]
61566165
}

0 commit comments

Comments
 (0)