Skip to content

Commit 2c6e97c

Browse files
authored
Merge branch 'MicrosoftDocs:main' into master
2 parents e84d237 + 930af4b commit 2c6e97c

File tree

4,659 files changed

+38290
-131229
lines changed

Some content is hidden

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

4,659 files changed

+38290
-131229
lines changed

.openpublishing.publish.config.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,12 @@
806806
"branch": "master",
807807
"branch_mapping": {}
808808
},
809+
{
810+
"path_to_root": "ms-identity-b2c-javascript-spa",
811+
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
812+
"branch": "main",
813+
"branch_mapping": {}
814+
},
809815
{
810816
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
811817
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
@@ -885,15 +891,13 @@
885891
".openpublishing.redirection.json",
886892
".openpublishing.redirection.active-directory.json",
887893
".openpublishing.redirection.azure-blob.json",
888-
".openpublishing.redirection.azure-sql.json",
889894
"articles/data-factory/.openpublishing.redirection.data-factory.json",
890895
".openpublishing.redirection.defender-for-cloud.json",
891896
".openpublishing.redirection.defender-for-iot.json",
892897
".openpublishing.redirection.healthcare-apis.json",
893898
".openpublishing.redirection.iot-hub.json",
894899
".openpublishing.redirection.key-vault.json",
895900
".openpublishing.redirection.security-benchmark.json",
896-
".openpublishing.redirection.sql-database.json",
897901
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
898902
".openpublishing.redirection.azure-web-pubsub.json",
899903
".openpublishing.redirection.azure-monitor.json",
@@ -930,6 +934,7 @@
930934
"articles/mysql/.openpublishing.redirection.mysql.json",
931935
"articles/container-apps/.openpublishing.redirection.container-apps.json",
932936
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
933-
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
937+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
938+
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json"
934939
]
935940
}

.openpublishing.redirection.azure-sql.json

Lines changed: 0 additions & 209 deletions
This file was deleted.

.openpublishing.redirection.defender-for-iot.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-identify-required-appliances.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/ot-appliance-sizing",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-manage-proprietary-protocols.md",
510
"redirect_url": "/azure/defender-for-iot/organizations/overview#extend-support-to-proprietary-protocols",

0 commit comments

Comments
 (0)