Skip to content

Commit 1891dd1

Browse files
authored
Merge branch 'MicrosoftDocs:main' into patch-38
2 parents fed9dd6 + baeb746 commit 1891dd1

File tree

5,746 files changed

+132057
-108843
lines changed

Some content is hidden

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

5,746 files changed

+132057
-108843
lines changed

.openpublishing.publish.config.json

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -974,12 +974,90 @@
974974
"branch": "main",
975975
"branch_mapping": {}
976976
},
977+
{
978+
"path_to_root": "cosmos-db-nosql-javascript-samples",
979+
"url": "https://github.com/azure-samples/cosmos-db-nosql-javascript-samples",
980+
"branch": "main",
981+
"branch_mapping": {}
982+
},
977983
{
978984
"path_to_root": "cosmos-db-nosql-python-samples",
979985
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
980986
"branch": "main",
981987
"branch_mapping": {}
982988
},
989+
{
990+
"path_to_root": "cosmos-db-mongodb-dotnet-samples",
991+
"url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
992+
"branch": "main",
993+
"branch_mapping": {}
994+
},
995+
{
996+
"path_to_root": "cosmos-db-mongodb-javascript-samples",
997+
"url": "https://github.com/azure-samples/cosmos-db-mongodb-javascript-samples",
998+
"branch": "main",
999+
"branch_mapping": {}
1000+
},
1001+
{
1002+
"path_to_root": "cosmos-db-mongodb-python-samples",
1003+
"url": "https://github.com/azure-samples/cosmos-db-mongodb-python-samples",
1004+
"branch": "main",
1005+
"branch_mapping": {}
1006+
},
1007+
{
1008+
"path_to_root": "cosmos-db-apache-cassandra-dotnet-samples",
1009+
"url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-dotnet-samples",
1010+
"branch": "main",
1011+
"branch_mapping": {}
1012+
},
1013+
{
1014+
"path_to_root": "cosmos-db-apache-cassandra-javascript-samples",
1015+
"url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-javascript-samples",
1016+
"branch": "main",
1017+
"branch_mapping": {}
1018+
},
1019+
{
1020+
"path_to_root": "cosmos-db-apache-cassandra-python-samples",
1021+
"url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-python-samples",
1022+
"branch": "main",
1023+
"branch_mapping": {}
1024+
},
1025+
{
1026+
"path_to_root": "cosmos-db-apache-gremlin-dotnet-samples",
1027+
"url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-dotnet-samples",
1028+
"branch": "main",
1029+
"branch_mapping": {}
1030+
},
1031+
{
1032+
"path_to_root": "cosmos-db-apache-gremlin-javascript-samples",
1033+
"url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-javascript-samples",
1034+
"branch": "main",
1035+
"branch_mapping": {}
1036+
},
1037+
{
1038+
"path_to_root": "cosmos-db-apache-gremlin-python-samples",
1039+
"url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-python-samples",
1040+
"branch": "main",
1041+
"branch_mapping": {}
1042+
},
1043+
{
1044+
"path_to_root": "cosmos-db-table-dotnet-samples",
1045+
"url": "https://github.com/azure-samples/cosmos-db-table-dotnet-samples",
1046+
"branch": "main",
1047+
"branch_mapping": {}
1048+
},
1049+
{
1050+
"path_to_root": "cosmos-db-table-javascript-samples",
1051+
"url": "https://github.com/azure-samples/cosmos-db-table-javascript-samples",
1052+
"branch": "main",
1053+
"branch_mapping": {}
1054+
},
1055+
{
1056+
"path_to_root": "cosmos-db-table-python-samples",
1057+
"url": "https://github.com/azure-samples/cosmos-db-table-python-samples",
1058+
"branch": "main",
1059+
"branch_mapping": {}
1060+
},
9831061
{
9841062
"path_to_root": "azure-cosmos-db-table-dotnet-v12",
9851063
"url": "https://github.com/Azure-Samples/cosmos-db-table-api-dotnet-samples",

.openpublishing.redirection.active-directory.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3070,6 +3070,11 @@
30703070
"redirect_url": "/azure/active-directory/conditional-access/concept-condition-filters-for-devices",
30713071
"redirect_document_id": false
30723072
},
3073+
{
3074+
"source_path_from_root": "/articles/active-directory/conditional-access/policy-migration.md",
3075+
"redirect_url": "/azure/active-directory/conditional-access/policy-migration-mfa",
3076+
"redirect_document_id": true
3077+
},
30733078
{
30743079
"source_path_from_root": "/articles/active-directory/conditional-access/best-practices.md",
30753080
"redirect_url": "/azure/active-directory/conditional-access/overview",
@@ -3088,7 +3093,7 @@
30883093
{
30893094
"source_path_from_root": "/articles/active-directory/active-directory-conditional-access-migration-mfa.md",
30903095
"redirect_url": "/azure/active-directory/conditional-access/policy-migration-mfa",
3091-
"redirect_document_id": true
3096+
"redirect_document_id": false
30923097
},
30933098
{
30943099
"source_path_from_root": "/articles/active-directory/active-directory-conditional-access-policy-connected-applications.md",

.openpublishing.redirection.api-management.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,50 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/api-management/powershell-samples.md",
5+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/api-management/scripts/powershell-add-user-and-get-subscription-key.md",
10+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/api-management/scripts/powershell-create-apim-service.md",
15+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/api-management/scripts/powershell-backup-restore-apim-service.md",
20+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/api-management/scripts/powershell-scale-and-addregion-apim-service.md",
25+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/api-management/scripts/powershell-setup-custom-domain.md",
30+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/api-management/scripts/powershell-import-api-and-add-to-product.md",
35+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/api-management/scripts/powershell-secure-backend-with-mutual-certificate-authentication.md",
40+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/api-management/scripts/powershell-setup-rate-limit-policy.md",
45+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
46+
"redirect_document_id": false
47+
},
348
{
449
"source_path_from_root": "/articles/api-management/policies/authorize-request-using-external-authorizer.md",
550
"redirect_url": "https://github.com/Azure/api-management-policy-snippets",

.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"source_path_from_root": "/articles/aks/aks-planned-maintenance-weekly-releases.md",
2020
"redirect_url": "/azure/aks/planned-maintenance",
2121
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/aks/create-k8s-cluster-with-aks-application-gateway-ingress.md",
25+
"redirect_url": "/azure/application-gateway/for-containers/overview",
26+
"redirect_document_id": false
2227
}
2328
]
2429
}

