Skip to content

Commit 4e53369

Browse files
author
David Curwin
committed
Fix conflict
2 parents 178f6b1 + 051ed1e commit 4e53369

File tree

13,384 files changed

+200763
-223252
lines changed

Some content is hidden

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

13,384 files changed

+200763
-223252
lines changed

‎.markdownlint.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"names": [
4545
".NET",
4646
"ASP.NET",
47-
"Azure",
4847
"JavaScript",
4948
"NuGet",
5049
"PowerShell",
@@ -56,5 +55,11 @@
5655
"MD045": false,
5756
"MD046": false,
5857
"MD047": false,
59-
"MD048": true
58+
"MD048": true,
59+
"MD049": true,
60+
"MD050": true,
61+
"MD051": false,
62+
"MD052": true,
63+
"MD053": true
6064
}
65+

‎.openpublishing.publish.config.json‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,12 @@
656656
"branch": "main",
657657
"branch_mapping": {}
658658
},
659+
{
660+
"path_to_root": "cosmos-db-nosql-query-samples",
661+
"url": "https://github.com/Azure-Samples/cosmos-db-nosql-query-samples",
662+
"branch": "main",
663+
"branch_mapping": {}
664+
},
659665
{
660666
"path_to_root": "cosmosdb-nodejs-get-started",
661667
"url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-api-nodejs-getting-started",
@@ -1009,7 +1015,13 @@
10091015
"url": "https://github.com/Azure/actions-workflow-samples",
10101016
"branch": "master",
10111017
"branch_mapping": {}
1012-
}
1018+
},
1019+
{
1020+
"path_to_root": "azure-proactive-resiliency-library",
1021+
"url": "https://github.com/Azure/Azure-Proactive-Resiliency-Library",
1022+
"branch": "main",
1023+
"branch_mapping": {}
1024+
}
10131025
],
10141026
"branch_target_mapping": {
10151027
"live": ["Publish", "PDF"],
@@ -1054,15 +1066,18 @@
10541066
".openpublishing.redirection.sql-database.json",
10551067
".openpublishing.redirection.virtual-desktop.json",
10561068
".openpublishing.redirection.devops-project.json",
1057-
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
1058-
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
1069+
".openpublishing.redirection.sentinel.json",
1070+
"articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
1071+
"articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
1072+
"articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
1073+
"articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
1074+
"articles/ai-services/.openpublishing.redirection.cognitive-services.json",
10591075
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
10601076
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
10611077
"articles/azure-relay/.openpublishing.redirection.relay.json",
10621078
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
10631079
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10641080
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
1065-
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
10661081
"articles/communication-services/.openpublishing.redirection.communication-services.json",
10671082
"articles/confidential-computing/.openpublishing.redirection.json",
10681083
"articles/container-apps/.openpublishing.redirection.container-apps.json",

‎.openpublishing.redirection.active-directory.json‎

Lines changed: 671 additions & 10 deletions
Large diffs are not rendered by default.

‎.openpublishing.redirection.api-management.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"source_path_from_root": "/articles/api-management/policies/authorize-request-using-external-authorizer.md",
55
"redirect_url": "https://github.com/Azure/api-management-policy-snippets",
66
"redirect_document_id": false
7-
},{
7+
},
8+
{
89
"source_path_from_root": "/articles/api-management/policies/add-correlation-id.md",
910
"redirect_url": "https://github.com/Azure/api-management-policy-snippets",
1011
"redirect_document_id": false
@@ -63,7 +64,7 @@
6364
"source_path_from_root": "/articles/api-management/policies/set-cache-duration.md",
6465
"redirect_url": "https://github.com/Azure/api-management-policy-snippets",
6566
"redirect_document_id": false
66-
},
67+
},
6768
{
6869
"source_path_from_root": "/articles/api-management/policies/set-header-to-enable-backend-to-construct-urls.md",
6970
"redirect_url": "https://github.com/Azure/api-management-policy-snippets",
@@ -239,6 +240,5 @@
239240
"redirect_url": "/azure/api-management/policies",
240241
"redirect_document_id": false
241242
}
242-
243243
]
244244
}

‎.openpublishing.redirection.azure-app-configuration.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"redirections": [
33
{
44
"source_path_from_root": "/articles/azure-app-configuration/howto-backup-config-store.md",
5-
"redirect_url": "/azure/azure-app-configuration/concept-geo-replication.md",
5+
"redirect_url": "/azure/azure-app-configuration/concept-geo-replication",
66
"redirect_document_id": false
77
}
88
]

‎.openpublishing.redirection.azure-kubernetes-service.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"redirections": [
2+
"redirections": [
33
{
44
"source_path_from_root": "/articles/aks/stop-api-upgrade.md",
55
"redirect_url": "/azure/aks/upgrade-cluster",
@@ -9,6 +9,11 @@
99
"source_path_from_root": "/articles/aks/cilium-enterprise-marketplace.md",
1010
"redirect_url": "/azure/aks/azure-cni-powered-by-cilium",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/aks/web-app-routing.md",
15+
"redirect_url": "/azure/aks/app-routing",
16+
"redirect_document_id": false
1217
}
1318
]
1419
}

0 commit comments

Comments
 (0)