Skip to content

Commit 79617d1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into WI147804-mdc-m365
2 parents 7260f3d + 70160f0 commit 79617d1

File tree

3,675 files changed

+110789
-28661
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,675 files changed

+110789
-28661
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,6 +1210,7 @@
12101210
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
12111211
"articles/iot/.openpublishing.redirection.iot.json",
12121212
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
1213+
"articles/iot-operations/.openpublishing.redirection.iot-operations.json",
12131214
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
12141215
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
12151216
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",

.openpublishing.redirection.api-management.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/api-management/authorizations-overview.md",
5+
"redirect_url": "/azure/api-management/credentials-overview",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/api-management/authorizations-configure-common-providers.md",
10+
"redirect_url": "/azure/api-management/credentials-configure-common-providers",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/api-management/configure-authorization-connection.md",
15+
"redirect_url": "/azure/api-management/configure-credential-connection",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/api-management/authorizations-how-to-azure-ad.md",
20+
"redirect_url": "/azure/api-management/credentials-how-to-azure-ad",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/api-management/authorizations-how-to-github.md",
25+
"redirect_url": "/azure/api-management/credentials-how-to-github",
26+
"redirect_document_id": false
27+
},
328
{
429
"source_path_from_root": "/articles/api-management/powershell-samples.md",
530
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",

.openpublishing.redirection.app-service.json

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,96 @@
5454
"source_path_from_root": "/articles/app-service/networking/private-endpoint.md",
5555
"redirect_url": "/azure/app-service/overview-private-endpoint",
5656
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/app-service/scripts/cli-deploy-ftp.md",
60+
"redirect_url": "/azure/app-service/samples-cli",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/app-service/scripts/cli-deploy-github.md",
65+
"redirect_url": "/azure/app-service/samples-cli",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/app-service/scripts/cli-continuous-deployment-github.md",
70+
"redirect_url": "/azure/app-service/samples-cli",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/app-service/scripts/cli-deploy-local-git.md",
75+
"redirect_url": "/azure/app-service/samples-cli",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/app-service/scripts/cli-deploy-staging-environment.md",
80+
"redirect_url": "/azure/app-service/samples-cli",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path_from_root": "/articles/app-service/scripts/cli-linux-docker-aspnetcore.md",
85+
"redirect_url": "/azure/app-service/samples-cli",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path_from_root": "/articles/app-service/scripts/cli-deploy-privateendpoint.md",
90+
"redirect_url": "/azure/app-service/samples-cli",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path_from_root": "/articles/app-service/scripts/cli-configure-custom-domain.md",
95+
"redirect_url": "/azure/app-service/samples-cli",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path_from_root": "/articles/app-service/scripts/cli-configure-ssl-certificate.md",
100+
"redirect_url": "/azure/app-service/samples-cli",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path_from_root": "/articles/app-service/scripts/cli-scale-manual.md",
105+
"redirect_url": "/azure/app-service/samples-cli",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path_from_root": "/articles/app-service/scripts/cli-scale-high-availability.md",
110+
"redirect_url": "/azure/app-service/samples-cli",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path_from_root": "/articles/app-service/scripts/cli-integrate-app-service-with-application-gateway.md",
115+
"redirect_url": "/azure/app-service/samples-cli",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path_from_root": "/articles/app-service/scripts/cli-connect-to-sql.md",
120+
"redirect_url": "/azure/app-service/samples-cli",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/articles/app-service/scripts/cli-connect-to-storage.md",
125+
"redirect_url": "/azure/app-service/samples-cli",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path_from_root": "/articles/app-service/scripts/cli-connect-to-redis.md",
130+
"redirect_url": "/azure/app-service/samples-cli",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path_from_root": "/articles/app-service/scripts/cli-connect-to-documentdb.md",
135+
"redirect_url": "/azure/app-service/samples-cli",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path_from_root": "/articles/app-service/scripts/cli-backup-schedule-restore.md",
140+
"redirect_url": "/azure/app-service/samples-cli",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path_from_root": "/articles/app-service/scripts/cli-monitor.md",
145+
"redirect_url": "/azure/app-service/samples-cli",
146+
"redirect_document_id": false
57147
}
58148
]
59149
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6384,6 +6384,11 @@
63846384
"redirect_url": "/azure/azure-monitor/app/overview-dashboard#create-custom-kpi-dashboards-using-application-insights",
63856385
"redirect_document_id": false
63866386
},
6387+
{
6388+
"source_path_from_root": "/articles/azure-monitor/app/sampling.md",
6389+
"redirect_url": "/previous-versions/azure/azure-monitor/app/sampling",
6390+
"redirect_document_id": false
6391+
},
63876392
{
63886393
"source_path_from_root": "/articles/azure-monitor/app/tutorial-asp-net-core.md",
63896394
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-asp-net-core",

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

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,40 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-cloud/tutorial-security-policy.md",
5+
"redirect_url": "/azure/defender-for-cloud/security-policy-concept",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/defender-for-cloud/how-to-manage-aws-assessments-standards.md",
10+
"redirect_url": "/azure/defender-for-cloud/create-custom-recommendations",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/defender-for-cloud/how-to-manage-gcp-assessments-standards.md",
15+
"redirect_url": "/azure/defender-for-cloud/create-custom-recommendations",
16+
"redirect_document_id": false
17+
},
318
{
419
"source_path_from_root": "/articles/security-center/release-notes.md",
520
"redirect_url": "/azure/defender-for-cloud/release-notes",
621
"redirect_document_id": false
722
},
23+
{
24+
"source_path_from_root": "/articles/defender-for-cloud/concept-credential-scanner-rules.md",
25+
"redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/defender-for-cloud/concept-devops-posture-management-overview.md",
30+
"redirect_url": "/azure/defender-for-cloud/concept-devops-environment-posture-management-overview",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/defender-for-cloud/detect-exposed-secrets.md",
35+
"redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
36+
"redirect_document_id": false
37+
},
838
{
939
"source_path_from_root": "/articles/security-center/upcoming-changes.md",
1040
"redirect_url": "/azure/defender-for-cloud/upcoming-changes",
@@ -707,8 +737,8 @@
707737
},
708738
{
709739
"source_path_from_root": "/articles/defender-for-cloud/defender-for-container-registries-cicd.md",
710-
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-cicd",
711-
"redirect_document_id": true
740+
"redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
741+
"redirect_document_id": false
712742
},
713743
{
714744
"source_path_from_root": "/articles/defender-for-cloud/defender-for-container-registries-usage.md",
@@ -738,7 +768,7 @@
738768
{
739769
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-cicd.md",
740770
"redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
741-
"redirect_document_id": true
771+
"redirect_document_id": false
742772
},
743773
{
744774
"source_path_from_root": "/articles/defender-for-cloud/tutorial-enable-pull-request-annotations.md",
@@ -752,8 +782,8 @@
752782
},
753783
{
754784
"source_path_from_root": "/articles/defender-for-cloud/detect-credential-leaks.md",
755-
"redirect_url": "/azure/defender-for-cloud/detect-exposed-secrets",
756-
"redirect_document_id": true
785+
"redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
786+
"redirect_document_id": false
757787
},
758788
{
759789
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-ecr.md",
@@ -845,6 +875,11 @@
845875
"redirect_url": "/azure/defender-for-cloud/defender-for-dns-introduction",
846876
"redirect_document_id": true
847877
},
878+
{
879+
"source_path_from_root": "/articles/defender-for-cloud/support-agentless-containers-posture.md",
880+
"redirect_url": "/azure/defender-for-cloud/support-matrix-defender-for-containers",
881+
"redirect_document_id": false
882+
},
848883
{
849884
"source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
850885
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",

.openpublishing.redirection.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -870,6 +870,11 @@
870870
"redirect_url": "/azure/azure-arc/vmware-vsphere/switch-to-new-version-vmware",
871871
"redirect_document_id": false
872872
},
873+
{
874+
"source_path": "articles/azure-arc/vmware-vsphere/switch-to-new-version-vmware.md",
875+
"redirect_url": "/azure/azure-arc/vmware-vsphere/switch-to-new-version",
876+
"redirect_document_id": false
877+
},
873878
{
874879
"source_path": "articles/active-directory/azuread-dev/active-directory-authentication-libraries.md",
875880
"redirect_url": "/previous-versions/azure/active-directory/azuread-dev/active-directory-authentication-libraries",
@@ -1005,6 +1010,11 @@
10051010
"redirect_URL": "bicep-import",
10061011
"redirect_document_id": false
10071012
},
1013+
{
1014+
"source_path": "articles/azure-arc/system-center-virtual-machine-manager/switch-to-the-new-preview-version.md",
1015+
"redirect_URL": "/azure/azure-arc/system-center-virtual-machine-manager/switch-to-the-new-preview-version-scvmm",
1016+
"redirect_document_id": false
1017+
},
10081018
{
10091019
"source_path": "articles/migrate/tutorial-assess-webapps-physical.md",
10101020
"redirect_URL": "tutorial-assess-webapps",
@@ -25710,6 +25720,10 @@
2571025720
"source_path_from_root": "/articles/operator-service-manager/overview.md",
2571125721
"redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",
2571225722
"redirect_document_id": false
25723+
},
25724+
{
25725+
"source_path_from_root": "/articles/kubernetes-fleet/configuration-propagation.md",
25726+
"redirect_url": "/azure/kubernetes-fleet/resource-propagation"
2571325727
}
2571425728
]
2571525729
}

