Skip to content

Commit 7301db3

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 7686c23 + 32f3b38 commit 7301db3

File tree

1,982 files changed

+8782
-10159
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,982 files changed

+8782
-10159
lines changed

.openpublishing.redirection.json

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{
2929
"source_path": "articles/partner-solutions/logzio/troubleshoot.md",
3030
"redirect_url": "/previous-versions/azure/partner-solutions/logzio/troubleshoot",
31-
"redirect_document_id": false
31+
"redirect_document_id": false
3232
},
3333
{
3434
"source_path_from_root": "/articles/hdinsight-aks/index.yml",
@@ -41,34 +41,34 @@
4141
"redirect_document_id": false
4242
},
4343
{
44-
"source_path_from_root": "/articles/hdinsight-aks/prerequisites-subscription.md",
45-
"redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-prerequisites-subscription",
46-
"redirect_document_id": false
44+
"source_path_from_root": "/articles/hdinsight-aks/prerequisites-subscription.md",
45+
"redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-prerequisites-subscription",
46+
"redirect_document_id": false
4747
},
4848
{
49-
"source_path_from_root": "/articles/hdinsight-aks/release-notes/index.md",
50-
"redirect_url": "/previous-versions/azure/hdinsight-aks/release-notes/hdinsight-aks-release-notes",
51-
"redirect_document_id": false
49+
"source_path_from_root": "/articles/hdinsight-aks/release-notes/index.md",
50+
"redirect_url": "/previous-versions/azure/hdinsight-aks/release-notes/hdinsight-aks-release-notes",
51+
"redirect_document_id": false
5252
},
5353
{
54-
"source_path_from_root": "/articles/hdinsight-aks/prerequisites-resources.md",
55-
"redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-prerequisites-resources",
56-
"redirect_document_id": false
57-
},
54+
"source_path_from_root": "/articles/hdinsight-aks/prerequisites-resources.md",
55+
"redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-prerequisites-resources",
56+
"redirect_document_id": false
57+
},
5858
{
59-
"source_path_from_root": "/articles/hdinsight-aks/spark/index.md",
60-
"redirect_url": "/previous-versions/azure/hdinsight-aks/spark/hdinsight-on-aks-spark-overview",
61-
"redirect_document_id": false
59+
"source_path_from_root": "/articles/hdinsight-aks/spark/index.md",
60+
"redirect_url": "/previous-versions/azure/hdinsight-aks/spark/hdinsight-on-aks-spark-overview",
61+
"redirect_document_id": false
6262
},
6363
{
64-
"source_path_from_root": "/articles/hdinsight-aks/get-started.md",
65-
"redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-get-started",
66-
"redirect_document_id": false
64+
"source_path_from_root": "/articles/hdinsight-aks/get-started.md",
65+
"redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-get-started",
66+
"redirect_document_id": false
6767
},
6868
{
69-
"source_path_from_root": "/articles/hdinsight-aks/trino/index.md",
70-
"redirect_url": "/previous-versions/azure/hdinsight-aks/trino/trino-overview ",
71-
"redirect_document_id": false
69+
"source_path_from_root": "/articles/hdinsight-aks/trino/index.md",
70+
"redirect_url": "/previous-versions/azure/hdinsight-aks/trino/trino-overview ",
71+
"redirect_document_id": false
7272
},
7373
{
7474
"source_path": "articles/hdinsight-aks/cluster-storage.md",
@@ -1038,7 +1038,7 @@
10381038
{
10391039
"source_path": "articles/defender-for-iot/organizations/legacy-central-management/how-to-troubleshoot-on-premises-management-console.md",
10401040
"redirect_url": "/previous-versions/azure/defender-for-iot/organizations/legacy-central-management/how-to-troubleshoot-on-premises-management-console",
1041-
"redirect_document_id": false
1041+
"redirect_document_id": false
10421042
},
10431043
{
10441044
"source_path": "articles/defender-for-iot/organizations/legacy-central-management/legacy-air-gapped-deploy.md",
@@ -1530,7 +1530,7 @@
15301530
"redirect_url": "/previous-versions/azure/partner-solutions/split-experimentation/troubleshoot",
15311531
"redirect_document_id": false
15321532
},
1533-
{
1533+
{
15341534
"source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/classic-retirement.md",
15351535
"redirect_url": "/previous-versions/azure/virtual-desktop-classic/classic-retirement",
15361536
"redirect_document_id": false
@@ -3039,7 +3039,8 @@
30393039
"source_path_from_root": "/articles/ddos-protection/telemetry-monitoring-alerting.md",
30403040
"redirect_url": "/azure/ddos-protection/telemetry",
30413041
"redirect_document_id": false
3042-
}, {
3042+
},
3043+
{
30433044
"source_path_from_root": "/articles/ddos-protection/telemetry.md",
30443045
"redirect_url": "/azure/ddos-protection/monitor-ddos-protection",
30453046
"redirect_document_id": false
@@ -3333,7 +3334,7 @@
33333334
"source_path_from_root": "/articles/dns/dns-alerts-metrics.md",
33343335
"redirect_url": "/azure/dns/monitor-dns",
33353336
"redirect_document_id": false
3336-
},
3337+
},
33373338
{
33383339
"source_path_from_root": "/articles/docker/index.yml",
33393340
"redirect_url": "/dotnet/architecture/microservices/container-docker-introduction/docker-defined",
@@ -5708,8 +5709,8 @@
57085709
"source_path_from_root": "/articles/defender-for-iot/device-builders/defender-iot-firmware-analysis-rbac.md",
57095710
"redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
57105711
"redirect_document_id": false
5711-
},
5712-
{
5712+
},
5713+
{
57135714
"source_path_from_root": "/articles/virtual-network/ip-services/public-ip-upgrade-portal.md",
57145715
"redirect_url": "/azure/virtual-network/ip-services/public-ip-upgrade",
57155716
"redirect_document_id": false
@@ -5763,7 +5764,7 @@
57635764
"source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-powershell.md",
57645765
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
57655766
"redirect_document_id": false
5766-
},
5767+
},
57675768
{
57685769
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-portal.md",
57695770
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
@@ -5872,7 +5873,7 @@
58725873
{
58735874
"source_path": "articles/virtual-desktop/troubleshoot-management-issues.md",
58745875
"redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-management-issues",
5875-
"redirect_document_id": false
5876+
"redirect_document_id": false
58765877
},
58775878
{
58785879
"source_path": "articles/virtual-desktop/troubleshoot-multimedia-redirection.md",
@@ -5943,6 +5944,11 @@
59435944
"source_path_from_root": "/articles/managed-grafana/how-to-share-grafana-workspace.md",
59445945
"redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",
59455946
"redirect_document_id": false
5947+
},
5948+
{
5949+
"source_path": "articles/sentinel/resources.md",
5950+
"redirect_url": "/azure/sentinel/overview",
5951+
"redirect_document_id": false
59465952
}
59475953
]
5948-
}
5954+
}

