Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into tsk544786-sfi-bastion

Author: asudbring

.openpublishing.publish.config.json

@@ -834,12 +834,6 @@
             "branch": "tutorial",
             "branch_mapping": {}
         },
-        {
-            "path_to_root": "samples-tsi",
-            "url": "https://github.com/Azure-Samples/Azure-Time-Series-Insights",
-            "branch": "master",
-            "branch_mapping": {}
-        },
         {
             "path_to_root": "storage-mgmt-devguide-dotnet",
             "url": "https://github.com/Azure-Samples/storage-mgmt-devguide-dotnet",

.openpublishing.redirection.json

@@ -1,5 +1,20 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/network-watcher/network-watcher-using-open-source-tools.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-using-open-source-tools",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/network-watcher/network-watcher-intrusion-detection-open-source-tools.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-intrusion-detection-open-source-tools",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/migrate-cdn-to-front-door.md",
+      "redirect_url": "/previous-versions/azure/frontdoor/migrate-cdn-to-front-door",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/synapse-analytics/data-explorer/data-explorer-compare.md",
       "redirect_url": "/previous-versions/azure/synapse-analytics/data-explorer/data-explorer-compare",
@@ -230,7 +245,7 @@
       "redirect_url": "/azure/resiliency/quick-understand-protection-estate",
       "redirect_document_id": false
     },
-      {
+    {
       "source_path": "articles/business-continuity-center/business-continuity-center-support-matrix.md",
       "redirect_url": "/azure/resiliency/resiliency-support-matrix",
       "redirect_document_id": false
@@ -258,42 +273,27 @@
     {
       "source_path": "articles/migrate/concepts-azure-spring-apps-assessment-calculation.md",
       "redirect_url": "/azure/migrate",
-      "redirect_document_id": false,
-      "monikers": [
-        "migrate"
-      ]
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/migrate/how-to-create-azure-spring-apps-assessment.md",
       "redirect_url": "/azure/migrate",
-      "redirect_document_id": false,
-      "monikers": [
-        "migrate"
-      ]
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/migrate/troubleshoot-spring-boot-discovery.md",
       "redirect_url": "/azure/migrate",
-      "redirect_document_id": false,
-      "monikers": [
-        "migrate"
-      ]
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/migrate/tutorial-assess-spring-boot.md",
       "redirect_url": "/azure/migrate",
-      "redirect_document_id": false,
-      "monikers": [
-        "migrate"
-      ]
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/migrate/tutorial-discover-spring-boot.md",
       "redirect_url": "/azure/migrate",
-      "redirect_document_id": false,
-      "monikers": [
-        "migrate"
-      ]
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/azure-functions/functions-proxies.md",
@@ -1227,7 +1227,8 @@
     },
     {
       "source_path": "articles/databox-online/azure-stack-edge-2301-release-notes.md",
-      "redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes"
+      "redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/network-watcher/nsg-flow-logs-rest.md",
@@ -2891,7 +2892,12 @@
     },
     {
       "source_path_from_root": "/articles/bastion/quickstart-developer-sku.md",
-      "redirect_url": "/azure/bastion/quickstart-developer",
+      "redirect_url": "/azure/bastion/quickstart-host-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/bastion/quickstart-developer.md",
+      "redirect_url": "/azure/bastion/quickstart-host-portal",
       "redirect_document_id": false
     },
     {
@@ -2906,7 +2912,12 @@
     },
     {
       "source_path_from_root": "/articles/bastion/bastion-create-host-portal.md",
-      "redirect_url": "/azure/bastion/tutorial-create-host-portal",
+      "redirect_url": "/azure/bastion/quickstart-host-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/bastion/tutorial-create-host-portal.md",
+      "redirect_url": "/azure/bastion/quickstart-host-portal",
       "redirect_document_id": false
     },
     {
@@ -6379,8 +6390,7 @@
       "redirect_url": "/azure/cyclecloud/release-notes/ccws/2025-02-06",
       "redirect_document_id": false
     },
-
-    {  
+    {
       "source_path": "articles/app-service/sre-agent-overview.md",
       "redirect_url": "/azure/sre-agent/overview",
       "redirect_document_id": false
@@ -6430,21 +6440,11 @@
       "redirect_url": "/azure/iot-hub-device-update/",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/reliability/reliability-azure-container-apps.md",
-      "redirect_url": "/azure/reliability/reliability-container-apps",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/storage/container-storage/container-storage-aks-quickstart.md",
       "redirect_url": "/azure/storage/container-storage/install-container-storage-aks",
       "redirect_document_id": true
     },
-    {
-      "source_path": "articles/reliability/reliability-cosmos-mongodb.md",
-      "redirect_url": "/azure/reliability/reliability-documentdb",
-      "redirect_document_id": true
-    },
     {
       "source_path": "articles/communications-gateway/connectivity.md",
       "redirect_url": "/previous-versions/azure/communications-gateway/connectivity",
@@ -6634,23 +6634,33 @@
       "source_path": "articles/communications-gateway/whats-new.md",
       "redirect_url": "/previous-versions/azure/communications-gateway/whats-new",
       "redirect_document_id": false
-      },
+    },
     {
       "source_path": "articles/vpn-gateway/about-zone-redundant-vnet-gateways.md",
       "redirect_url": "/azure/reliability/reliability-virtual-network-gateway",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/dns/dns-sdk.md",
       "redirect_url": "https://learn.microsoft.com/dotnet/api/overview/azure/resourcemanager.dns-readme",
       "redirect_document_id": false
     },
-    { 
+    {
       "source_path": "articles/oracle/oracle-db/exadata-vm-clusters.md",
       "redirect_url": "/azure/oracle/oracle-db/database-overview",
       "redirect_document_id": false
     },
     { 
+      "source_path": "articles/cyclecloud/how-to/ccws/register-entra-id-app.md",
+      "redirect_url": "/azure/cyclecloud/how-to/create-app-registration",
+      "redirect_document_id": false
+    },
+    { 
+      "source_path": "articles/cyclecloud/how-to/ccws/open-ondemand-add-users.md",
+      "redirect_url": "/azure/cyclecloud/how-to/ccws/configure-open-ondemand",
+      "redirect_document_id": false
+    },   
+    {
       "source_path": "articles/reliability/reliability-health-insights.md",
       "redirect_url": "/azure/azure-health-insights/reliability-health-insights",
       "redirect_document_id": false
@@ -6664,6 +6674,11 @@
       "source_path": "articles/nat-gateway/nat-availability-zones.md",
       "redirect_url": "/azure/reliability/reliability-nat-gateway",
       "redirect_document_id": false
-    }
+    },
+    {
+      "source_path": "articles/cyclecloud/how-to/collect-custom-metrics-gpu-infiniband-telegraf.md",
+      "redirect_url": "/azure/cyclecloud/how-to/monitor-cyclecloud-cluster-using-prometheus-grafana",
+      "redirect_document_id": false
+    }    
   ]
 }

