Skip to content

Commit ccb23f5

Browse files
authored
Merge branch 'MicrosoftDocs:main' into Broken-link-sidandrews
2 parents 390cfb9 + 5ef239d commit ccb23f5

File tree

1,123 files changed

+9663
-8748
lines changed

Some content is hidden

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

1,123 files changed

+9663
-8748
lines changed

.openpublishing.publish.config.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,13 +948,15 @@
948948
},
949949
"redirection_files": [
950950
".openpublishing.redirection.json",
951+
".openpublishing.redirection.azure-arc-data.json",
951952
".openpublishing.redirection.active-directory.json",
952953
".openpublishing.redirection.azure-blob.json",
953954
"articles/data-factory/.openpublishing.redirection.data-factory.json",
954955
".openpublishing.redirection.defender-for-cloud.json",
955956
".openpublishing.redirection.defender-for-iot.json",
956957
".openpublishing.redirection.healthcare-apis.json",
957958
".openpublishing.redirection.iot-hub.json",
959+
".openpublishing.redirection.app-service.json",
958960
".openpublishing.redirection.key-vault.json",
959961
".openpublishing.redirection.sql-database.json",
960962
".openpublishing.redirection.security-benchmark.json",
@@ -997,6 +999,7 @@
997999
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
9981000
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
9991001
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
1000-
"articles/machine-learning/.openpublishing.redirection.machine-learning.json"
1002+
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1003+
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
10011004
]
10021005
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/app-service-web/web-sites-restore.md",
5+
"redirect_url": "/azure/app-service/manage-backup",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/app-service/web-sites-restore.md",
10+
"redirect_url": "/azure/app-service/manage-backup",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/app-service/app-service-web-restore-snapshots.md",
15+
"redirect_url": "/azure/app-service/manage-backup",
16+
"redirect_document_id": false
17+
}
18+
]
19+
}
Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-arc/data/deploy-byok-active-directory-connector.md",
5+
"redirect_url": "/azure/azure-arc/data/deploy-customer-managed-keytab-active-directory-connector",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-dag.md",
10+
"redirect_url": "/cli/azure/sql/instance-failover-group-arc",
11+
"redirect_document_id":false
12+
},
13+
{
14+
"source_path_from_root": "/articles/azure-arc/data/retrieve-the-username-password-for-data-controller.md",
15+
"redirect_url": "/azure/azure-arc/data/update-service-principal-credentials",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/azure-arc/data/create-aks-cluster-data-controller.md",
20+
"redirect_url": "/azure/azure-arc/data/create-complete-managed-instance-indirectly-connected",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/azure-arc/data/how-to-apply-security-context-constraint.md",
25+
"redirect_url": "/azure/azure-arc/data",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/azure-arc/data/deploy-data-controller-direct-mode-prerequisites.md",
30+
"redirect_url": "/azure/azure-arc/data/create-data-controller-direct-cli",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/azure-arc/data/deploy-data-controller-direct-mode.md",
35+
"redirect_url": "/azure/azure-arc/data/create-data-controller-direct-cli",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller.md",
40+
"redirect_url": "/azure/azure-arc/data/plan-azure-arc-data-services",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-azure-data-studio.md",
45+
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-azure-data-studio",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/azure-arc/data/data-controller-resource-in-azure-portal.md",
50+
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-azure-portal",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-cli.md",
55+
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-cli",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-azdata.md",
60+
"redirect_url": "/azure/azure-arc/data/create-data-controller-using-cli",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/azure-arc/data/scale-out-postgresql-hyperscale-server-group.md",
65+
"redirect_url": "/azure/azure-arc/data/scale-out-in-postgresql-hyperscale-server-group",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/azure-arc/data/known-issues.md",
70+
"redirect_url": "/azure/azure-arc/data/release-notes",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/azure-arc/data/reference/overview.md",
75+
"redirect_url": "/azure/azure-arc/data/reference/reference-az-arcdata",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-k8s-native-tools.md",
80+
"redirect_url": "/azure/azure-arc/data/create-data-controller-using-kubernetes-native-tools",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-k8s-native-tools.md",
85+
"redirect_url": "/azure/azure-arc/data/create-postgresql-hyperscale-server-group-kubernetes-native-tools",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path_from_root": "/articles/azure-arc/data/create-sql-managed-instance-using-k8s-native-tools.md",
90+
"redirect_url": "/azure/azure-arc/data/create-sql-managed-instance-using-kubernetes-native-tools",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata.md",
95+
"redirect_url": "/cli/azure/arcdata",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-ad-connector.md",
100+
"redirect_url": "/cli/azure/arcdata",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc.md",
105+
"redirect_url": "/cli/azure/arcdata/dc",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-config.md",
110+
"redirect_url": "/cli/azure/arcdata/dc/config",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-debug.md",
115+
"redirect_url": "/cli/azure/arcdata/dc/debug",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-endpoint.md",
120+
"redirect_url": "/cli/azure/arcdata/dc/debug",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-status.md",
125+
"redirect_url": "/cli/azure/arcdata/dc/status",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-resource-kind.md",
130+
"redirect_url": "/cli/azure/arcdata/resource-kind",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-postgres-arc-server.md",
135+
"redirect_url": "/cli/azure/postgres/arc-server",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-postgres-arc-server-endpoint.md",
140+
"redirect_url": "/cli/azure/postgres/arc-server/endpoint",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-instance-failover-group-arc.md",
145+
"redirect_url": "/cli/azure/sql/instance-failover-group-arc",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc.md",
150+
"redirect_url": "/cli/azure/sql/mi-arc",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-config.md",
155+
"redirect_url": "/cli/azure/sql/mi-arc/config",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-endpoint.md",
160+
"redirect_url": "/cli/azure/sql/mi-arc/endpoint",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-midb-arc.md",
165+
"redirect_url": "/cli/azure/sql/midb-arc",
166+
"redirect_document_id": false
167+
}
168+
]
169+
}