.openpublishing.redirection.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -910,6 +910,11 @@
910910
"redirect_url": "/azure/databox-online/azure-stack-edge-powershell-based-configuration",
911911
"redirect_document_id": false
912912
},
913+
{
914+
"source_path": "articles/databox-online/azure-stack-edge-gpu-2307-release-notes.md",
915+
"redirect_url": "/azure/databox-online/azure-stack-edge-gpu-2309-release-notes",
916+
"redirect_document_id": false
917+
},
913918
{
914919
"source_path": "articles/azure-video-analyzer/video-analyzer-docs/access-policies.md",
915920
"redirect_url": "/previous-versions/azure/azure-video-analyzer/video-analyzer-docs/access-policies",
@@ -22362,6 +22367,11 @@
2236222367
"redirect_url": "/azure/communication-services/how-tos/calling-sdk/lobby",
2236322368
"redirect_document_id": false
2236422369
},
22370+
{
22371+
"source_path_from_root": "/articles/communication-services/tutorials/widgets/click-to-call-widget.md",
22372+
"redirect_url": "/azure/communication-services/tutorials/calling-widget/calling-widget-overview",
22373+
"redirect_document_id": false
22374+
},
2236522375
{
2236622376
"source_path_from_root": "/articles/load-balancer/tutorial-load-balancer-standard-manage-portal.md",
2236722377
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",
@@ -23597,6 +23607,11 @@
2359723607
"redirect_url": "/azure/devtest-labs/deliver-proof-of-concept",
2359823608
"redirect_document_id": false
2359923609
},
23610+
{
23611+
"source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-orchestrate-implementation.md",
23612+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-scale",
23613+
"redirect_document_id": false
23614+
},
2360023615
{
2360123616
"source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-governance-cost-ownership.md",
2360223617
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-governance-resources",
@@ -24510,6 +24525,14 @@
2451024525
"source_path_from_root": "/articles/aks/command-invoke.md",
2451124526
"redirect_url": "/azure/aks/access-private-cluster",
2451224527
"redirect_document_id": false
24528+
},
24529+
{
24530+
"source_path_from_root": "/articles/orbital/space-partner-program-overview.md",
24531+
"redirect_url": "/azure/orbital/overview",
24532+
"redirect_document_id": false
2451324533
}
24534+
24535+
24536+
2451424537
]
2451524538
}

