resolved conflicts

Author: wtnlee

.openpublishing.redirection.json

@@ -7,9 +7,9 @@ see the [LICENSE](LICENSE) file, and grant you a license to any code in the repo
 Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
 may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
 The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
-Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
+You can find Microsoft general trademark guidelines at [Microsoft Trademark and Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks).
 
-Privacy information can be found at https://privacy.microsoft.com/en-us/
+For privacy information, see [privacy at Microsoft](https://privacy.microsoft.com/en-us/).
 
 Microsoft and any contributors reserve all other rights, whether under their respective copyrights, patents,
 or trademarks, whether by implication, estoppel, or otherwise.

ThirdPartyNotices.md

@@ -629,7 +629,7 @@ Ensure that:
 * Your API explicitly checks for null values of received claims that it depends on.
 * Your API implements an authentication method outlined in [secure your API Connector](secure-rest-api.md).
 * Your API responds as quickly as possible to ensure a fluid user experience.
-    * Azure AD B2C will wait for a maximum of *20 seconds* to receive a response. If none is received, it will make *one more attempt (retry)* at calling your API.
+    * Azure AD B2C will wait for a maximum of *10 seconds* to receive a response. If none is received, it will make *one more attempt (retry)* at calling your API.
     * If using a serverless function or scalable web service, use a hosting plan that keeps the API "awake" or "warm" in production. For Azure Functions, it's recommended to use at minimum the [Premium plan](../azure-functions/functions-scale.md) in production.
 * Ensure high availability of your API.
 * Monitor and optimize performance of downstream APIs, databases, or other dependencies of your API.

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

@@ -85,7 +85,7 @@ Using Azure AD B2C, you can add your own business logic to a user journey by cal
 ![Diagram of a RESTful service claims exchange](media/api-connectors-overview/restful-service-claims-exchange.png)
 
 > [!NOTE]
-> If there is slow or no response from the RESTful service to Azure AD B2C, the timeout is 30 seconds and the retry count is two times (meaning there are 3 tries in total). Currently, you can't configure the timeout and retry count settings.
+> HTTP requests may be cancelled if there is a slow or no response from the RESTful service to Azure AD B2C. The default timeout is 10 seconds and the default retry count is one (meaning there are 2 tries in total).
 
 ## Calling a RESTful service
 
@@ -165,7 +165,7 @@ A null value in a database is used when the value in a column is unknown or miss
 When an element is null, either:
 
 - Omit the key-value pair from the JSON.
-- Return a value that corresponds to the Azure AD B2C claim data type. For example, for a `string` data type, return empty string `""`. For an `integer` data type, return a zero value `0`. For a `dateTime`  data type, return a minimum value `1970-00-00T00:00:00.0000000Z`.
+- Return a value that corresponds to the Azure AD B2C claim data type. For example, for a `string` data type, return empty string `""`. For an `integer` data type, return a zero value `0`. For a `dateTime`  data type, return a minimum value `0001-01-01T00:00:00.0000000Z`.
 
 The following example demonstrates how to handle a null value. The email is omitted from the JSON:
 

articles/active-directory-b2c/api-connectors-overview.md

@@ -1,14 +1,14 @@
 ---
 title: "ClaimsSchema: Azure Active Directory B2C"
-description: Specify the ClaimsSchema element of a custom policy in Azure Active Directory B2C.
+description: Specify the ClaimsSchema element of a custom policy in Azure AD B2C. Define and manage claim types for user attributes and input controls.
 
 author: kengaderdus
 manager: CelesteDG
 
 ms.service: azure-active-directory
 
 ms.topic: reference
-ms.date: 01/11/2024
+ms.date: 03/21/2025
 ms.author: kengaderdus
 ms.subservice: b2c
 ms.custom: "b2c-support"

articles/active-directory-b2c/claimsschema.md

@@ -1,7 +1,7 @@
 ---
 title: Create branching in user journey by using Azure AD B2C custom policy 
 titleSuffix: Azure AD B2C
-description: Learn how to enable or disable Technical Profiles based on claims values. Learn how to branch in user journeys by enabling and disabling Azure AD B2C custom policy technical profiles.      
+description: Learn how to create branching in user journeys using Azure AD B2C custom policies. Enable or disable technical profiles based on claim values. 
 
 author: kengaderdus
 manager: CelesteDG
@@ -10,7 +10,7 @@ ms.service: azure-active-directory
 
 ms.topic: how-to
 ms.custom: b2c-docs-improvements
-ms.date: 10/11/2024
+ms.date: 03/21/2025
 ms.author: kengaderdus
 ms.reviewer: yoelh
 ms.subservice: b2c
@@ -233,12 +233,12 @@ Follow the steps in [Test the custom policy](custom-policies-series-validate-use
 1. Repeat step 5, but this time, select **Account Type**, select **Contoso Employee Account**, and then follow the prompts.  
 
 
-## Next steps
+## Related content
 
 In [step 3](#step-3---configure-or-update-technical-profiles), we enable or disable  the technical profile by using the `EnabledForUserJourneys` element. Alternatively, you can use [Preconditions](userjourneys.md#preconditions) inside the user journey orchestration steps to execute or skip an orchestration step as we learn later in this series.
 
 Next, learn: 
 
 - About [User Journey Orchestration Steps Preconditions](userjourneys.md#preconditions).
 
--  How to [Use the TrustFrameworkPolicy schema file to validate Azure AD B2C policy files](custom-policies-series-install-xml-extensions.md).
+- How to [Use the TrustFrameworkPolicy schema file to validate Azure AD B2C policy files](custom-policies-series-install-xml-extensions.md).

articles/active-directory-b2c/custom-policies-series-branch-user-journey.md

@@ -1,7 +1,7 @@
 ---
-title: Call a REST API by using Azure Active Directory B2C custom policy
+title: Call a REST API by using Azure AD B2C custom policy
 titleSuffix: Azure AD B2C
-description: Learn how to make an HTTP call to external API by using Azure Active Directory B2C custom policy.
+description: Learn how to call a REST API using Azure AD B2C custom policy. Make HTTP calls to external APIs to send and receive data from external services.
 
 author: kengaderdus
 manager: CelesteDG
@@ -10,7 +10,7 @@ ms.service: azure-active-directory
 
 ms.topic: how-to
 ms.custom: b2c-docs-improvements, devx-track-js
-ms.date: 10/11/2024
+ms.date: 03/21/2025
 ms.author: kengaderdus
 ms.reviewer: yoelh
 ms.subservice: b2c
@@ -93,7 +93,7 @@ You need to deploy an app, which serves as your external app. Your custom policy
                     "requestId": "requestId",
                     "userMessage" : "The access code you entered is incorrect. Please try again.",
                     "developerMessage" : `The provided code ${req.body.accessCode} does not match the expected code for user.`,
-                    "moreInfo" :"https://docs.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
+                    "moreInfo" :"https://learn.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
                 };
                 res.status(409).send(errorResponse);                
             }
@@ -138,7 +138,7 @@ You need to deploy an app, which serves as your external app. Your custom policy
             "requestId": "requestId",
             "userMessage": "The access code you entered is incorrect. Please try again.",
             "developerMessage": "The provided code 54321 does not match the expected code for user.",
-            "moreInfo": "https://docs.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
+            "moreInfo": "https://learn.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
         }
     ```
 Your REST service can return HTTP 4xx status code, but the value of `status` in the JSON response must be `409`.
@@ -313,7 +313,7 @@ If your REST API returns data, which you want to include as claims in your polic
 
 Use the steps in [Receiving data](api-connectors-overview.md?pivots=b2c-custom-policy#receiving-data) to learn how to format the data the custom policy expects, how to handle nulls values, and how to parse REST the API's nested JSON body.
 
-## Next steps
+## Related content
 
 Next, learn:
 

articles/active-directory-b2c/custom-policies-series-call-rest-api.md

@@ -10,7 +10,7 @@ ms.service: azure-active-directory
 
 ms.topic: how-to
 ms.custom: b2c-docs-improvements
-ms.date: 10/11/2024
+ms.date: 03/21/2025
 ms.author: kengaderdus
 ms.reviewer: yoelh
 ms.subservice: b2c
@@ -504,10 +504,10 @@ After the policy finishes execution, you're redirected to `https://jwt.ms`, and
     }.[Signature]
 ``` 
 
-## Next steps 
+## Related content
 
 Next, learn:
 
 - About the [types of Technical Profiles](technicalprofiles.md#types-of-technical-profiles) in Azure AD B2C's custom policies. 
 
-- How to [Validate user inputs by using custom policy](custom-policies-series-validate-user-input.md).
+- How to [Validate user inputs by using custom policy](custom-policies-series-validate-user-input.md).

articles/active-directory-b2c/custom-policies-series-collect-user-input.md

@@ -1,7 +1,7 @@
 ---
 title: Write your first Azure AD B2C custom policy - Hello World! 
 titleSuffix: Azure AD B2C
-description: Learn how to write your first custom policy. A custom that shows of returns Hello World message. 
+description: Learn how to write your first Azure AD B2C custom policy. Configure keys, build the policy file, upload it to Azure, and test the custom policy.
 
 author: kengaderdus
 manager: CelesteDG
@@ -10,7 +10,7 @@ ms.service: azure-active-directory
 
 ms.topic: how-to
 ms.custom: b2c-docs-improvements
-ms.date: 10/11/2024
+ms.date: 03/21/2025
 ms.author: kengaderdus
 ms.reviewer: yoelh
 ms.subservice: b2c
@@ -286,7 +286,7 @@ After the policy finishes execution, you're redirected to `https://jwt.ms`, and
 
 Notice the `message` and `sub` claims, which we set as [output claims](relyingparty.md#outputclaims) in the `RelyingParty` section. 
 
-## Next steps
+## Related content
 
 In this article, you learned and used four sections that are included in an Azure AD B2C custom policy. These sections are added as child elements the `TrustFrameworkPolicy` root element: 
 

articles/active-directory-b2c/custom-policies-series-hello-world.md

@@ -1,7 +1,7 @@
 ---
-title: Create and run your own custom policies in Azure Active Directory B2C
+title: Create and run your own custom policies in Azure AD B2C
 titleSuffix: Azure AD B2C
-description: Learn how to create and run your own custom policies in Azure Active Directory B2C. Learn how to create Azure Active Directory B2C custom policies from scratch in a how-to guide series.
+description: Learn how to create and run custom policies in Azure AD B2C. Follow a how-to guide series to build custom policies from scratch for complex user journeys.
 
 author: kengaderdus
 manager: CelesteDG
@@ -10,7 +10,7 @@ ms.service: azure-active-directory
 
 ms.topic: how-to
 ms.custom: b2c-docs-improvements
-ms.date: 10/11/2024
+ms.date: 03/21/2025
 ms.author: kengaderdus
 ms.reviewer: yoelh
 ms.subservice: b2c
@@ -48,7 +48,7 @@ This how-to guide series consists of multiple articles. We recommend that you st
 |[Set up a sign-up and sign-in flow by using Azure Active Directory B2C custom policy](custom-policies-series-sign-up-or-sign-in.md). | Learn how to configure a sign-up and sign-in flow for a local account(using email and password) by using Azure Active Directory B2C custom policy. You show a user a sign-in interface for them to sign in by using their existing account, but they can create a new account if they don't already have one.|
 | [Set up a sign-up and sign-in flow with a social account by using Azure Active Directory B2C custom policy](custom-policies-series-sign-up-or-sign-in-federation.md) | Learn how to configure a sign-up and sign-in flow for a social account, Facebook. You also learn to combine local and social sign-up and sign-in flow.|
 
-## Next steps 
+## Related content
 
 - Learn about [Azure AD B2C TrustFrameworkPolicy BuildingBlocks](buildingblocks.md)