fix conflict

Author: David Curwin

.openpublishing.redirection.defender-for-cloud.json

@@ -1,10 +1,40 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/tutorial-security-policy.md",
+            "redirect_url": "/azure/defender-for-cloud/security-policy-concept",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/how-to-manage-aws-assessments-standards.md",
+            "redirect_url": "/azure/defender-for-cloud/create-custom-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/how-to-manage-gcp-assessments-standards.md",
+            "redirect_url": "/azure/defender-for-cloud/create-custom-recommendations",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/security-center/release-notes.md",
             "redirect_url": "/azure/defender-for-cloud/release-notes",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/concept-credential-scanner-rules.md",
+            "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/concept-devops-posture-management-overview.md",
+            "redirect_url": "/azure/defender-for-cloud/concept-devops-environment-posture-management-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/detect-exposed-secrets.md",
+            "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/security-center/upcoming-changes.md",
             "redirect_url": "/azure/defender-for-cloud/upcoming-changes",
@@ -707,8 +737,8 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-container-registries-cicd.md",
-            "redirect_url": "/azure/defender-for-cloud/defender-for-containers-cicd",
-            "redirect_document_id": true
+            "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-container-registries-usage.md",
@@ -738,7 +768,7 @@
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-cicd.md",
             "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/tutorial-enable-pull-request-annotations.md",
@@ -752,8 +782,8 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/detect-credential-leaks.md",
-            "redirect_url": "/azure/defender-for-cloud/detect-exposed-secrets",
-            "redirect_document_id": true
+            "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-ecr.md",

.openpublishing.redirection.json

@@ -870,6 +870,11 @@
         "redirect_url": "/azure/azure-arc/vmware-vsphere/switch-to-new-version-vmware",
         "redirect_document_id": false
     },
+    {
+        "source_path": "articles/azure-arc/vmware-vsphere/switch-to-new-version-vmware.md",
+        "redirect_url": "/azure/azure-arc/vmware-vsphere/switch-to-new-version",
+        "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/azuread-dev/active-directory-authentication-libraries.md",
       "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/active-directory-authentication-libraries",
@@ -1005,6 +1010,11 @@
           "redirect_URL": "bicep-import",
           "redirect_document_id": false
         },
+        {
+            "source_path": "articles/azure-arc/system-center-virtual-machine-manager/switch-to-the-new-preview-version.md",
+            "redirect_URL": "/azure/azure-arc/system-center-virtual-machine-manager/switch-to-the-new-preview-version-scvmm",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/migrate/tutorial-assess-webapps-physical.md",
             "redirect_URL": "tutorial-assess-webapps",
@@ -12337,6 +12347,11 @@
             "redirect_url": "/azure/defender-for-iot/organizations/tutorial-splunk",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/iot-operations/reference/about-iot-operations-cli.md",
+            "redirect_url": "/cli/azure/iot/ops",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/jenkins/index.yml",
             "redirect_url": "/azure/developer/jenkins/",
@@ -25710,6 +25725,10 @@
             "source_path_from_root": "/articles/operator-service-manager/overview.md",
 	        "redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/kubernetes-fleet/configuration-propagation.md",
+            "redirect_url": "/azure/kubernetes-fleet/resource-propagation"
         }
     ]
 }

articles/active-directory-b2c/TOC.yml

@@ -65,7 +65,7 @@
   items:
   - name: Compare solutions for External Identities
     href: /entra/external-id/external-identities-overview?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
-  - name: Supported Microsoft Entra features
+  - name: Supported Microsoft Entra ID features
     href: supported-azure-ad-features.md
   - name: Learn authentication basics
     items:

articles/active-directory-b2c/aad-sspr-technical-profile.md

@@ -1,7 +1,7 @@
 ---
-title: Microsoft Entra SSPR technical profiles in custom policies
+title: Microsoft Entra ID SSPR technical profiles in custom policies
 titleSuffix: Azure AD B2C