.openpublishing.redirection.virtual-desktop.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,11 @@
219219
"source_path_from_root": "/articles/virtual-desktop/tutorial-create-connect-personal-desktop.md",
220220
"redirect_url": "/azure/virtual-desktop/tutorial-try-deploy-windows-11-desktop",
221221
"redirect_document_id": true
222+
},
223+
{
224+
"source_path_from_root": "/articles/virtual-desktop/azure-stack-hci.md",
225+
"redirect_url": "/azure/virtual-desktop/deploy-azure-virtual-desktop",
226+
"redirect_document_id": false
222227
}
223228
]
224229
}

articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
items:
6666
- name: Compare solutions for External Identities
6767
href: /entra/external-id/external-identities-overview?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
68-
- name: Supported Microsoft Entra features
68+
- name: Supported Microsoft Entra ID features
6969
href: supported-azure-ad-features.md
7070
- name: Learn authentication basics
7171
items:

articles/active-directory-b2c/aad-sspr-technical-profile.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: Microsoft Entra SSPR technical profiles in custom policies
2+
title: Microsoft Entra ID SSPR technical profiles in custom policies
33
titleSuffix: Azure AD B2C
4-
description: Custom policy reference for Microsoft Entra SSPR technical profiles in Azure AD B2C.
4+
description: Custom policy reference for Microsoft Entra ID SSPR technical profiles in Azure AD B2C.
55
services: active-directory-b2c
66
author: kengaderdus
77
manager: CelesteDG
@@ -15,11 +15,11 @@ ms.author: kengaderdus
1515
ms.subservice: B2C
1616
---
1717

