Skip to content

Commit 6512846

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into shg
2 parents 0dc4bd6 + 63b74ec commit 6512846

File tree

2,851 files changed

+40897
-36189
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,851 files changed

+40897
-36189
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["master" "release-.*"]
2-
:allowed-filename-matches ["articles/" "includes/"]}
2+
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml))" "includes/"]}

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Mark stale pull requests
22

33
on:
44
schedule:
5-
- cron: "0 */4 * * *"
5+
- cron: "0 */6 * * *"
66

77
jobs:
88
stale:

.openpublishing.publish.config.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,13 +324,13 @@
324324
{
325325
"path_to_root": "azure-iot-sdk-node",
326326
"url": "https://github.com/Azure/azure-iot-sdk-node",
327-
"branch": "master",
327+
"branch": "main",
328328
"branch_mapping": {}
329329
},
330330
{
331331
"path_to_root": "iot-samples-c",
332332
"url": "https://github.com/Azure/azure-iot-sdk-c",
333-
"branch": "master",
333+
"branch": "main",
334334
"branch_mapping": {}
335335
},
336336
{
@@ -806,6 +806,7 @@
806806
"redirection_files": [
807807
".openpublishing.redirection.json",
808808
".openpublishing.redirection.active-directory.json",
809+
".openpublishing.redirection.azure-sql.json",
809810
".openpublishing.redirection.data-factory.json",
810811
".openpublishing.redirection.defender-for-cloud.json",
811812
".openpublishing.redirection.defender-for-iot.json",
@@ -814,6 +815,7 @@
814815
".openpublishing.redirection.key-vault.json",
815816
".openpublishing.redirection.media-services.json",
816817
".openpublishing.redirection.security-benchmark.json",
818+
".openpublishing.redirection.sql-database.json",
817819
".openpublishing.redirection.synapse-analytics.json",
818820
".openpublishing.redirection.azure-web-pubsub.json",
819821
".openpublishing.redirection.azure-percept.json",

.openpublishing.redirection.active-directory.json

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/active-directory/authentication/how-to-authentication-kerberos.md",
10+
"redirect_url": "/azure/virtual-desktop/create-profile-container-azure-ad",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/active-directory/manage-apps/application-management-fundamentals.md",
1015
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -10594,8 +10599,29 @@
1059410599
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-rest.md",
1059510600
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-rest",
1059610601
"redirect_document_id": false
10602+
},
10603+
{
10604+
"source_path": "articles/active-directory/verifiable-credentials/enable-your-tenant-verifiable-credentials.md",
10605+
"redirect_url": "/azure/active-directory/verifiable-credentials/verifiable-credentials-configure-tenant",
10606+
"redirect_document_id": false
10607+
}
10608+
,
10609+
{
10610+
"source_path": "articles/active-directory/verifiable-credentials/issue-verify-verifiable-credentials-your-tenant.md",
10611+
"redirect_url": "/azure/active-directory/verifiable-credentials/verifiable-credentials-configure-issuer",
10612+
"redirect_document_id": false
10613+
},
10614+
{
10615+
"source_path": "articles/active-directory/verifiable-credentials/get-started-verifiable-credentials.md",
10616+
"redirect_url": "/azure/active-directory/verifiable-credentials/verifiable-credentials-configure-tenant",
10617+
"redirect_document_id": false
10618+
},
10619+
{
10620+
"source_path": "articles/active-directory/manage-apps/application-types.md",
10621+
"redirect_url": "/azure/active-directory/manage-apps/application-list",
10622+
"redirect_document_id": false
1059710623
}
10598-
10624+
1059910625

1060010626
]
1060110627
}
Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-sql/database/doc-changes-updates-release-notes.md",
5+
"redirect_url": "/azure/azure-sql/database/doc-changes-updates-release-notes-whats-new",
6+
"redirect_document_id": true
7+
},
8+
{
9+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/doc-changes-updates-release-notes.md",
10+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/doc-changes-updates-release-notes-whats-new",
11+
"redirect_document_id": true
12+
},
13+
{
14+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/availability-group-manually-configure-prerequisites-tutorial.md",
15+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-manually-configure-prerequisites-tutorial-single-subnet",
16+
"redirect_document_id": true
17+
},
18+
{
19+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/availability-group-manually-configure-tutorial.md",
20+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-manually-configure-tutorial-single-subnet",
21+
"redirect_document_id": true
22+
},
23+
{
24+
"source_path_from_root": "/articles/azure-sql/database/advanced-data-security.md",
25+
"redirect_url": "/azure/azure-sql/database/azure-defender-for-sql",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/azure-sql/database/connect-query-r.md",
30+
"redirect_url": "/sql/machine-learning/tutorials/quickstart-r-create-script?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/azure-sql/database/service-tiers-prs.md",
35+
"redirect_url": "/azure/azure-sql/database/doc-changes-updates-release-notes",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/azure-sql/database/sql-data-sync-monitor-sync.md",
40+
"redirect_url": "/azure/azure-sql/database/monitor-tune-overview",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-sql/database/policy-samples.md",
45+
"redirect_url": "/azure/azure-sql/database/policy-reference",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/azure-sql/database/security-controls.md",
50+
"redirect_url": "/azure/azure-sql/database/security-baseline",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-sql/database/machine-learning-services-differences.md",
55+
"redirect_url": "/azure/azure-sql/managed-instance/machine-learning-services-differences",
56+
"redirect_document_id": true
57+
},
58+
{
59+
"source_path_from_root": "/articles/azure-sql/database/machine-learning-services-overview.md",
60+
"redirect_url": "/azure/azure-sql/managed-instance/machine-learning-services-overview",
61+
"redirect_document_id": true
62+
},
63+
{
64+
"source_path_from_root": "/articles/azure-sql/managed-instance/migrate-to-instance-from-sql-server.md",
65+
"redirect_url": "/azure/azure-sql/migration-guides/managed-instance/sql-server-to-managed-instance-guide",
66+
"redirect_document_id": true
67+
},
68+
{
69+
"source_path_from_root": "/articles/azure-sql/managed-instance/scripts/create-powershell-azure-resource-manager-template.md",
70+
"redirect_url": "/azure/azure-sql/managed-instance/create-template-quickstart",
71+
"redirect_document_id": true
72+
},
73+
{
74+
"source_path_from_root": "/articles/azure-sql/virtual-machines/linux/index.yml",
75+
"redirect_url": "/azure/azure-sql/virtual-machines/linux/sql-server-on-linux-vm-what-is-iaas-overview",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/availability-group-az-cli-configure.md",
80+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-az-commandline-configure",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/availability-group-azure-marketplace-template-configure.md",
85+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-quickstart-template-configure",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/hadr-vnn-azure-load-balancer-configure.md",
90+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-vnn-azure-load-balancer-configure",
91+
"redirect_document_id": true
92+
},
93+
{
94+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/hadr-distributed-network-name-dnn-configure.md",
95+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/failover-cluster-instance-distributed-network-name-dnn-configure",
96+
"redirect_document_id": true
97+
},
98+
{
99+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/sql-vm-resource-provider-automatic-registration.md",
100+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/sql-agent-extension-automatic-registration-all-vms",
101+
"redirect_document_id": true
102+
},
103+
{
104+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/sql-vm-resource-provider-register.md",
105+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/sql-agent-extension-manually-register-single-vm",
106+
"redirect_document_id": true
107+
},
108+
{
109+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/sql-vm-resource-provider-bulk-register.md",
110+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/sql-agent-extension-manually-register-vms-bulk",
111+
"redirect_document_id": true
112+
},
113+
{
114+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/index.yml",
115+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/sql-server-on-azure-vm-iaas-what-is-overview",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/sql-vulnerability-assessment-enable.md",
120+
"redirect_url": "/azure/security-center/defender-for-sql-on-machines-vulnerability-assessment",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/articles/azure-sql/database/machine-learning-services-add-r-packages.md",
125+
"redirect_url": "/sql/machine-learning/package-management/install-additional-r-packages-on-sql-server?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path_from_root": "/articles/azure-sql/database/r-script-create-quickstart.md",
130+
"redirect_url": "/sql/machine-learning/tutorials/quickstart-r-create-script?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path_from_root": "/articles/azure-sql/database/machine-learning-services-data-issues.md",
135+
"redirect_url": "/sql/machine-learning/tutorials/quickstart-r-data-types-and-objects?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path_from_root": "/articles/azure-sql/database/machine-learning-services-functions.md",
140+
"redirect_url": "/sql/machine-learning/tutorials/quickstart-r-functions?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path_from_root": "/articles/azure-sql/database/r-train-score-model-create-quickstart.md",
145+
"redirect_url": "/sql/machine-learning/tutorials/quickstart-r-train-score-model?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path_from_root": "/articles/azure-sql/database/clustering-model-build-tutorial.md",
150+
"redirect_url": "/sql/machine-learning/tutorials/r-clustering-model-build?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path_from_root": "/articles/azure-sql/database/clustering-model-deploy-tutorial.md",
155+
"redirect_url": "/sql/machine-learning/tutorials/r-clustering-model-deploy?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path_from_root": "/articles/azure-sql/database/clustering-model-prepare-data-tutorial.md",
160+
"redirect_url": "/sql/machine-learning/tutorials/r-clustering-model-introduction?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path_from_root": "/articles/azure-sql/database/predictive-model-deploy-tutorial.md",
165+
"redirect_url": "/sql/machine-learning/tutorials/r-predictive-model-deploy?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path_from_root": "/articles/azure-sql/database/predictive-model-prepare-data-tutorial.md",
170+
"redirect_url": "/sql/machine-learning/tutorials/r-predictive-model-introduction?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
171+
"redirect_document_id": false
172+
},
173+
{
174+
"source_path_from_root": "/articles/azure-sql/database/predictive-model-build-compare-tutorial.md",
175+
"redirect_url": "/sql/machine-learning/tutorials/r-predictive-model-train?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
176+
"redirect_document_id": false
177+
},
178+
{
179+
"source_path_from_root": "/articles/azure-sql/database/job-automation-managed-instances.md",
180+
"redirect_url": "/azure/azure-sql/managed-instance/job-automation-managed-instance",
181+
"redirect_document_id": true
182+
}
183+
]
184+
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/defender-for-cloud/release-notes",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/security-center/upcoming-changes.md",
10+
"redirect_url": "/azure/defender-for-cloud/upcoming-changes",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/security-center/release-notes-archive.md",
1015
"redirect_url": "/azure/defender-for-cloud/release-notes-archive",
@@ -644,6 +649,16 @@
644649
"source_path_from_root": "/articles/security-center/workload-protections-dashboard.md",
645650
"redirect_url": "/azure/defender-for-cloud/workload-protections-dashboard",
646651
"redirect_document_id": true
652+
},
653+
{
654+
"source_path_from_root": "/articles/defender-for-cloud/container-security.md",
655+
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-introduction",
656+
"redirect_document_id": true
657+
},
658+
{
659+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-kubernetes-azure-arc.md",
660+
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-enable?pivots=defender-for-container-arc#protect-arc-enabled-kubernetes-clusters",
661+
"redirect_document_id": true
647662
}
648663
]
649664
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222
},
2323
{
2424
"source_path_from_root": "/articles/defender-for-iot/quickstart-system-prerequisites.md",
25-
"redirect_url": "/azure/defender-for-iot/organizations/quickstart-system-prerequisites",
25+
"redirect_url": "/azure/defender-for-iot/organizations/getting-started",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/azure/defender-for-iot/organizations/quickstart-system-prerequisites.md",
30+
"redirect_url": "/azure/defender-for-iot/organizations/getting-started",
2631
"redirect_document_id": false
2732
},
2833
{

0 commit comments

Comments
 (0)