.openpublishing.redirection.json

Lines changed: 21 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -4955,11 +4955,6 @@
49554955
"redirect_url": "/azure/app-service/web-sites-monitor",
49564956
"redirect_document_id": false
49574957
},
4958-
{
4959-
"source_path_from_root": "/articles/app-service-web/web-sites-restore.md",
4960-
"redirect_url": "/azure/app-service/web-sites-restore",
4961-
"redirect_document_id": false
4962-
},
49634958
{
49644959
"source_path_from_root": "/articles/app-service-web/web-sites-traffic-manager.md",
49654960
"redirect_url": "/azure/app-service/web-sites-traffic-manager",
@@ -6031,96 +6026,6 @@
60316026
"redirect_url": "/azure/azure-app-configuration/quickstart-azure-functions-csharp",
60326027
"redirect_document_id": false
60336028
},
6034-
{
6035-
"source_path_from_root": "/articles/azure-arc/data/deploy-byok-active-directory-connector.md",
6036-
"redirect_url": "/azure/azure-arc/data/deploy-customer-managed-keytab-active-directory-connector",
6037-
"redirect_document_id": false
6038-
},
6039-
{
6040-
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-dag.md",
6041-
"redirect_url": "/azure/azure-arc/data/reference/reference-az-sql-instance-failover-group-arc",
6042-
"redirect_document_id":true
6043-
},
6044-
{
6045-
"source_path_from_root": "/articles/azure-arc/data/retrieve-the-username-password-for-data-controller.md",
6046-
"redirect_url": "/azure/azure-arc/data/update-service-principal-credentials",
6047-
"redirect_document_id": false
6048-
},
6049-
{
6050-
"source_path_from_root": "/articles/azure-arc/data/create-aks-cluster-data-controller.md",
6051-
"redirect_url": "/azure/azure-arc/data/create-complete-managed-instance-indirectly-connected",
6052-
"redirect_document_id": false
6053-
},
6054-
{
6055-
"source_path_from_root": "/articles/azure-arc/data/how-to-apply-security-context-constraint.md",
6056-
"redirect_url": "/azure/azure-arc/data",
6057-
"redirect_document_id": false
6058-
},
6059-
{
6060-
"source_path_from_root": "/articles/azure-arc/data/deploy-data-controller-direct-mode-prerequisites.md",
6061-
"redirect_url": "/azure/azure-arc/data/create-data-controller-direct-cli",
6062-
"redirect_document_id": false
6063-
},
6064-
{
6065-
"source_path_from_root": "/articles/azure-arc/data/deploy-data-controller-direct-mode.md",
6066-
"redirect_url": "/azure/azure-arc/data/create-data-controller-direct-cli",
6067-
"redirect_document_id": false
6068-
},
6069-
{
6070-
"source_path_from_root": "/articles/azure-arc/data/create-data-controller.md",
6071-
"redirect_url": "/azure/azure-arc/data/plan-azure-arc-data-services",
6072-
"redirect_document_id": false
6073-
},
6074-
{
6075-
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-azure-data-studio.md",
6076-
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-azure-data-studio",
6077-
"redirect_document_id": false
6078-
},
6079-
{
6080-
"source_path_from_root": "/articles/azure-arc/data/data-controller-resource-in-azure-portal.md",
6081-
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-azure-portal",
6082-
"redirect_document_id": false
6083-
},
6084-
{
6085-
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-cli.md",
6086-
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-cli",
6087-
"redirect_document_id": false
6088-
},
6089-
{
6090-
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-azdata.md",
6091-
"redirect_url": "/azure/azure-arc/data/create-data-controller-using-cli",
6092-
"redirect_document_id": false
6093-
},
6094-
{
6095-
"source_path_from_root": "/articles/azure-arc/data/scale-out-postgresql-hyperscale-server-group.md",
6096-
"redirect_url": "/azure/azure-arc/data/scale-out-in-postgresql-hyperscale-server-group",
6097-
"redirect_document_id": false
6098-
},
6099-
{
6100-
"source_path_from_root": "/articles/azure-arc/data/known-issues.md",
6101-
"redirect_url": "/azure/azure-arc/data/release-notes",
6102-
"redirect_document_id": false
6103-
},
6104-
{
6105-
"source_path_from_root": "/articles/azure-arc/data/reference/overview.md",
6106-
"redirect_url": "/azure/azure-arc/data/reference/reference-az-arcdata",
6107-
"redirect_document_id": false
6108-
},
6109-
{
6110-
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-k8s-native-tools.md",
6111-
"redirect_url": "/azure/azure-arc/data/create-data-controller-using-kubernetes-native-tools",
6112-
"redirect_document_id": false
6113-
},
6114-
{
6115-
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-k8s-native-tools.md",
6116-
"redirect_url": "/azure/azure-arc/data/create-postgresql-hyperscale-server-group-kubernetes-native-tools",
6117-
"redirect_document_id": false
6118-
},
6119-
{
6120-
"source_path_from_root": "/articles/azure-arc/data/create-sql-managed-instance-using-k8s-native-tools.md",
6121-
"redirect_url": "/azure/azure-arc/data/create-sql-managed-instance-using-kubernetes-native-tools",
6122-
"redirect_document_id": false
6123-
},
61246029
{
61256030
"source_path_from_root": "/articles/azure-arc/kubernetes/policy-samples.md",
61266031
"redirect_url": "/azure/azure-arc/kubernetes/policy-reference",
@@ -40271,6 +40176,26 @@
4027140176
"source_path_from_root": "/articles/private-link/private-endpoint-static-ip-powershell.md",
4027240177
"redirect_url": "/azure/private-link/create-private-endpoint-powershell",
4027340178
"redirect_document_id": true
40274-
}
40179+
},
40180+
{
40181+
"source_path_from_root": "/articles/azure-monitor/insights/sql-insights-alerts.md",
40182+
"redirect_url": "/azure/azure-sql/database/sql-insights-alerts",
40183+
"redirect_document_id": false
40184+
},
40185+
{
40186+
"source_path_from_root": "/articles/azure-monitor/insights/sql-insights-enable.md",
40187+
"redirect_url": "/azure/azure-sql/database/sql-insights-enable",
40188+
"redirect_document_id": false
40189+
},
40190+
{
40191+
"source_path_from_root": "/articles/azure-monitor/insights/sql-insights-overview.md",
40192+
"redirect_url": "/azure/azure-sql/database/sql-insights-overview",
40193+
"redirect_document_id": false
40194+
},
40195+
{
40196+
"source_path_from_root": "/articles/azure-monitor/insights/sql-insights-troubleshoot.md",
40197+
"redirect_url": "/azure/azure-sql/database/sql-insights-troubleshoot",
40198+
"redirect_document_id": false
40199+
}
4027540200
]
4027640201
}

