Skip to content

Commit 237e00a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into 22.3.6-sensor
2 parents ec71b45 + 48dba3c commit 237e00a

File tree

3,505 files changed

+50087
-114499
lines changed

Some content is hidden

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

3,505 files changed

+50087
-114499
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,12 @@
913913
"url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
914914
"branch": "main",
915915
"branch_mapping": {}
916+
},
917+
{
918+
"path_to_root": "azure-cache-redis-samples",
919+
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
920+
"branch": "main",
921+
"branch_mapping": {}
916922
}
917923
],
918924
"branch_target_mapping": {

.openpublishing.redirection.active-directory.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
7676
"redirect_document_id": false
7777
},
78+
{
79+
"source_path_from_root": "/articles/active-directory/saas-apps/usertesting-tutorial.md",
80+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
81+
"redirect_document_id": false
82+
},
7883
{
7984
"source_path_from_root": "/articles/active-directory/saas-apps/otsuka-shokai-tutorial.md",
8085
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -4405,7 +4410,7 @@
44054410
"source_path_from_root": "/articles/active-directory/reports-monitoring/recommendations-integrate-third-party-apps.md",
44064411
"redirect_url": "/azure/active-directory/reports-monitoring/overview-recommendations",
44074412
"redirect_document_id": false
4408-
},
4413+
},
44094414
{
44104415
"source_path_from_root": "/articles/active-directory/reports-monitoring/workbook-legacy authentication.md",
44114416
"redirect_url": "/azure/active-directory/reports-monitoring/workbook-legacy-authentication",

.openpublishing.redirection.azure-monitor.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,21 @@
3535
"redirect_url": "/azure/azure-monitor/change/change-analysis",
3636
"redirect_document_id": false
3737
},
38+
{
39+
"source_path_from_root": "/articles/azure-monitor/app/resource-manager-web-app.md",
40+
"redirect_url": "/previous-versions/azure/azure-monitor/app/resource-manager-web-app",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-monitor/app/resource-manager-function-app.md",
45+
"redirect_url": "/previous-versions/azure/azure-monitor/app/resource-manager-function-app",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/azure-monitor/app/web-app-extension-release-notes.md",
50+
"redirect_url": "/azure/azure-monitor/app/azure-web-apps",
51+
"redirect_document_id": false
52+
},
3853
{
3954
"source_path_from_root": "/articles/azure-monitor/app/visual-studio.md",
4055
"redirect_url": "https://learn.microsoft.com/visualstudio/azure/azure-app-insights-add-connected-service",

.openpublishing.redirection.azure-percept.json

Lines changed: 295 additions & 5 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.healthcare-apis.json

Lines changed: 677 additions & 668 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.json

Lines changed: 22421 additions & 22056 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.virtual-desktop.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,41 @@
134134
"source_path_from_root": "/articles/virtual-desktop/powershell-module.md",
135135
"redirect_url": "/azure/virtual-desktop/cli-powershell",
136136
"redirect_document_id": true
137+
},
138+
{
139+
"source_path_from_root": "/articles/virtual-desktop/deploy-azure-ad-joined-vm.md",
140+
"redirect_url": "/azure/virtual-desktop/azure-ad-joined-session-hosts",
141+
"redirect_document_id": true
142+
},
143+
{
144+
"source_path_from_root": "/articles/virtual-desktop/configure-vm-gpu.md",
145+
"redirect_url": "/azure/virtual-desktop/enable-gpu-acceleration",
146+
"redirect_document_id": true
147+
},
148+
{
149+
"source_path_from_root": "/articles/virtual-desktop/create-validation-host-pool.md",
150+
"redirect_url": "/azure/virtual-desktop/configure-validation-environment",
151+
"redirect_document_id": true
152+
},
153+
{
154+
"source_path_from_root": "/articles/virtual-desktop/expand-existing-host-pool.md",
155+
"redirect_url": "/azure/virtual-desktop/add-session-hosts-host-pool",
156+
"redirect_document_id": true
157+
},
158+
{
159+
"source_path_from_root": "/articles/virtual-desktop/create-host-pools-azure-marketplace.md",
160+
"redirect_url": "/azure/virtual-desktop/create-host-pool",
161+
"redirect_document_id": true
162+
},
163+
{
164+
"source_path_from_root": "/articles/virtual-desktop/create-host-pools-powershell.md",
165+
"redirect_url": "/azure/virtual-desktop/create-host-pool",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path_from_root": "/articles/virtual-desktop/deploy-windows-server-virtual-machine.md",
170+
"redirect_url": "/azure/virtual-desktop/add-session-hosts-host-pool",
171+
"redirect_document_id": false
137172
}
138173
]
139174
}

articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
href: identity-provider-microsoft-account.md
363363
- name: Mobile ID
364364
href: identity-provider-mobile-id.md
365-
- name: PingOne (PingIdentity)
365+
- name: PingOne (Ping Identity)
366366
href: identity-provider-ping-one.md
367367
displayName: Ping identity
368368
- name: QQ

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ Content-type: application/json
331331
{
332332
"version": "1.0.0",
333333
"action": "ShowBlockPage",
334-
"userMessage": "There was a problem with your request. You are not able to sign up at this time.",
334+
"userMessage": "There was a problem with your request. You are not able to sign up at this time. Please contact your system administrator",
335335
}
336336
337337
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ You typically use only one identity provider in your applications, but you have
4444
* [LinkedIn](identity-provider-linkedin.md)
4545
* [Microsoft Account](identity-provider-microsoft-account.md)
4646
* [Mobile ID](identity-provider-mobile-id.md)
47-
* [PingOne](identity-provider-ping-one.md) (PingIdentity)
47+
* [PingOne](identity-provider-ping-one.md) (Ping Identity)
4848
* [QQ](identity-provider-qq.md)
4949
* [Salesforce](identity-provider-salesforce.md)
5050
* [Salesforce (SAML protocol)](identity-provider-salesforce-saml.md)

0 commit comments

Comments
 (0)