CODEOWNERS

@@ -2,19 +2,19 @@
 # Each line is a file pattern followed by one or more owners.
 
 # Folder paths in this list have been migrated to new repositories and content can no longer be created for these services in this repo.
-/articles/aks @tynevi @thomps23 @jasonwhowell
-/articles/defender-for-cloud  @tynevi @thomps23 @jasonwhowell
-/articles/attestation  @tynevi @thomps23 @jasonwhowell
-/articles/confidential-ledger  @tynevi @thomps23 @jasonwhowell
-/articles/dedicated-hsm  @tynevi @thomps23 @jasonwhowell
-/articles/key-vault  @tynevi @thomps23 @jasonwhowell
-/articles/payment-hsm  @tynevi @thomps23 @jasonwhowell
-/articles/postgresql @tynevi @thomps23 @jasonwhowell
-/articles/cosmos-db @tynevi @thomps23 @jasonwhowell
-/articles/dms @tynevi @thomps23 @jasonwhowell
-/articles/mariadb @tynevi @thomps23 @jasonwhowell
-/articles/mysql @tynevi @thomps23 @jasonwhowell
-/articles/managed-instance-apache-cassandra @tynevi @thomps23 @jasonwhowell
+/articles/aks @thomps23 @jasonwhowell
+/articles/defender-for-cloud @thomps23 @jasonwhowell
+/articles/attestation @thomps23 @jasonwhowell
+/articles/confidential-ledger @thomps23 @jasonwhowell
+/articles/dedicated-hsm @thomps23 @jasonwhowell
+/articles/key-vault @thomps23 @jasonwhowell
+/articles/payment-hsm @thomps23 @jasonwhowell
+/articles/postgresql @thomps23 @jasonwhowell
+/articles/cosmos-db @thomps23 @jasonwhowell
+/articles/dms @thomps23 @jasonwhowell
+/articles/mariadb @thomps23 @jasonwhowell
+/articles/mysql @thomps23 @jasonwhowell
+/articles/managed-instance-apache-cassandra @thomps23 @jasonwhowell
 /articles/virtual-machines @jasonwhowell @thomps23
 /articles/virtual-machines-scale-sets @jasonwhowell @thomps23
 /articles/container-instances @jasonwhowell @thomps23