18-
# Define a Microsoft Entra SSPR technical profile in an Azure AD B2C custom policy
18+
# Define a Microsoft Entra ID SSPR technical profile in an Azure AD B2C custom policy
1919

2020
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
2121

22-
Azure Active Directory B2C (Azure AD B2C) provides support for verifying an email address for self-service password reset (SSPR). Use the Microsoft Entra SSPR technical profile to generate and send a code to an email address, and then verify the code. The Microsoft Entra SSPR technical profile may also return an error message. The validation technical profile validates the user-provided data before the user journey continues. With the validation technical profile, an error message displays on a self-asserted page.
22+
Azure Active Directory B2C (Azure AD B2C) provides support for verifying an email address for self-service password reset (SSPR). Use the Microsoft Entra ID SSPR technical profile to generate and send a code to an email address, and then verify the code. The Microsoft Entra ID SSPR technical profile may also return an error message. The validation technical profile validates the user-provided data before the user journey continues. With the validation technical profile, an error message displays on a self-asserted page.
2323

2424
This technical profile:
2525

@@ -35,7 +35,7 @@ The **Name** attribute of the **Protocol** element needs to be set to `Proprieta
3535
Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
3636
```
3737

38-
The following example shows a Microsoft Entra SSPR technical profile:
38+
The following example shows a Microsoft Entra ID SSPR technical profile:
3939

4040
```xml
4141
<TechnicalProfile Id="AadSspr-SendCode">
@@ -81,7 +81,7 @@ The following metadata can be used to configure the error messages displayed upo
8181

8282
### Example: send an email
8383

84-
The following example shows a Microsoft Entra SSPR technical profile that is used to send a code via email.
84+
The following example shows a Microsoft Entra ID SSPR technical profile that is used to send a code via email.
8585

8686
```xml
8787
<TechnicalProfile Id="AadSspr-SendCode">
@@ -137,7 +137,7 @@ The following metadata can be used to configure the error messages displayed upo
137137

138138
### Example: verify a code
139139

140-
The following example shows a Microsoft Entra SSPR technical profile used to verify the code.
140+
The following example shows a Microsoft Entra ID SSPR technical profile used to verify the code.
141141

142142
```xml
143143
<TechnicalProfile Id="AadSspr-VerifyCode">

articles/active-directory-b2c/active-directory-technical-profile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.workload: identity
1111
ms.custom: build-2023
1212
ms.topic: reference
13-
ms.date: 12/29/2022
13+
ms.date: 11/06/2023
1414
ms.author: kengaderdus
1515
ms.reviewer: yoelhor
1616
ms.subservice: B2C
@@ -252,7 +252,7 @@ The following technical profile deletes a social user account using **alternativ
252252
| --------- | -------- | ----------- |
253253
| Operation | Yes | The operation to be performed. Possible values: `Read`, `Write`, `DeleteClaims`, or `DeleteClaimsPrincipal`. |
254254
| RaiseErrorIfClaimsPrincipalDoesNotExist | No | Raise an error if the user object does not exist in the directory. Possible values: `true` or `false`. |
255-
| RaiseErrorIfClaimsPrincipalAlreadyExists | No | Raise an error if the user object already exists. Possible values: `true` or `false`.|
255+
| RaiseErrorIfClaimsPrincipalAlreadyExists | No | Raise an error if the user object already exists. Possible values: `true` or `false`. This metadata is applicable only for the Write operation.|
256256
| ApplicationObjectId | No | The application object identifier for extension attributes. Value: ObjectId of an application. For more information, see [Use custom attributes](user-flow-custom-attributes.md?pivots=b2c-custom-policy). |
257257
| ClientId | No | The client identifier for accessing the tenant as a third party. For more information, see [Use custom attributes in a custom profile edit policy](user-flow-custom-attributes.md?pivots=b2c-custom-policy) |
258258
| IncludeClaimResolvingInClaimsHandling  | No | For input and output claims, specifies whether [claims resolution](claim-resolver-overview.md) is included in the technical profile. Possible values: `true`, or `false` (default). If you want to use a claims resolver in the technical profile, set this to `true`. |

0 commit comments

Comments
 (0)