Skip to content

Commit 74a5f35

Browse files
author
gerardori
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs into az-policy-akv-update
2 parents 1ff1772 + c5c0008 commit 74a5f35

File tree

12,567 files changed

+194566
-111152
lines changed

Some content is hidden

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

12,567 files changed

+194566
-111152
lines changed

.openpublishing.publish.config.json

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@
152152
"branch": "master",
153153
"branch_mapping": {}
154154
},
155+
{
156+
"path_to_root": "functions-azure-product",
157+
"url": "https://github.com/Azure/Azure-Functions",
158+
"branch": "main",
159+
"branch_mapping": {}
160+
},
155161
{
156162
"path_to_root": "functions-pytorch",
157163
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
@@ -164,6 +170,12 @@
164170
"branch": "dev",
165171
"branch_mapping": {}
166172
},
173+
{
174+
"path_to_root": "functions-quickstart-templates-v1",
175+
"url": "https://github.com/Azure/azure-functions-templates",
176+
"branch": "v1.x",
177+
"branch_mapping": {}
178+
},
167179
{
168180
"path_to_root": "azure-functions-samples-java",
169181
"url": "https://github.com/Azure-Samples/azure-functions-samples-java",
@@ -212,6 +224,12 @@
212224
"branch": "main",
213225
"branch_mapping": {}
214226
},
227+
{
228+
"path_to_root": "azure-functions-durable-js",
229+
"url": "https://github.com/Azure/azure-functions-durable-js",
230+
"branch": "main",
231+
"branch_mapping": {}
232+
},
215233
{
216234
"path_to_root": "azure-functions-kafka-extension",
217235
"url": "https://github.com/Azure/azure-functions-kafka-extension",
@@ -849,9 +867,15 @@
849867
"branch_mapping": {}
850868
},
851869
{
852-
"path_to_root": "azure-cosmos-dotnet-v3",
853-
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
854-
"branch": "v3",
870+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
871+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
872+
"branch": "main",
873+
"branch_mapping": {}
874+
},
875+
{
876+
"path_to_root": "cosmos-db-nosql-python-samples",
877+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
878+
"branch": "main",
855879
"branch_mapping": {}
856880
},
857881
{
@@ -871,6 +895,12 @@
871895
"url": "https://github.com/MicrosoftDocs/reusable-content",
872896
"branch": "main",
873897
"branch_mapping": {}
898+
},
899+
{
900+
"path_to_root": "azure-cosmos-db-mongodb-python-getting-started",
901+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
902+
"branch": "main",
903+
"branch_mapping": {}
874904
}
875905
],
876906
"branch_target_mapping": {
@@ -908,6 +938,7 @@
908938
".openpublishing.redirection.azure-percept.json",
909939
".openpublishing.redirection.azure-productivity.json",
910940
".openpublishing.redirection.azure-australia.json",
941+
".openpublishing.redirection.iot-hub-device-update.json",
911942
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
912943
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
913944
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -925,6 +956,7 @@
925956
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
926957
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
927958
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
959+
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
928960
"articles/mariadb/.openpublishing.redirection.mariadb.json",
929961
"articles/marketplace/.openpublishing.redirection.marketplace.json",
930962
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -951,6 +983,8 @@
951983
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
952984
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
953985
".openpublishing.redirection.baremetal-infrastructure.json",
954-
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"
986+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
987+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
988+
".openpublishing.redirection.azure-vmware.json"
955989
]
956990
}

.openpublishing.redirection.active-directory.json

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,26 @@
4545
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
50+
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
55+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
56+
"redirect_document_id": false
57+
},
4858
{
4959
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
5060
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
5161
"redirect_document_id": false
5262
},
63+
{
64+
"source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
65+
"redirect_url": "/graph/api/resources/identitygovernance-workflow",
66+
"redirect_document_id": false
67+
},
5368
{
5469
"source_path_from_root": "/articles/active-directory/governance/tutorial-offboard-custom-workflow-graph.md",
5570
"redirect_url": "/graph/tutorial-lifecycle-workflows-offboard-custom-workflow",
@@ -112,7 +127,7 @@
112127
},
113128
{
114129
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
115-
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
130+
"redirect_url": "/azure/active-directory/develop/v2-overview",
116131
"redirect_document_id": false
117132
},
118133
{
@@ -1897,7 +1912,7 @@
18971912
},
18981913
{
18991914
"source_path_from_root": "/articles/active-directory/develop/azure-ad-endpoint-comparison.md",
1900-
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
1915+
"redirect_url": "/azure/active-directory/develop/v2-overview",
19011916
"redirect_document_id": false
19021917
},
19031918
{
@@ -3433,17 +3448,17 @@
34333448
},
34343449
{
34353450
"source_path_from_root": "/articles/active-directory/develop/active-directory-permissions.md",
3436-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3451+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34373452
"redirect_document_id": false
34383453
},
34393454
{
34403455
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-scopes.md",
3441-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3456+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34423457
"redirect_document_id": false
34433458
},
34443459
{
34453460
"source_path_from_root": "/articles/active-directory/develop/v1-permissions-and-consent.md",
3446-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3461+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34473462
"redirect_document_id": false
34483463
},
34493464
{
@@ -5536,6 +5551,21 @@
55365551
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
55375552
"redirect_document_id": true
55385553
},
5554+
{
5555+
"source_path_from_root": "/articles/active-directory/develop/consent-framework.md",
5556+
"redirect_url": "/azure/active-directory/develop/application-consent-experience",
5557+
"redirect_document_id": false
5558+
},
5559+
{
5560+
"source_path_from_root": "/articles/active-directory/develop/v2-permissions-and-consent.md",
5561+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
5562+
"redirect_document_id": false
5563+
},
5564+
{
5565+
"source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
5566+
"redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
5567+
"redirect_document_id": false
5568+
},
55395569
{
55405570
"source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
55415571
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
@@ -10896,6 +10926,11 @@
1089610926
"redirect_url": "/azure/azure-percept/index",
1089710927
"redirect_document_id": false
1089810928
},
10929+
{
10930+
"source_path_from_root": "/articles/active-directory/reports-monitoring/howto-install-use-log-analytics-views.md",
10931+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
10932+
"redirect_document_id": false
10933+
},
1089910934
{
1090010935
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
1090110936
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
@@ -10933,7 +10968,7 @@
1093310968
},
1093410969
{
1093510970
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10936-
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10971+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-users-profile-azure-portal",
1093710972
"redirect_document_id": false
1093810973
},
1093910974
{
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/high-performance-compute/index.yml",
5+
"redirect_url": "/articles/high-performance-computing",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

0 commit comments

Comments
 (0)