@@ -37,3 +37,4 @@
 /articles/quotas @jasonwhowell @thomps23
 /articles/container-registry @jasonwhowell @thomps23
 /articles/kubernetes-fleet @MicrosoftDocs/azure-docs-codeowners
+/articles/reliability @thomps23

articles/active-directory-b2c/add-api-connector.md

@@ -160,7 +160,7 @@ Content-type: application/json
 }
 ```
 
-The exact claims sent to the API depend on the information is provided by the identity provider. 'email' is always sent.
+The exact claims sent to the API depend on the information provided by the identity provider. 'email' is always sent.
 
 ### Expected response types from the web API at this step
 

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

@@ -11,7 +11,7 @@ ms.author: kengaderdus
 ms.subservice: b2c
 zone_pivot_groups: b2c-policy-type
 
-#Customer intent: As a developer, I want to enable CAPTCHA in consumer-facing application that is secured by Azure Active Directory B2C, so that I can protect my sign-in and sign-up flows from automated attacks.
+#Customer intent: As a developer, I want to enable CAPTCHA in a consumer-facing application that is secured by Azure Active Directory B2C, so that I can protect my sign-in and sign-up flows from automated attacks.
 
 ---
 
@@ -21,7 +21,7 @@ zone_pivot_groups: b2c-policy-type
 
 [!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
 
-Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to prevent automated attacks on your consumer-facing applications. Azure AD B2C’s CAPTCHA supports both audio and visual CAPTCHA challenges. You can enable this security feature in both sign-up and sign-in flows for your local accounts. CAPTCHA isn't applicable for social identity providers' sign-in.   
+Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to prevent automated attacks on your consumer-facing applications. Azure AD B2C CAPTCHA supports both audio and visual challenges. You can enable this security feature in both sign-up and sign-in flows for your local accounts. CAPTCHA isn't applicable for social identity providers' sign-in.   
 
 > [!NOTE]
 > This feature is in public preview
@@ -52,7 +52,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) that you choose.
 
 ::: zone-end
 
@@ -395,7 +395,7 @@ Use the steps in [Test the custom policy](tutorial-create-user-flows.md?pivots=b
 
 > [!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.
+> - In an MFA flow, CAPTCHA is applicable where the MFA method you select is SMS or phone call, SMS only, or phone call only.
 
 ## Related content
 

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

@@ -12,7 +12,7 @@ ms.subservice: b2c
 zone_pivot_groups: b2c-policy-type
 ms.custom: sfi-image-nochange
 
-#Customer Intent: As an Azure AD B2C administrator, I want to set up a password reset flow for local accounts, so that users can reset their passwords if they forget them.
+# Customer Intent: As an Azure AD B2C administrator, I want to set up a password reset flow for local accounts, so that users can reset their passwords if they forget them.
 ---
 
 # Set up a password reset flow in Azure Active Directory B2C
@@ -43,7 +43,7 @@ The default name of the **Change email** button in *selfAsserted.html* is **chan
 [!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
 
 
-- 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. 
+- 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. 
 
 
 ## Self-service password reset (recommended)
@@ -52,7 +52,7 @@ The new password reset experience is now part of the sign-up or sign-in policy.
 
 ::: zone pivot="b2c-user-flow"
 
-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.
+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.
 
 To set up self-service password reset for the sign-up or sign-in user flow:
 

articles/active-directory-b2c/authorization-code-flow.md

@@ -69,13 +69,16 @@ client_id=00001111-aaaa-2222-bbbb-3333cccc4444
 | redirect_uri |Required |The redirect URI of your app, where authentication responses are sent and received by your app. It must exactly match one of the redirect URIs that you registered in the portal, except that it must be URL-encoded. |
 | scope |Required |A space-separated list of scopes. The `openid` scope indicates a permission to sign in the user and get data about the user in the form of ID tokens. The `offline_access` scope is optional for web applications. It indicates that your application needs a *refresh token* for extended access to resources. The client-id indicates the token issued are intended for use by Azure AD B2C registered client. The `https://{tenant-name}/{app-id-uri}/{scope}` indicates a permission to protected resources, such as a web API. For more information, see [Request an access token](access-tokens.md#scopes). |
 | response_mode |Recommended |The method that you use to send the resulting authorization code back to your app. It can be `query`, `form_post`, or `fragment`. |