articles/active-directory-b2c/TOC.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
items:
6666
- name: Compare solutions for External Identities
6767
href: ../active-directory/external-identities/external-identities-overview.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
68-
- name: Supported Azure AD features
68+
- name: Supported Microsoft Entra features
6969
href: supported-azure-ad-features.md
7070
- name: Learn authentication basics
7171
items:
@@ -156,7 +156,7 @@
156156
href: microsoft-graph-get-started.md
157157
- name: Register a SAML application
158158
href: saml-service-provider.md?tabs=windows&pivots=b2c-custom-policy
159-
- name: Publish app in Azure AD app gallery
159+
- name: Publish app in Microsoft Entra app gallery
160160
href: publish-app-to-azure-ad-app-gallery.md
161161
- name: Create a user flow or custom policy
162162
items:
@@ -334,9 +334,9 @@
334334
href: identity-provider-amazon.md
335335
- name: Apple
336336
href: identity-provider-apple-id.md
337-
- name: Azure AD (single tenant)
337+
- name: Microsoft Entra ID (single tenant)
338338
href: identity-provider-azure-ad-single-tenant.md
339-
- name: Azure AD (multitenant)
339+
- name: Microsoft Entra ID (multitenant)
340340
href: identity-provider-azure-ad-multi-tenant.md
341341
- name: Azure AD B2C
342342
href: identity-provider-azure-ad-b2c.md
@@ -509,7 +509,7 @@
509509
displayName: azure ad b2c security best practices
510510
- name: Enable MFA
511511
items:
512-
- name: Multi-factor authentication
512+
- name: Multifactor authentication
513513
href: multi-factor-authentication.md
514514
displayName: TOTP, multi-factor, multifactor, time-based-one-time password, time-based one-time password, authenticator app, Microsoft authenticator app, mfa, 2fa
515515
- name: Secure phone-based MFA
@@ -722,12 +722,12 @@
722722
items:
723723
- name: About validation technical profiles
724724
href: validation-technical-profile.md
725-
- name: Azure Active Directory
725+
- name: Microsoft Entra ID
726726
href: active-directory-technical-profile.md
727-
- name: Azure AD Multi-Factor Authentication
727+
- name: Microsoft Entra multifactor authentication
728728
href: multi-factor-auth-technical-profile.md
729729
displayName: mfa
730-
- name: Azure AD SSPR
730+
- name: Microsoft Entra SSPR
731731
href: aad-sspr-technical-profile.md
732732
- name: Claims transformation
733733
href: claims-transformation-technical-profile.md

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

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

18-
# Define an Azure AD SSPR technical profile in an Azure AD B2C custom policy
18+
# Define a Microsoft Entra 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 Azure AD SSPR technical profile to generate and send a code to an email address, and then verify the code. The Azure AD 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 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.
2323

2424
This technical profile:
2525

2626
- Doesn't provide an interface to interact with the user. Instead, the user interface is called from a [self-asserted](self-asserted-technical-profile.md) technical profile, or a [display control](display-controls.md) as a [validation technical profile](validation-technical-profile.md).
27-
- Uses the Azure AD SSPR service to generate and send a code to an email address, and then verifies the code.
27+
- Uses the Microsoft Entra SSPR service to generate and send a code to an email address, and then verifies the code.
2828
- Validates an email address via a verification code.
2929

