resolve conflict. ms.date

Author: b-ahibbard

.github/policies/disallow-edits.yml

@@ -10,7 +10,7 @@ configuration:
           - payloadType: Pull_Request
           - isAction:
               action: Opened
-          - or:              
+          - or:
               - filesMatchPattern:
                   matchAny: true
                   pattern: articles/aks/*
@@ -121,4 +121,74 @@ configuration:
               reply: >-
                 @${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.
           - closePullRequest
+
+      - description: Alert authors to edits in the /articles/reliability folder.
+        if:
+          # If a PR in the articles/reliability folder is opened, and the PR author isn't Anastasia or John...
+          - payloadType: Pull_Request
+          - filesMatchPattern:
+              matchAny: true
+              pattern: articles/reliability/*
+          - isAction:
+              action: Opened
+          - not:
+              or:
+                - isActivitySender:
+                    user: anaharris-ms
+                - isActivitySender:
+                    user: johndowns
+        then:
+          # 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.
+          - mentionUsers:
+              mentionees:
+                - anaharris-ms
+                - johndowns
+              replyTemplate: >-
+                Tagging authors for this folder: ${mentionees}
+          - addReply:
+              reply: >-
+                @${issueAuthor} - Please do NOT sign off on this pull request. The Reliability Hub owners will sign off for you.
+          - addLabel:
+              label: needs-human-review
+
+      - description: Disallow sign-off for articles in the /articles/reliability folder.
+        if:
+          # If a 'sign-off' comment is added to a PR in the articles/reliability folder , and the PR author isn't Anastasia or John...
+          - payloadType: Issue_Comment
+          - isPullRequest
+          - filesMatchPattern:
+              matchAny: true
+              pattern: articles/reliability/*
+          - commentContains:
+              pattern: \#sign-off
+              isRegex: false
+          - not:
+              or:
+                - isActivitySender:
+                    user: anaharris-ms
+                - isActivitySender:
+                    user: johndowns
+        then:
+          # 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.
+          - addReply:
+              reply: >-
+                @${issueAuthor} - Please do NOT sign off on this pull request. The Reliability Hub owners will sign off for you.
+          - addLabel:
+              label: do-not-merge
+          - removeLabel:
+              label: ready-to-merge
+      
+      - description: Write a message if the breadcrumb file is modified in the azure-docs-pr repository.
+        if:
+        - payloadType: Pull_Request
+        - isAction:
+            action: Opened
+        - filesMatchPattern:
+              matchAny: true
+              pattern: bread/*
+              
+        then:
+          - addReply:
+              reply: >-
+                @${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. 
           

.github/workflows/stale.yml

@@ -0,0 +1,40 @@
+name: Mark stale pull requests
+
+permissions:
+  issues: write
+  pull-requests: write
+      
+on:
+  schedule:
+  - cron: "0 */6 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+   
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-pr-stale: 14
+        days-before-pr-close: 90
+        stale-pr-label: inactive
+        close-pr-label: auto-close
+        exempt-pr-labels: keep-open
+        operations-per-run: 1300
+        ascending: false
+        # start-date: '2021-03-19'
+        stale-pr-message: >
+          This pull request has been inactive for at least 14 days.
+
+          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.
+             
+          [Get Help](https://review.learn.microsoft.com/help/platform/help-options?branch=main)  
+          
+          [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)  
+          
+          [Resolve Merge Conflicts](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)  
+        close-pr-message: >
+          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.
+          <br/>

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/migrate/tutorial-modernize-asp-net-aks.md",
+      "redirect_url": "/azure/migrate/migrate-services-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/databox-online/azure-stack-edge-gpu-deploy-sample-module-marketplace.md",
+      "redirect_url": "https://azuremarketplace.microsoft.com/marketplace/apps?page=1",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/partner-solutions/logzio/create.md",
       "redirect_url": "/previous-versions/azure/partner-solutions/logzio/create",
@@ -23,7 +33,52 @@
     {
       "source_path": "articles/partner-solutions/logzio/troubleshoot.md",
       "redirect_url": "/previous-versions/azure/partner-solutions/logzio/troubleshoot",
-       "redirect_document_id": false
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/event-grid/event-schema-storage-actions.md",
+      "redirect_url": "/azure/storage-actions/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/hdinsight-aks/index.yml",
+      "redirect_url": "/previous-versions/azure/hdinsight-aks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/hdinsight-aks/flink/index.md",
+      "redirect_url": "/previous-versions/azure/hdinsight-aks/flink/flink-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/hdinsight-aks/prerequisites-subscription.md",
+      "redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-prerequisites-subscription",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/hdinsight-aks/release-notes/index.md",
+      "redirect_url": "/previous-versions/azure/hdinsight-aks/release-notes/hdinsight-aks-release-notes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/hdinsight-aks/prerequisites-resources.md",
+      "redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-prerequisites-resources",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/hdinsight-aks/spark/index.md",
+      "redirect_url": "/previous-versions/azure/hdinsight-aks/spark/hdinsight-on-aks-spark-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/hdinsight-aks/get-started.md",
+      "redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/hdinsight-aks/trino/index.md",
+      "redirect_url": "/previous-versions/azure/hdinsight-aks/trino/trino-overview ",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/hdinsight-aks/cluster-storage.md",
@@ -993,7 +1048,7 @@
     {
       "source_path": "articles/defender-for-iot/organizations/legacy-central-management/how-to-troubleshoot-on-premises-management-console.md",
       "redirect_url": "/previous-versions/azure/defender-for-iot/organizations/legacy-central-management/how-to-troubleshoot-on-premises-management-console",
-       "redirect_document_id": false
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/defender-for-iot/organizations/legacy-central-management/legacy-air-gapped-deploy.md",
@@ -1485,7 +1540,7 @@
       "redirect_url": "/previous-versions/azure/partner-solutions/split-experimentation/troubleshoot",
       "redirect_document_id": false
     },
-     {
+    {
       "source_path": "articles/virtual-desktop/virtual-desktop-fall-2019/classic-retirement.md",
       "redirect_url": "/previous-versions/azure/virtual-desktop-classic/classic-retirement",
       "redirect_document_id": false
@@ -2994,7 +3049,8 @@
       "source_path_from_root": "/articles/ddos-protection/telemetry-monitoring-alerting.md",
       "redirect_url": "/azure/ddos-protection/telemetry",
       "redirect_document_id": false
-    },    {
+    },
+    {
       "source_path_from_root": "/articles/ddos-protection/telemetry.md",
       "redirect_url": "/azure/ddos-protection/monitor-ddos-protection",
       "redirect_document_id": false
@@ -3288,7 +3344,7 @@
       "source_path_from_root": "/articles/dns/dns-alerts-metrics.md",
       "redirect_url": "/azure/dns/monitor-dns",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path_from_root": "/articles/docker/index.yml",
       "redirect_url": "/dotnet/architecture/microservices/container-docker-introduction/docker-defined",
@@ -5199,6 +5255,11 @@
       "redirect_url": "/azure/virtual-wan/virtual-wan-about",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-wan/openvpn-azure-ad-client.md",
+      "redirect_url": "/azure/virtual-wan/point-to-site-entra-vpn-client-windows",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/virtual-wan/high-availability-vpn-client.md",
       "redirect_url": "/azure/virtual-wan/global-hub-profile",
@@ -5214,6 +5275,11 @@
       "redirect_url": "/azure/virtual-wan/monitor-virtual-wan",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-wan/openvpn-azure-ad-client-mac.md",
+      "redirect_url": "/azure/virtual-wan/point-to-site-entra-vpn-client-mac",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/virtual-wan/monitoring-best-practices.md",
       "redirect_url": "/azure/virtual-wan/monitor-virtual-wan",
@@ -5653,8 +5719,8 @@
       "source_path_from_root": "/articles/defender-for-iot/device-builders/defender-iot-firmware-analysis-rbac.md",
       "redirect_url": "/azure/firmware-analysis/overview-firmware-analysis",
       "redirect_document_id": false
-     },
-     {
+    },
+    {
       "source_path_from_root": "/articles/virtual-network/ip-services/public-ip-upgrade-portal.md",
       "redirect_url": "/azure/virtual-network/ip-services/public-ip-upgrade",
       "redirect_document_id": false
@@ -5708,7 +5774,7 @@
       "source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-powershell.md",
       "redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-portal.md",
       "redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
@@ -5817,7 +5883,7 @@
     {
       "source_path": "articles/virtual-desktop/troubleshoot-management-issues.md",
       "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-management-issues",
-      "redirect_document_id": false  
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/virtual-desktop/troubleshoot-multimedia-redirection.md",
@@ -5878,6 +5944,31 @@
       "source_path_from_root": "/articles/reliability/reliability-hdinsight-on-aks.md",
       "redirect_url": "/azure/reliability/overview-reliability-guidance",
       "redirect_document_id": false
-    }
+    },
+    {
+      "source_path_from_root": "/articles/reliability/sovereign-cloud-china.md",
+      "redirect_url": "/azure/china/concepts-service-availability",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/managed-grafana/concept-role-based-access-control.md",
+      "redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/managed-grafana/how-to-share-grafana-workspace.md",
+      "redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/sentinel/resources.md",
+      "redirect_url": "/azure/sentinel/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/nat-gateway/tutorial-dual-stack-outbound-nat-load-balancer.md",
+      "redirect_url": "/azure/nat-gateway/nat-overview",
+      "redirect_document_id": false
+    },
   ]
 }

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

@@ -8,7 +8,7 @@ manager: CelesteDG
 ms.service: azure-active-directory
 
 ms.topic: concept-article
-ms.date: 01/11/2024
+ms.date: 02/17/2025
 ms.author: kengaderdus
 ms.subservice: b2c
 

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

@@ -1,11 +1,11 @@
 ---
 title: Enable CAPTCHA in Azure Active Directory B2C  
-description: How to enable CAPTCHA for user flows and custom policies in Azure Active Directory B2C.
+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.
 author: kengaderdus
 manager: mwongerapk
 ms.service: azure-active-directory
 ms.topic: how-to
-ms.date: 05/03/2024
+ms.date: 02/18/2024
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: b2c
@@ -50,7 +50,7 @@ Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to preven
 
 ## Test the user flow
 
-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.
+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.
 
 ::: zone-end
 
@@ -387,15 +387,15 @@ Use the steps in [Upload the policies](tutorial-create-user-flows.md?pivots=b2c-
 
 ## Test the custom policy
 
-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.
+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.
 
 ::: zone-end
 
 > [!NOTE]
 > - You can't add CAPTCHA to an MFA step in a sign-up only user flow.
 > - In an MFA flow, CAPTCHA is applicable where the MFA method you select is SMS or phone call, SMS only or Phone call only.
 
-## Next steps 
+## Related content
 
 - Learn how to [Define a CAPTCHA technical profile](captcha-technical-profile.md).
 - Learn how to [Configure CAPTCHA display control](display-control-captcha.md).

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

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: azure-active-directory
 
 ms.topic: how-to
-ms.date: 01/11/2024
+ms.date: 02/19/2025
 ms.author: kengaderdus
 ms.subservice: b2c
 zone_pivot_groups: b2c-policy-type
@@ -164,7 +164,7 @@ The password change flow involves the following steps:
 1. For **Application**, select the application that you registered earlier. To see the token, the **Reply URL** should show `https://jwt.ms`.
 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.
 
-## Next steps
+## Related content
 
 * Find the [sample policy on GitHub](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/password-change).
 * Learn about how you can [configure password complexity in Azure AD B2C](password-complexity.md).