-| state |Recommended |A value included in the request that can be a string of any content that you want to use. Usually, a randomly generated unique value is  used, to prevent cross-site request forgery attacks. The state also is used to encode information about the user's state in the app before the authentication request occurred. For example, the page the user was on, or the user flow that was being executed. |
 | prompt |Optional |The type of user interaction that is required. Currently, the only valid value is `login`, which forces the user to enter their credentials on that request. Single sign-on won't take effect. |
 | code_challenge  | recommended / required | Used to secure authorization code grants via Proof Key for Code Exchange (PKCE). Required if `code_challenge_method` is included. You need to add logic in your application to generate the `code_verifier` and `code_challenge`. The `code_challenge` is a Base64 URL-encoded SHA256 hash of the `code_verifier`. You store the `code_verifier` in your application for later use, and send the `code_challenge` along with the authorization request. For more information, see the [PKCE RFC](https://tools.ietf.org/html/rfc7636). This is now recommended for all application types - native apps, SPAs, and confidential clients like web apps. | 
 | `code_challenge_method` | recommended / required | The method used to encode the `code_verifier` for the `code_challenge` parameter. This *SHOULD* be `S256`, but the spec allows the use of `plain` if for some reason the client can't support SHA256. <br/><br/>If you exclude the `code_challenge_method`, but still include the `code_challenge`, then the  `code_challenge` is assumed to be plaintext. Microsoft identity platform supports both `plain` and `S256`. For more information, see the [PKCE RFC](https://tools.ietf.org/html/rfc7636). This is required for [single page apps using the authorization code flow](tutorial-register-spa.md).|
 | login_hint | No| Can be used to prefill the sign-in name field of the sign-in page. For more information, see [Prepopulate the sign-in name](direct-signin.md#prepopulate-the-sign-in-name).  |
 | domain_hint | No| Provides a hint to Azure AD B2C about the social identity provider that should be used for sign-in. If a valid value is included, the user goes directly to the identity provider sign-in page.  For more information, see [Redirect sign-in to a social provider](direct-signin.md#redirect-sign-in-to-a-social-provider). |
 | Custom parameters | No| Custom parameters that can be used with [custom policies](custom-policy-overview.md). For example, [dynamic custom page content URI](customize-ui-with-html.md?pivots=b2c-custom-policy#configure-dynamic-custom-page-content-uri), or [key-value claim resolvers](claim-resolver-overview.md#oauth2-key-value-parameters). |
+| state |Recommended |A value included in the request that can be a string of any content that you want to use. Usually, a randomly generated unique value is  used, to prevent cross-site request forgery attacks. The state also is used to encode information about the user's state in the app before the authentication request occurred. For example, the page the user was on, or the user flow that was being executed. |
+
+> [!IMPORTANT]
+> For security and privacy, do not put URLs or other sensitive data directly in the state parameter. Instead, use a key or identifier that corresponds to data stored in browser storage, such as localStorage or sessionStorage. This approach lets your app securely reference the necessary data after authentication.
 
 At this point, the user is asked to complete the user flow's workflow. This might involve the user entering their username and password, signing in with a social identity, signing up for the directory, or any other number of steps. User actions depend on how the user flow is defined.