3030
## Protocol
@@ -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 an Azure AD SSPR technical profile:
38+
The following example shows a Microsoft Entra SSPR technical profile:
3939

4040
```xml
4141
<TechnicalProfile Id="AadSspr-SendCode">
@@ -50,17 +50,17 @@ The first mode of this technical profile is to generate a code and send it. The
5050

5151
### Input claims
5252

53-
The **InputClaims** element contains a list of claims to send to Azure AD SSPR. You can also map the name of your claim to the name defined in the SSPR technical profile.
53+
The **InputClaims** element contains a list of claims to send to Microsoft Entra SSPR. You can also map the name of your claim to the name defined in the SSPR technical profile.
5454

5555
| ClaimReferenceId | Required | Description |
5656
| --------- | -------- | ----------- |
5757
| emailAddress | Yes | The identifier for the user who owns the email address. The `PartnerClaimType` property of the input claim must be set to `emailAddress`. |
5858

59-
The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones before sending to the Azure AD SSPR service.
59+
The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones before sending to the Microsoft Entra SSPR service.
6060

6161
### Output claims
6262

63-
The Azure AD SSPR protocol provider does not return any **OutputClaims**, thus there is no need to specify output claims. You can, however, include claims that aren't returned by the Azure AD SSPR protocol provider as long as you set the `DefaultValue` attribute.
63+
The Microsoft Entra SSPR protocol provider does not return any **OutputClaims**, thus there is no need to specify output claims. You can, however, include claims that aren't returned by the Microsoft Entra SSPR protocol provider as long as you set the `DefaultValue` attribute.
6464

6565
The **OutputClaimsTransformations** element may contain a collection of **OutputClaimsTransformation** elements that are used to modify the output claims or generate new ones.
6666

@@ -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 an Azure AD SSPR technical profile that is used to send a code via email.
84+
The following example shows a Microsoft Entra SSPR technical profile that is used to send a code via email.
8585

8686
```xml
8787
<TechnicalProfile Id="AadSspr-SendCode">
@@ -102,18 +102,18 @@ The second mode of this technical profile is to verify a code. The following opt
102102

103103
### Input claims
104104

105-
The **InputClaims** element contains a list of claims to send to Azure AD SSPR. You can also map the name of your claim to the name defined in the SSPR technical profile.
105+
The **InputClaims** element contains a list of claims to send to Microsoft Entra SSPR. You can also map the name of your claim to the name defined in the SSPR technical profile.
106106

107107
| ClaimReferenceId | Required | Description |
108108
| --------- | -------- | ----------- | ----------- |
109109
| emailAddress| Yes | Same email address as previously used to send a code. It is also used to locate an email verification session. The `PartnerClaimType` property of the input claim must be set to `emailAddress`.|
110110
| verificationCode | Yes | The verification code provided by the user to be verified. The `PartnerClaimType` property of the input claim must be set to `verificationCode`. |
111111

112-
The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones before calling the Azure AD SSPR service.
112+
The **InputClaimsTransformations** element may contain a collection of **InputClaimsTransformation** elements that are used to modify the input claims or generate new ones before calling the Microsoft Entra SSPR service.
113113

114114
### Output claims
115115

116-
The Azure AD SSPR protocol provider does not return any **OutputClaims**, thus there is no need to specify output claims. You can, however, include claims that aren't returned by the Azure AD SSPR protocol provider as long as you set the `DefaultValue` attribute.
116+
The Microsoft Entra SSPR protocol provider does not return any **OutputClaims**, thus there is no need to specify output claims. You can, however, include claims that aren't returned by the Microsoft Entra SSPR protocol provider as long as you set the `DefaultValue` attribute.
117117

118118
The **OutputClaimsTransformations** element may contain a collection of **OutputClaimsTransformation** elements that are used to modify the output claims or generate new ones.
119119

@@ -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 an Azure AD SSPR technical profile used to verify the code.
140+
The following example shows a Microsoft Entra SSPR technical profile used to verify the code.
141141

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

0 commit comments

Comments
 (0)