Skip to content

Commit 31ff320

Browse files
author
David Curwin
committed
fix conflict
2 parents dc68931 + ad447d1 commit 31ff320

File tree

8,569 files changed

+105709
-122247
lines changed

Some content is hidden

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

8,569 files changed

+105709
-122247
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,7 @@
10661066
".openpublishing.redirection.sql-database.json",
10671067
".openpublishing.redirection.virtual-desktop.json",
10681068
".openpublishing.redirection.devops-project.json",
1069+
".openpublishing.redirection.sentinel.json",
10691070
"articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
10701071
"articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
10711072
"articles/ai-services/.openpublishing.redirection.applied-ai-old.json",

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

Lines changed: 709 additions & 9 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: 1 addition & 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",

‎.openpublishing.redirection.azure-monitor.json‎

Lines changed: 59 additions & 60 deletions
Large diffs are not rendered by default.

‎.openpublishing.redirection.azure-percept.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"redirect_url": "/previous-versions/azure/azure-percept/index",
1111
"redirect_document_id": false
1212
},
13-
{
13+
{
1414
"source_path_from_root": "/articles/azure-percept/hci/azure-percept-on-azure-stack-hci-overview.md",
1515
"redirect_url": "/previous-versions/azure/azure-percept/index",
16-
"redirect_document_id": false
16+
"redirect_document_id": false
1717
},
1818
{
1919
"source_path_from_root": "/articles/azure-percept/studio/azure-percept-studio-overview.md",
@@ -315,7 +315,5 @@
315315
"redirect_url": "/previous-versions/azure/azure-percept/index",
316316
"redirect_document_id": false
317317
}
318-
319318
]
320319
}
321-

‎.openpublishing.redirection.baremetal-infrastructure.json‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
{
22
"redirections": [
3-
43
{
54
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/about-the-public-preview.md",
65
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
76
"redirect_document_id": false
8-
}, {
7+
},
8+
{
99
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/architecture.md",
1010
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
1111
"redirect_document_id": false
12-
},
12+
},
1313
{
1414
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/faq.md",
1515
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/faq",
1616
"redirect_document_id": false
17-
},
17+
},
1818
{
1919
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/get-started.md",
2020
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/get-started",
2121
"redirect_document_id": false
22-
},
22+
},
2323
{
2424
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/nc2-baremetal-overview.md",
2525
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/nc2-baremetal-overview",
2626
"redirect_document_id": false
27-
},
27+
},
2828
{
2929
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/requirements.md",
3030
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/requirements",
3131
"redirect_document_id": false
32-
},
32+
},
3333
{
3434
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/skus.md",
3535
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/skus",
3636
"redirect_document_id": false
37-
},
37+
},
3838
{
3939
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/solution-design.md",
4040
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/solution-design",
4141
"redirect_document_id": false
42-
},
42+
},
4343
{
4444
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/supported-instances-and-regions.md",
4545
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/supported-instances-and-regions",
4646
"redirect_document_id": false
47-
},
47+
},
4848
{
4949
"source_path": "articles/baremetal-infrastructure/workloads/nc2-public-preview/use-cases-and-supported-scenarios.md",
5050
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/use-cases-and-supported-scenarios",
5151
"redirect_document_id": false
52-
},
52+
},
5353
{
5454
"source_path": "articles/baremetal-infrastructure/workloads/oracle/concepts-oracle-high-availability.md",
5555
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
5656
"redirect_document_id": false
57-
},
57+
},
5858
{
5959
"source_path": "articles/baremetal-infrastructure/workloads/oracle/options-considerations-high-availability.md",
6060
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
@@ -64,17 +64,17 @@
6464
"source_path": "articles/baremetal-infrastructure/workloads/oracle/configure-snapcenter-oracle-baremetal.md",
6565
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
6666
"redirect_document_id": false
67-
},
67+
},
6868
{
6969
"source_path": "articles/baremetal-infrastructure/workloads/oracle/create-on-demand-backup-oracle-baremetal.md",
7070
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
7171
"redirect_document_id": false
72-
},
72+
},
7373
{
7474
"source_path": "articles/baremetal-infrastructure/workloads/oracle/netapp-snapcenter-integration-oracle-baremetal.md",
7575
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
7676
"redirect_document_id": false
77-
},
77+
},
7878
{
7979
"source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-architecture.md",
8080
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
@@ -84,42 +84,42 @@
8484
"source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-ethernet.md",
8585
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
8686
"redirect_document_id": false
87-
},
87+
},
8888
{
8989
"source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-overview.md",
9090
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
9191
"redirect_document_id": false
92-
},
92+
},
9393
{
9494
"source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-patching.md",
9595
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
9696
"redirect_document_id": false
97-
},
97+
},
9898
{
9999
"source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-provision.md",
100100
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
101101
"redirect_document_id": false
102-
},
102+
},
103103
{
104104
"source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-skus.md",
105105
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
106106
"redirect_document_id": false
107-
},
107+
},
108108
{
109109
"source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-storage.md",
110110
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
111111
"redirect_document_id": false
112-
},
112+
},
113113
{
114114
"source_path": "articles/baremetal-infrastructure/workloads/oracle/oracle-high-availability-recovery.md",
115115
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
116116
"redirect_document_id": false
117-
},
117+
},
118118
{
119119
"source_path": "articles/baremetal-infrastructure/workloads/oracle/restore-oracle-database-baremetal.md",
120120
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
121121
"redirect_document_id": false
122-
},
122+
},
123123
{
124124
"source_path": "articles/baremetal-infrastructure/workloads/oracle/set-up-snapcenter-to-route-traffic.md",
125125
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
@@ -129,7 +129,6 @@
129129
"source_path": "articles/baremetal-infrastructure/workloads/oracle/high-availability-features.md",
130130
"redirect_url": "/azure/virtual-machines/workloads/oracle/oracle-overview",
131131
"redirect_document_id": false
132-
}
132+
}
133133
]
134134
}
135-

‎.openpublishing.redirection.defender-for-cloud.json‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@
413413
{
414414
"source_path_from_root": "/articles/security-center/defender-for-dns-introduction.md",
415415
"redirect_url": "/azure/defender-for-cloud/defender-for-dns-introduction",
416-
"redirect_document_id": true
416+
"redirect_document_id": false
417417
},
418418
{
419419
"source_path_from_root": "/articles/security-center/defender-for-key-vault-introduction.md",
@@ -835,6 +835,16 @@
835835
"redirect_url": "/azure/defender-for-cloud/connect-azure-subscription",
836836
"redirect_document_id": true
837837
},
838+
{
839+
"source_path_from_root": "/articles/defender-for-cloud/enable-vulnerability-assessment-agentless.md",
840+
"redirect_url": "/azure/defender-for-cloud/enable-agentless-scanning-vms",
841+
"redirect_document_id": true
842+
},
843+
{
844+
"source_path_from_root": "/articles/defender-for-cloud/tutorial-enable-dns-plan.md",
845+
"redirect_url": "/azure/defender-for-cloud/defender-for-dns-introduction",
846+
"redirect_document_id": true
847+
},
838848
{
839849
"source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
840850
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",

0 commit comments

Comments
 (0)