-description: Custom policy reference for Microsoft Entra SSPR technical profiles in Azure AD B2C.
+description: Custom policy reference for Microsoft Entra ID SSPR technical profiles in Azure AD B2C.
 services: active-directory-b2c
 author: kengaderdus
 manager: CelesteDG
@@ -15,11 +15,11 @@ ms.author: kengaderdus
 ms.subservice: B2C
 ---
 
-# Define a Microsoft Entra SSPR technical profile in an Azure AD B2C custom policy
+# Define a Microsoft Entra ID SSPR technical profile in an Azure AD B2C custom policy
 
 [!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
 
-Azure Active Directory B2C (Azure AD B2C) provides support for verifying an email address for self-service password reset (SSPR). Use the Microsoft Entra SSPR technical profile to generate and send a code to an email address, and then verify the code. The Microsoft Entra SSPR technical profile may also return an error message. The validation technical profile validates the user-provided data before the user journey continues. With the validation technical profile, an error message displays on a self-asserted page.
+Azure Active Directory B2C (Azure AD B2C) provides support for verifying an email address for self-service password reset (SSPR). Use the Microsoft Entra ID SSPR technical profile to generate and send a code to an email address, and then verify the code. The Microsoft Entra ID SSPR technical profile may also return an error message. The validation technical profile validates the user-provided data before the user journey continues. With the validation technical profile, an error message displays on a self-asserted page.
 
 This technical profile:
 
@@ -35,7 +35,7 @@ The **Name** attribute of the **Protocol** element needs to be set to `Proprieta
 Web.TPEngine.Providers.AadSsprProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
 ```
 
-The following example shows a Microsoft Entra SSPR technical profile:
+The following example shows a Microsoft Entra ID SSPR technical profile:
 
 ```xml
 <TechnicalProfile Id="AadSspr-SendCode">
@@ -81,7 +81,7 @@ The following metadata can be used to configure the error messages displayed upo
 
 ### Example: send an email
 
-The following example shows a Microsoft Entra SSPR technical profile that is used to send a code via email.
+The following example shows a Microsoft Entra ID SSPR technical profile that is used to send a code via email.
 
 ```xml
 <TechnicalProfile Id="AadSspr-SendCode">
@@ -137,7 +137,7 @@ The following metadata can be used to configure the error messages displayed upo
 
 ### Example: verify a code
 
-The following example shows a Microsoft Entra SSPR technical profile used to verify the code.
+The following example shows a Microsoft Entra ID SSPR technical profile used to verify the code.
 
 ```xml
 <TechnicalProfile Id="AadSspr-VerifyCode">

articles/active-directory-b2c/active-directory-technical-profile.md

@@ -10,7 +10,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.custom: build-2023
 ms.topic: reference
-ms.date: 12/29/2022
+ms.date: 11/06/2023
 ms.author: kengaderdus
 ms.reviewer: yoelhor
 ms.subservice: B2C
@@ -252,7 +252,7 @@ The following technical profile deletes a social user account using **alternativ
 | --------- | -------- | ----------- |
 | Operation | Yes | The operation to be performed. Possible values: `Read`, `Write`, `DeleteClaims`, or `DeleteClaimsPrincipal`. |
 | RaiseErrorIfClaimsPrincipalDoesNotExist | No | Raise an error if the user object does not exist in the directory. Possible values: `true` or `false`. |
-| RaiseErrorIfClaimsPrincipalAlreadyExists | No | Raise an error if the user object already exists. Possible values: `true` or `false`.|
+| RaiseErrorIfClaimsPrincipalAlreadyExists | No | Raise an error if the user object already exists. Possible values: `true` or `false`. This metadata is applicable only for the Write operation.|
 | ApplicationObjectId | No | The application object identifier for extension attributes. Value: ObjectId of an application. For more information, see [Use custom attributes](user-flow-custom-attributes.md?pivots=b2c-custom-policy). |
 | ClientId | No | The client identifier for accessing the tenant as a third party. For more information, see [Use custom attributes in a custom profile edit policy](user-flow-custom-attributes.md?pivots=b2c-custom-policy) |
 | IncludeClaimResolvingInClaimsHandling  | No | For input and output claims, specifies whether [claims resolution](claim-resolver-overview.md) is included in the technical profile. Possible values: `true`, or `false` (default). If you want to use a claims resolver in the technical profile, set this to `true`. |

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

@@ -8,7 +8,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 09/05/2022
+ms.date: 11/06/2023
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: fasttrack-edit
@@ -114,7 +114,12 @@ POST https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0
 
 Content-Type: application/x-www-form-urlencoded
 
-grant_type=authorization_code&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access&code=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...&redirect_uri=urn:ietf:wg:oauth:2.0:oob&code_verifier=ThisIsntRandomButItNeedsToBe43CharactersLong 
+grant_type=authorization_code
+&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6
+&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access
+&code=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...
+&redirect_uri=urn:ietf:wg:oauth:2.0:oob
+&code_verifier=ThisIsntRandomButItNeedsToBe43CharactersLong 
 ```
 
 | Parameter | Required? | Description |
@@ -188,7 +193,11 @@ POST https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0
 
 Content-Type: application/x-www-form-urlencoded
 
-grant_type=refresh_token&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access&refresh_token=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...&redirect_uri=urn:ietf:wg:oauth:2.0:oob
+grant_type=refresh_token
+&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6
+&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access
+&refresh_token=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...
+&redirect_uri=urn:ietf:wg:oauth:2.0:oob
 ```
 
 | Parameter | Required? | Description |

articles/active-directory-b2c/best-practices.md

@@ -40,7 +40,7 @@ Define your application and service architecture, inventory current systems, and
 | Move on-premises dependencies to the cloud | To help ensure a resilient solution, consider moving existing application dependencies to the cloud. |
 | Migrate existing apps to b2clogin.com | The deprecation of login.microsoftonline.com will go into effect for all Azure AD B2C tenants on 04 December 2020. [Learn more](b2clogin.md). |
 | Use Identity Protection and Conditional Access | Use these capabilities for significantly greater control over risky authentications and access policies. Azure AD B2C Premium P2 is required. [Learn more](conditional-access-identity-protection-overview.md). |
-|Tenant size | You need to plan with Azure AD B2C tenant size in mind. By default, Azure AD B2C tenant can accommodate 1 million objects (user accounts and applications). You can increase this limit to 5 million objects by adding a custom domain to your tenant, and verifying it. If you need a bigger tenant size, you need to contact [Support](find-help-open-support-ticket.md).|
+|Tenant size | You need to plan with Azure AD B2C tenant size in mind. By default, Azure AD B2C tenant can accommodate 1.25 million objects (user accounts and applications). You can increase this limit to 5.25 million objects by adding a custom domain to your tenant, and verifying it. If you need a bigger tenant size, you need to contact [Support](find-help-open-support-ticket.md).|
 | Use Identity Protection and Conditional Access | Use these capabilities for greater control over risky authentications and access policies. Azure AD B2C Premium P2 is required. [Learn more](conditional-access-identity-protection-overview.md). |
 
 ## Implementation

articles/active-directory-b2c/billing.md

@@ -125,7 +125,7 @@ To change your pricing tier, follow these steps:
 
    ![Screenshot that shows how to select the pricing tier.](media/billing/select-tier.png)
 
-Learn about the [Microsoft Entra features, which are supported in Azure AD B2C](supported-azure-ad-features.md). 
+Learn about the [Microsoft Entra ID features, which are supported in Azure AD B2C](supported-azure-ad-features.md). 
 
 
 ## Switch to MAU billing (pre-November 2019 Azure AD B2C tenants)

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

@@ -10,7 +10,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
 ms.custom: b2c-docs-improvements
-ms.date: 01/30/2023
+ms.date: 11/06/2023
 ms.author: kengaderdus
 ms.reviewer: yoelh
 ms.subservice: B2C
@@ -28,8 +28,7 @@ In [Validate user inputs by using Azure AD B2C custom policy](custom-policies-se
 
 :::image type="content" source="media/custom-policies-series-branch-in-user-journey-using-pre-conditions/screenshot-of-branching-in-user-journey.png" alt-text="A flowchart of branching in user journey.":::
 
-In this article, you'll learn how to use `EnabledForUserJourneys` element inside a technical profile to create different user experiences based on a claim value. First, the user selects their account type, which determines 
-
+In this article, you learn how to use `EnabledForUserJourneys` element inside a technical profile to create different user experiences based on a claim value. 
 ## Prerequisites
 
 - If you don't have one already, [create an Azure AD B2C tenant](tutorial-create-tenant.md) that is linked to your Azure subscription.
@@ -232,7 +231,7 @@ Follow the steps in [Test the custom policy](custom-policies-series-validate-use
 
 ## Next steps
 
-In [step 3](#step-3---configure-or-update-technical-profiles), we enabled or disabled 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'll learn later in this series.
+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: 
 

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

@@ -10,7 +10,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
 ms.custom: b2c-docs-improvements, devx-track-js
-ms.date: 03/16/2023
+ms.date: 11/06/2023
 ms.author: kengaderdus
 ms.reviewer: yoelh
 ms.subservice: B2C
@@ -20,7 +20,7 @@ ms.subservice: B2C
 
 Azure Active Directory B2C (Azure AD B2C) custom policy allows you to interact with application logic that's implemented outside of Azure AD B2C. To do so, you make an HTTP call to an endpoint. Azure AD B2C custom policies provide RESTful technical profile for this purpose. By using this capability, you can implement features that aren't available within Azure AD B2C custom policy.   
 
-In this article, you'll learn how to: 
+In this article, you learn how to: 
 
 - Create and deploy a sample Node.js app for use as a RESTful service.
 
@@ -31,7 +31,7 @@ In this article, you'll learn how to:
 
 ## Scenario overview 
 
-In [Create branching in user journey by using Azure AD B2C custom policies](custom-policies-series-branch-user-journey.md), users who select *Personal Account* need to provide a valid invitation access code to proceed. We use a static access code, but real world apps don't work this way. If the service that issues the access codes is external to your custom policy, you must make a call to that service, and pass the access code input by the user for validation. If the access code is valid, the service returns an HTTP 200 (OK) response, and Azure AD B2C issues JWT token. Otherwise, the service returns an HTTP 409 (Conflict) response, and the user must re-enter an access code. 
+In [Create branching in user journey by using Azure AD B2C custom policies](custom-policies-series-branch-user-journey.md), users who select *Personal Account* need to provide a valid invitation access code to proceed. We use a static access code, but real world apps don't work this way. If the service that issues the access codes is external to your custom policy, you must make a call to that service, and pass the access code input by the user for validation. If the access code is valid, the service returns an HTTP `200 OK` response, and Azure AD B2C issues JWT token. Otherwise, the service returns an HTTP `409 Conflict` response, and the user must re-enter an access code. 
 
 :::image type="content" source="media/custom-policies-series-call-rest-api/screenshot-of-call-rest-api-call.png" alt-text="A flowchart of calling a R E S T  A P I.":::
 
@@ -316,4 +316,4 @@ Next, learn:
  
 - About [RESTful technical profile](restful-technical-profile.md).
 
--  How to [Create and read a user account by using Azure Active Directory B2C custom policy](custom-policies-series-store-user.md)
+-  How to [Create and read a user account by using Azure Active Directory B2C custom policy](custom-policies-series-store-user.md)