Skip to content

Commit fa029e8

Browse files
Merge branch 'MicrosoftDocs:main' into PR-2
2 parents 3c8489c + 2821c82 commit fa029e8

File tree

2,822 files changed

+24253
-14521
lines changed

Some content is hidden

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

2,822 files changed

+24253
-14521
lines changed

.openpublishing.publish.config.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,18 @@
789789
"branch": "main",
790790
"branch_mapping": {}
791791
},
792+
{
793+
"path_to_root": "active-directory-b2c-msal-node-sign-in-sign-out-webapp",
794+
"url": "https://github.com/Azure-Samples/active-directory-b2c-msal-node-sign-in-sign-out-webapp",
795+
"branch": "main",
796+
"branch_mapping": {}
797+
},
798+
{
799+
"path_to_root": "active-directory-b2c-javascript-nodejs-webapi",
800+
"url": "https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi",
801+
"branch": "master",
802+
"branch_mapping": {}
803+
},
792804
{
793805
"path_to_root": "msdocs-python-flask-webapp-quickstart",
794806
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -840,7 +852,7 @@
840852
".openpublishing.redirection.media-services.json",
841853
".openpublishing.redirection.security-benchmark.json",
842854
".openpublishing.redirection.sql-database.json",
843-
".openpublishing.redirection.synapse-analytics.json",
855+
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
844856
".openpublishing.redirection.azure-web-pubsub.json",
845857
".openpublishing.redirection.azure-monitor.json",
846858
".openpublishing.redirection.azure-percept.json",
@@ -871,6 +883,7 @@
871883
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
872884
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
873885
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
886+
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
874887
"articles/mysql/.openpublishing.redirection.mysql.json"
875888
]
876889
}

.openpublishing.redirection.active-directory.json

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/active-directory/authentication/cloud-native-certificate-based-authentication-faq.yml",
5+
"redirect_url": "/azure/active-directory/authentication/certificate-based-authentication-faq",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/active-directory/authentication/concept-cloud-native-certificate-based-authentication-limitations.md",
10+
"redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication-limitations",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/active-directory/authentication/concept-cloud-native-certificate-based-authentication-technical-deep-dive.md",
15+
"redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication-technical-deep-dive",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/active-directory/authentication/concept-cloud-native-certificate-based-authentication.md",
20+
"redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
525
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -837,12 +857,12 @@
837857
},
838858
{
839859
"source_path_from_root": "/articles/active-directory/active-directory-conditional-access.md",
840-
"redirect_url": "/azure/active-directory/active-directory-conditional-access-azure-portal",
860+
"redirect_url": "/azure/active-directory/conditional-access/overview",
841861
"redirect_document_id": false
842862
},
843863
{
844864
"source_path_from_root": "/articles/active-directory/active-directory-conditional-access-azuread-connected-apps.md",
845-
"redirect_url": "/azure/active-directory/active-directory-conditional-access-azure-portal-get-started",
865+
"redirect_url": "/azure/active-directory/concept-conditional-access-cloud-apps",
846866
"redirect_document_id": false
847867
},
848868
{
@@ -1972,7 +1992,7 @@
19721992
},
19731993
{
19741994
"source_path_from_root": "/articles/active-directory/active-directory-conditional-access-azure-portal-get-started.md",
1975-
"redirect_url": "/azure/active-directory/conditional-access/app-based-mfa",
1995+
"redirect_url": "/azure/active-directory/conditional-access/howto-conditional-access-policy-azure-management",
19761996
"redirect_document_id": true
19771997
},
19781998
{
@@ -2067,7 +2087,7 @@
20672087
},
20682088
{
20692089
"source_path_from_root": "/articles/active-directory/active-directory-conditional-access-device-policies.md",
2070-
"redirect_url": "/azure/active-directory/conditional-access/overview",
2090+
"redirect_url": "/azure/active-directory/conditional-access/concept-condition-filters-for-devices",
20712091
"redirect_document_id": false
20722092
},
20732093
{
@@ -2077,7 +2097,7 @@
20772097
},
20782098
{
20792099
"source_path_from_root": "/articles/active-directory/conditional-access/howto-conditional-access-adoption-kit.md",
2080-
"redirect_url": "/azure/active-directory/conditional-access/overview",
2100+
"redirect_url": "/azure/active-directory/conditional-access/plan-conditional-access",
20812101
"redirect_document_id": false
20822102
},
20832103
{
@@ -10664,7 +10684,22 @@
1066410684
"source_path_from_root": "/articles/active-directory-b2c/troubleshoot-custom-policies.md",
1066510685
"redirect_url": "/azure/active-directory-b2c/troubleshoot",
1066610686
"redirect_document_id": false
10667-
},
10687+
},
10688+
{
10689+
"source_path_from_root": "/articles/active-directory-b2c/tutorial-authenticate-nodejs-web-app-msal.md",
10690+
"redirect_url": "/azure/active-directory-b2c/enable-authentication-in-node-web-app",
10691+
"redirect_document_id": false
10692+
},
10693+
{
10694+
"source_path_from_root": "/articles/active-directory-b2c/tutorial-acquire-access-token.md",
10695+
"redirect_url": "/azure/active-directory-b2c/enable-authentication-in-node-web-app-with-api",
10696+
"redirect_document_id": false
10697+
},
10698+
{
10699+
"source_path_from_root": "/articles/active-directory-b2c/tutorial-call-api-with-access-token.md",
10700+
"redirect_url": "/azure/active-directory-b2c/enable-authentication-in-node-web-app-with-api",
10701+
"redirect_document_id": false
10702+
},
1066810703
{
1066910704
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-arm.md",
1067010705
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-arm",

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path_from_root": "/articles/application-insights/app-insights-performance-counters.md",
1010
"redirect_url": "/azure/azure-monitor/app/performance-counters",
1111
"redirect_document_id": true
12+
},
13+
{
14+
"source_path_from_root": "/articles/azure-monitor/insights/service-bus-insights.md",
15+
"redirect_url": "/azure/service-bus-messaging/service-bus-insights",
16+
"redirect_document_id": false
1217
}
1318
]
1419
}

0 commit comments

Comments
 (0)