Resolved conflict

Author: rolyon

.openpublishing.publish.config.json

@@ -128,12 +128,6 @@
             "branch": "master",
             "branch_mapping": {}
         },
-        {
-            "path_to_root": "azure-docs-snippets-pr",
-            "url": "https://github.com/MicrosoftDocs/azure-docs-snippets-pr",
-            "branch": "main",
-            "branch_mapping": {}
-        },
         {
             "path_to_root": "azure-functions-dapr-extension",
             "url": "https://github.com/Azure/azure-functions-dapr-extension",

.openpublishing.redirection.json

@@ -78,10 +78,10 @@ Content-type: application/json
      }
  ],
  "displayName": "John Smith",
- "objectId": "ab3ec3b2-a435-45e4-b93a-56a005e88bb7",
+ "objectId": "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb",
  "extension_<extensions-app-id>_CustomAttribute1": "custom attribute value",
  "extension_<extensions-app-id>_CustomAttribute2": "custom attribute value",
- "client_id": "231c70e8-8424-48ac-9b5d-5623b9e4ccf3",
+ "client_id": "00001111-aaaa-2222-bbbb-3333cccc4444",
  "step": "PreTokenIssuance",
  "ui_locales":"en-US"
 }
@@ -169,7 +169,7 @@ A claim provides temporary storage of data during an Azure AD B2C policy executi
 </ClaimType>
 ```
 ## Add the RESTful API technical profile 
-A [Restful technical profile](restful-technical-profile.md) provides support for interfacing with your own RESTful service. Azure AD B2C sends data to the RESTful service in an `InputClaims` collection and receives data back in an `OutputClaims` collection. Find the **ClaimsProviders** element in your <em>**`TrustFrameworkExtensions.xml`**</em> file and add a new claims provider as follows:
+A [RESTful technical profile](restful-technical-profile.md) provides support for interfacing with your own RESTful service. Azure AD B2C sends data to the RESTful service in an `InputClaims` collection and receives data back in an `OutputClaims` collection. Find the **ClaimsProviders** element in your <em>**`TrustFrameworkExtensions.xml`**</em> file and add a new claims provider as follows:
 ```xml
 <ClaimsProvider>
   <DisplayName>REST APIs</DisplayName>
@@ -280,8 +280,8 @@ Save the files you changed: *TrustFrameworkBase.xml*, and *TrustFrameworkExtensi
   "exp": 1584961516,
   "nbf": 1584957916,
   "ver": "1.0",
-  "iss": "https://contoso.b2clogin.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
-  "aud": "e1d2612f-c2bc-4599-8e7b-d874eaca1ee1",
+  "iss": "https://contoso.b2clogin.com/aaaabbbb-0000-cccc-1111-dddd2222eeee/v2.0/",
+  "aud": "11112222-bbbb-3333-cccc-4444dddd5555",
   "acr": "b2c_1a_signup_signin",
   "nonce": "defaultNonce",
   "iat": 1584957916,

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

@@ -76,7 +76,7 @@ Content-type: application/json
      }
  ],
  "displayName": "John Smith",
- "objectId": "11111111-0000-0000-0000-000000000000",
+ "objectId": "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb",
  "givenName":"John",
  "surname":"Smith",
  "jobTitle":"Supplier",
@@ -88,7 +88,7 @@ Content-type: application/json
  "extension_<extensions-app-id>_CustomAttribute1": "custom attribute value",
  "extension_<extensions-app-id>_CustomAttribute2": "custom attribute value",
  "step": "<step-name>",
- "client_id":"93fd07aa-333c-409d-955d-96008fd08dd9",
+ "client_id":"00001111-aaaa-2222-bbbb-3333cccc4444",
  "ui_locales":"en-US"
 }
 ```
@@ -211,7 +211,7 @@ Content-type: application/json
  "extension_<extensions-app-id>_CustomAttribute1": "custom attribute value",
  "extension_<extensions-app-id>_CustomAttribute2": "custom attribute value",
  "step": "PostAttributeCollection",
- "client_id":"93fd07aa-333c-409d-955d-96008fd08dd9",
+ "client_id":"00001111-aaaa-2222-bbbb-3333cccc4444",
  "ui_locales":"en-US"
 }
 ```