articles/active-directory-b2c/add-api-connector.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Content-type: application/json
7272
}
7373
],
7474
"displayName": "John Smith",
75-
"objectId": "11111111-0000-0000-0000-000000000000"
75+
"objectId": "11111111-0000-0000-0000-000000000000",
7676
"givenName":"John",
7777
"surname":"Smith",
7878
"jobTitle":"Supplier",

articles/active-directory-b2c/add-identity-provider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ You typically use only one identity provider in your applications, but you have
4848
* [QQ](identity-provider-qq.md)
4949
* [Salesforce](identity-provider-salesforce.md)
5050
* [Salesforce (SAML protocol)](identity-provider-salesforce-saml.md)
51-
* [SwissID]( identity-provider-swissid.md)
51+
* [SwissID](identity-provider-swissid.md)
5252
* [Twitter](identity-provider-twitter.md)
5353
* [WeChat](identity-provider-wechat.md)
5454
* [Weibo](identity-provider-weibo.md)

articles/active-directory-b2c/app-registrations-training-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ You can also use this option to use Azure AD B2C as a SAML service provider. [L
6363

6464
## Applications for DevOps scenarios
6565

66-
You can use the other account types to create an app to manage your DevOps scenarios, like using Microsoft Graph to upload Identity Experience Framework policies or provision users. Learn [how register a Microsoft Graph application to manage Azure AD B2C resources](microsoft-graph-get-started.md).
66+
You can use the other account types to create an app to manage your DevOps scenarios, like using Microsoft Graph to upload Identity Experience Framework policies or provision users. Learn [how to register a Microsoft Graph application to manage Azure AD B2C resources](microsoft-graph-get-started.md).
6767

6868
You might not see all Microsoft Graph permissions, because many of these permissions don't apply to Azure B2C consumer users. [Read more about managing users using Microsoft Graph](microsoft-graph-operations.md).
6969

@@ -112,6 +112,6 @@ To get started with the new app registration experience:
112112
* Learn [how to register a web application](tutorial-register-applications.md).
113113
* Learn [how to register a web API](add-web-api-application.md).
114114
* Learn [how to register a native client application](add-native-application.md).
115-
* Learn [how register a Microsoft Graph application to manage Azure AD B2C resources](microsoft-graph-get-started.md).
115+
* Learn [how to register a Microsoft Graph application to manage Azure AD B2C resources](microsoft-graph-get-started.md).
116116
* Learn [how to use Azure AD B2C as a SAML Service Provider.](identity-provider-adfs.md)
117117
* Learn about [application types](application-types.md).

0 commit comments

Comments
 (0)