articles/active-directory-b2c/access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: azure-active-directory
99

1010
ms.topic: concept-article
11-
ms.date: 01/11/2024
11+
ms.date: 02/17/2025
1212
ms.author: kengaderdus
1313
ms.subservice: b2c
1414

articles/active-directory-b2c/add-captcha.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Enable CAPTCHA in Azure Active Directory B2C
3-
description: How to enable CAPTCHA for user flows and custom policies in Azure Active Directory B2C.
3+
description: Learn how to enable CAPTCHA in Azure AD B2C for user flows and custom policies to protect sign-in and sign-up flows from automated attacks.
44
author: kengaderdus
55
manager: mwongerapk
66
ms.service: azure-active-directory
77
ms.topic: how-to
8-
ms.date: 05/03/2024
8+
ms.date: 02/18/2024
99
ms.custom: project-no-code
1010
ms.author: kengaderdus
1111
ms.subservice: b2c
@@ -50,7 +50,7 @@ Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to preven
5050

5151
## Test the user flow
5252

53-
Use the steps in [Test the user flow](tutorial-create-user-flows.md?pivots=b2c-user-flow#test-the-user-flow-1) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type, visual or audio, you choose.
53+
Use the steps in [Test the user flow](tutorial-create-user-flows.md?pivots=b2c-user-flow#test-the-user-flow-1) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type, visual, or audio, you choose.
5454

5555
::: zone-end
5656

@@ -387,15 +387,15 @@ Use the steps in [Upload the policies](tutorial-create-user-flows.md?pivots=b2c-
387387

388388
## Test the custom policy
389389

390-
Use the steps in [Test the custom policy](tutorial-create-user-flows.md?pivots=b2c-custom-policy#test-the-custom-policy) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type, visual or audio, you choose.
390+
Use the steps in [Test the custom policy](tutorial-create-user-flows.md?pivots=b2c-custom-policy#test-the-custom-policy) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type, visual, or audio, you choose.
391391

392392
::: zone-end
393393

394394
> [!NOTE]
395395
> - You can't add CAPTCHA to an MFA step in a sign-up only user flow.
396396
> - In an MFA flow, CAPTCHA is applicable where the MFA method you select is SMS or phone call, SMS only or Phone call only.
397397
398-
## Next steps
398+
## Related content
399399

400400
- Learn how to [Define a CAPTCHA technical profile](captcha-technical-profile.md).
401401
- Learn how to [Configure CAPTCHA display control](display-control-captcha.md).

articles/active-directory-b2c/add-password-change-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: azure-active-directory
1010

1111
ms.topic: how-to
12-
ms.date: 01/11/2024
12+
ms.date: 02/19/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515
zone_pivot_groups: b2c-policy-type
@@ -164,7 +164,7 @@ The password change flow involves the following steps:
164164
1. For **Application**, select the application that you registered earlier. To see the token, the **Reply URL** should show `https://jwt.ms`.
165165
1. Select **Run now**. In the new tab that opens, remove "&prompt=login" from the URL and refresh the tab. Then, sign in with the account you created earlier. A password change dialog gives you the option to change the password.
166166

167-
## Next steps
167+
## Related content
168168

169169
* Find the [sample policy on GitHub](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/password-change).
170170
* Learn about how you can [configure password complexity in Azure AD B2C](password-complexity.md).

articles/active-directory-b2c/add-password-reset-policy.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: garrodonnell
66
manager: CelesteDG
77
ms.service: azure-active-directory
88
ms.topic: how-to
9-
ms.date: 11/27/2024
9+
ms.date: 02/18/2024
1010
ms.author: godonnell
1111
ms.subservice: b2c
1212
zone_pivot_groups: b2c-policy-type
@@ -40,16 +40,16 @@ The default name of the **Change email** button in *selfAsserted.html* is **chan
4040
[!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
4141

4242

43-
- The B2C Users need to have an authentication method specified for self-service password reset. Select the B2C User, in the left menu under **Manage**, select **Authentication methods**, ensure **Authentication contact info** is set. B2C users created via a SignUp flow will have this set by default. For users created via Azure Portal or by Graph API need to have this set for SSPR to work.
43+
- The B2C Users need to have an authentication method specified for self-service password reset. Select the B2C User, in the left menu under **Manage**, select **Authentication methods**. Ensure **Authentication contact info** is set. B2C users created via a Sign-up flow has this set by default. For users created via Azure Portal or by Graph API, you need to set **Authentication contact info** for SSPR to work.
4444

4545

4646
## Self-service password reset (recommended)
4747

48-
The new password reset experience is now part of the sign-up or sign-in policy. When the user selects the **Forgot your password?** link, they are immediately sent to the Forgot Password experience. Your application no longer needs to handle the [AADB2C90118 error code](#password-reset-policy-legacy), and you don't need a separate policy for password reset.
48+
The new password reset experience is now part of the sign-up or sign-in policy. When the user selects the **Forgot your password?** link, they're immediately sent to the Forgot Password experience. Your application no longer needs to handle the [AADB2C90118 error code](#password-reset-policy-legacy), and you don't need a separate policy for password reset.
4949

5050
::: zone pivot="b2c-user-flow"
5151

52-
The self-service password reset experience can be configured for the Sign in (Recommended) or Sign up and sign in (Recommended) user flows. If you don't have one of these user flows set up, create a [sign-up or sign-in](add-sign-up-and-sign-in-policy.md) user flow.
52+
The self-service password reset experience can be configured for the Sign in (Recommended) or Sign up and sign in (Recommended) user flows. If you don't have one of these user flows setup, create a [sign-up or sign-in](add-sign-up-and-sign-in-policy.md) user flow.
5353

5454
To set up self-service password reset for the sign-up or sign-in user flow:
5555

@@ -192,7 +192,7 @@ The sub journey is called from the user journey and performs the specific steps
192192

193193
### Prepare your user journey
194194

195-
Next, to connect the **Forgot your password?** link to the **Forgot Password** sub journey you will need to reference the **Forgot Password** sub journey ID in the **ClaimsProviderSelection** element of the **CombinedSignInAndSignUp** step.
195+
Next, to connect the **Forgot your password?** link to the **Forgot Password** sub journey you need to reference the **Forgot Password** sub journey ID in the **ClaimsProviderSelection** element of the **CombinedSignInAndSignUp** step.
196196

197197
If you don't have your own custom user journey that has a **CombinedSignInAndSignUp** step, complete the following steps to duplicate an existing sign-up or sign-in user journey. Otherwise, continue to the next section.
198198

@@ -352,14 +352,14 @@ To test the user flow:
352352

353353
### Create a password reset policy
354354

355-
Custom policies are a set of XML files that you upload to your Azure AD B2C tenant to define user journeys. We provide [starter packs](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack) that have several pre-built policies, including sign up and sign in, password reset, and profile editing policies. For more information, see [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
355+
Custom policies are a set of XML files that you upload to your Azure AD B2C tenant to define user journeys. We provide [starter packs](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack) that have several prebuilt policies, including sign up and sign in, password reset, and profile editing policies. For more information, see [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
356356

357357
::: zone-end
358358

359359
## Troubleshoot Azure AD B2C user flows and custom policies
360360
Your application needs to handle certain errors coming from Azure B2C service. Learn [how to troubleshoot Azure AD B2C's user flows and custom policies](troubleshoot.md).
361361

362-
## Next steps
362+
## Related content
363363

364364
Set up a [force password reset](force-password-reset.md).
365365

0 commit comments

Comments
 (0)