Skip to content

Commit 9f3547c

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sdk-managed-identity
2 parents 0523a28 + 0c14978 commit 9f3547c

File tree

1,146 files changed

+9011
-5801
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,146 files changed

+9011
-5801
lines changed

.github/policies/disallow-edits.yml

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ configuration:
1010
- payloadType: Pull_Request
1111
- isAction:
1212
action: Opened
13-
- or:
13+
- or:
1414
- filesMatchPattern:
1515
matchAny: true
1616
pattern: articles/aks/*
@@ -121,4 +121,74 @@ configuration:
121121
reply: >-
122122
@${issueAuthor} - You tried to add content to a folder path that has been removed from this repository. Your pull request will be automatically closed. Submit your changes to the updated repository, which can be identified by clicking the Edit this Document link at the top of any published article for that product or service.
123123
- closePullRequest
124+
125+
- description: Alert authors to edits in the /articles/reliability folder.
126+
if:
127+
# If a PR in the articles/reliability folder is opened, and the PR author isn't Anastasia or John...
128+
- payloadType: Pull_Request
129+
- filesMatchPattern:
130+
matchAny: true
131+
pattern: articles/reliability/*
132+
- isAction:
133+
action: Opened
134+
- not:
135+
or:
136+
- isActivitySender:
137+
user: anaharris-ms
138+
- isActivitySender:
139+
user: johndowns
140+
then:
141+
# Mention Anastasia and John, add a reply asking the PR author not to sign off on the PR, and add the needs-human-review label.
142+
- mentionUsers:
143+
mentionees:
144+
- anaharris-ms
145+
- johndowns
146+
replyTemplate: >-
147+
Tagging authors for this folder: ${mentionees}
148+
- addReply:
149+
reply: >-
150+
@${issueAuthor} - Please do NOT sign off on this pull request. The Reliability Hub owners will sign off for you.
151+
- addLabel:
152+
label: needs-human-review
153+
154+
- description: Disallow sign-off for articles in the /articles/reliability folder.
155+
if:
156+
# If a 'sign-off' comment is added to a PR in the articles/reliability folder , and the PR author isn't Anastasia or John...
157+
- payloadType: Issue_Comment
158+
- isPullRequest
159+
- filesMatchPattern:
160+
matchAny: true
161+
pattern: articles/reliability/*
162+
- commentContains:
163+
pattern: \#sign-off
164+
isRegex: false
165+
- not:
166+
or:
167+
- isActivitySender:
168+
user: anaharris-ms
169+
- isActivitySender:
170+
user: johndowns
171+
then:
172+
# Add the do-not-merge label, remove the ready-to-merge label, and add a reply asking the PR author not to sign off on the PR.
173+
- addReply:
174+
reply: >-
175+
@${issueAuthor} - Please do NOT sign off on this pull request. The Reliability Hub owners will sign off for you.
176+
- addLabel:
177+
label: do-not-merge
178+
- removeLabel:
179+
label: ready-to-merge
180+
181+
- description: Write a message if the breadcrumb file is modified in the azure-docs-pr repository.
182+
if:
183+
- payloadType: Pull_Request
184+
- isAction:
185+
action: Opened
186+
- filesMatchPattern:
187+
matchAny: true
188+
pattern: bread/*
189+
190+
then:
191+
- addReply:
192+
reply: >-
193+
@${issueAuthor} - This PR modifies the breadcrumb file for the entire repository: bread/toc.yml. This file supports the on-site navigation for 100s of services. Please make sure your changes to the breadcrumb file are intentional. Do not delete this file.
124194

.github/workflows/stale.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Mark stale pull requests
2+
3+
permissions:
4+
issues: write
5+
pull-requests: write
6+
7+
on:
8+
schedule:
9+
- cron: "0 */6 * * *"
10+
11+
jobs:
12+
stale:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/stale@v3
18+
with:
19+
repo-token: ${{ secrets.GITHUB_TOKEN }}
20+
days-before-pr-stale: 14
21+
days-before-pr-close: 90
22+
stale-pr-label: inactive
23+
close-pr-label: auto-close
24+
exempt-pr-labels: keep-open
25+
operations-per-run: 1300
26+
ascending: false
27+
# start-date: '2021-03-19'
28+
stale-pr-message: >
29+
This pull request has been inactive for at least 14 days.
30+
31+
If you are finished with your changes, don't forget to sign off. See the [platform guide](https://review.learn.microsoft.com/help/platform/prmerger-hashtag-commands?branch=main) for instructions.
32+
33+
[Get Help](https://review.learn.microsoft.com/help/platform/help-options?branch=main)
34+
35+
[Learn Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)
36+
37+
[Resolve Merge Conflicts](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
38+
close-pr-message: >
39+
This pull request has been inactive for 90 days, and an `auto-close` label has been added. At this time, the system is closing the PR automatically. If you decide to continue working on your changes, scroll to the bottom of the pull request comments and select the **Reopen pull request** button.
40+
<br/>

.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).

0 commit comments

Comments
 (0)