@@ -262,7 +262,7 @@ POST <API-endpoint>
 Content-type: application/json
 
 {
- "clientId": "231c70e8-8424-48ac-9b5d-5623b9e4ccf3",
+ "clientId": "11112222-bbbb-3333-cccc-4444dddd5555",
  "step": "PreTokenApplicationClaims",
  "ui_locales":"en-US",
  "email": "[email protected]",
@@ -442,7 +442,7 @@ A claim provides temporary storage of data during an Azure AD B2C policy executi
 
 ## Add the RESTful API technical profile 
 
-A [Restful technical profile](restful-technical-profile.md) provides support for interfacing to your own RESTful service. Azure AD B2C sends data to the RESTful service in an `InputClaims` collection and receives data back in an `OutputClaims` collection. Find the **ClaimsProviders** element and add a new claims provider as follows:
+A [RESTful technical profile](restful-technical-profile.md) provides support for interfacing to your own RESTful service. Azure AD B2C sends data to the RESTful service in an `InputClaims` collection and receives data back in an `OutputClaims` collection. Find the **ClaimsProviders** element and add a new claims provider as follows:
 
 ```xml
 <ClaimsProvider>
@@ -597,8 +597,8 @@ To return the promo code claim back to the relying party application, add an out
   "exp": 1584295703,
   "nbf": 1584292103,
   "ver": "1.0",
-  "iss": "https://contoso.b2clogin.com/f06c2fe8-709f-4030-85dc-38a4bfd9e82d/v2.0/",
-  "aud": "e1d2612f-c2bc-4599-8e7b-d874eaca1ee1",
+  "iss": "https://contoso.b2clogin.com/aaaabbbb-0000-cccc-1111-dddd2222eeee/v2.0/",
+  "aud": "22223333-cccc-4444-dddd-5555eeee6666",
   "acr": "b2c_1a_signup_signin",
   "nonce": "defaultNonce",
   "iat": 1584292103,

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

@@ -234,9 +234,9 @@ For the various page layouts, use the following page layout versions:
 
 |Page layout |Page layout version range |
 |---------|---------|
-| Selfasserted  | >=2.1.30 |
-| Unifiedssp  | >=2.1.18 |
-|  Multifactor  |    >=1.2.16  |
+| Selfasserted  | >=2.1.33 |
+| Unifiedssp  | >=2.1.21 |
+|  Multifactor  |    >=1.2.19  |
 
 **Example:**
 

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

@@ -6,7 +6,7 @@ author: garrodonnell
 manager: CelesteDG
 ms.service: azure-active-directory
 ms.topic: how-to
-ms.date: 11/27/2023
+ms.date: 11/27/2024
 ms.author: godonnell
 ms.subservice: b2c
 zone_pivot_groups: b2c-policy-type

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

@@ -316,7 +316,7 @@ POST /<tenant-name>.onmicrosoft.com/B2C_1A_ROPC_Auth/oauth2/v2.0/token HTTP/1.1
 Host: <tenant-name>.b2clogin.com
 Content-Type: application/x-www-form-urlencoded
 
-username=contosouser.outlook.com.ws&password=Passxword1&grant_type=password&scope=openid+bef22d56-552f-4a5b-b90a-1988a7d634ce+offline_access&client_id=bef22d56-552f-4a5b-b90a-1988a7d634ce&response_type=token+id_token
+username=contosouser.outlook.com.ws&password=Passxword1&grant_type=password&scope=openid+00001111-aaaa-2222-bbbb-3333cccc4444+offline_access&client_id=00001111-aaaa-2222-bbbb-3333cccc4444&response_type=token+id_token
 ```
 
 A successful response with offline-access looks like the following example:
@@ -379,4 +379,4 @@ A successful response looks like the following example:
 
 ## Use a native SDK or App-Auth
 
-Azure AD B2C meets OAuth 2.0 standards for public client resource owner password credentials and should be compatible with most client SDKs. For the latest information, see [Native App SDK for OAuth 2.0 and OpenID Connect implementing modern best practices](https://appauth.io/).
+Azure AD B2C meets OAuth 2.0 standards for public client resource owner password credentials and should be compatible with most client SDKs. For the latest information, see [Native App SDK for OAuth 2.0 and OpenID Connect implementing modern best practices](https://appauth.io/).

articles/active-directory-b2c/add-ropc-policy.md

@@ -6,7 +6,7 @@ author: garrodonnell
 manager: CelesteDG
 ms.service: azure-active-directory
 ms.topic: how-to
-ms.date: 03/22/2024
+ms.date: 01/10/2025
 ms.author: godonnell
 ms.subservice: b2c
 ms.custom: "b2c-support"

articles/active-directory-b2c/add-sign-up-and-sign-in-policy.md

@@ -25,7 +25,7 @@ Age gating in Azure Active Directory B2C (Azure AD B2C) enables you to identify
 >This feature is in public preview. Do not use feature for production applications.
 >
 
-When age gating is enabled for a user flow, users are asked for their date of birth, and country of residence. If a user signs in that hasn't previously entered the information, they'll need to enter it the next time they sign in. The rules are applied every time a user signs in.
+When age gating is enabled for a user flow, users are asked for their date of birth, and country/region of residence. If a user signs in that hasn't previously entered the information, they'll need to enter it the next time they sign in. The rules are applied every time a user signs in.
 
 ![Screenshot of age gating information gather flow](./media/age-gating/age-gating-information-gathering.png)
 
@@ -69,7 +69,7 @@ After your tenant is set up to use age gating, you can then use this feature in
 1. To test your policy, select **Run user flow**.
 1. For **Application**, select the web application named *testapp1* that you previously registered. The **Reply URL** should show `https://jwt.ms`.
 1. Select the **Run user flow** button.
-1. Sign-in with a local or social account. Then select your country of residence, and date of birth that simulate a minor. 
+1. Sign-in with a local or social account. Then select your country/region of residence, and date of birth that simulate a minor. 
 1. Repeat the test, and select a date of birth that simulates an adult.  
 
 When you sign-in as a minor, you should see the following error message: *Unfortunately, your sign on has been blocked. Privacy and online safety laws in your country prevent access to accounts belonging to children.*

articles/active-directory-b2c/age-gating.md

@@ -244,7 +244,7 @@ If you reference a REST API technical profile directly from a user journey, the
 
 ## Development of your REST API 
 
-Your REST API can be developed on any platform and written in any programing language, as long as it's secure and can send and receive claims in JSON format.
+Your REST API can be developed on any platform and written in any programming language, as long as it's secure and can send and receive claims in JSON format.
 
 The request to your REST API service comes from Azure AD B2C servers. The REST API service must be published to a publicly accessible HTTPS endpoint. The REST API call arrives from an Azure data center IP address.