fixing merge conflict

Author: Blackmist

.openpublishing.publish.config.json

@@ -1113,7 +1113,7 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "articles/reusable-content",
+      "path_to_root": "reusable-content",
       "url": "https://github.com/MicrosoftDocs/reusable-content",
       "branch": "main",
       "branch_mapping": {}

.openpublishing.redirection.azure-kubernetes-service.json

@@ -461,6 +461,11 @@
             "source_path_from_root": "/articles/aks/command-invoke.md",
             "redirect_url": "/azure/aks/access-private-cluster",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/aks/operator-best-practices-run-at-scale.md",
+            "redirect_url": "/azure/aks/best-practices-performance-scale-large",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -4916,12 +4916,12 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-aks-policy.md",
-            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable&tabs=policy#enable-container-insights",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=policy#enable-container-insights",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-provisioned-clusters.md",
-            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable.md&tabs=cli#aks-hybrid-cluster",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=cli#aks-hybrid-cluster",
             "redirect_document_id": false
         },
         {
@@ -6604,6 +6604,11 @@
             "redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/resource-manager-app-resource.md",
+            "redirect_url": "/azure/azure-monitor/app/create-workspace-resource",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/partners.md",
             "redirect_url": "/azure/azure-monitor/overview#integrate",

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

@@ -940,6 +940,11 @@
             "redirect_url": "/azure/defender-for-cloud/agentless-vulnerability-assessment-aws",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/custom-security-policies.md",
+            "redirect_url": "/azure/defender-for-cloud/create-custom-recommendations",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/how-to-migrate-to-built-in.md",
             "redirect_url": "/azure/defender-for-cloud/how-to-transition-to-built-in",

.openpublishing.redirection.json

@@ -1,5 +1,50 @@
 {
     "redirections": [
+    {
+      "source_path": "articles/internet-analyzer/internet-analyzer-cli.md",
+      "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/internet-analyzer/internet-analyzer-create-test-portal.md",
+      "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-create-test-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/internet-analyzer/internet-analyzer-custom-endpoint.md",
+      "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-custom-endpoint",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/internet-analyzer/internet-analyzer-embed-client.md",
+      "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-embed-client",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/internet-analyzer/internet-analyzer-faq.md",
+      "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/internet-analyzer/internet-analyzer-overview.md",
+      "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/internet-analyzer/internet-analyzer-scorecard.md",
+      "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-scorecard",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/internet-analyzer/troubleshoot.md",
+      "redirect_url": "/previous-versions/azure/internet-analyzer/troubleshoot",
+      "redirect_document_id": false
+    },
+    {
+        "source_path": "articles/internet-analyzer/index.yml",
+        "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-overview",
+        "redirect_document_id": false
+    },
     {
       "source_path": "articles/batch/batch-pool-no-public-ip-address.md",
       "redirect_url": "/previous-versions/azure/batch/articles/batch/batch-pool-no-public-ip-address",
@@ -6765,6 +6810,11 @@
             "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/search/search-get-started-retrieval-augmented-generation.md",
+            "redirect_url": "/azure/ai-services/openai/use-your-data-quickstart",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/search/cognitive-search-tutorial-blob-python.md",
             "redirect_url": "/azure/search/samples-python",
@@ -10956,6 +11006,14 @@
             "redirect_document_id": false
         },
         {
+
+            "source_path_from_root": "/articles/ddos-protection/ddos-disaster-recovery-guidance.md",
+            "redirect_url": "../reliability/reliability-ddos.md",
+            "redirect_document_id": false
+        },
+        {
+
+
             "source_path_from_root": "/articles/azure-functions/functions-monitor-log-analytics.md",
             "redirect_url": "/azure/azure-functions/monitor-functions",
             "redirect_document_id": false
@@ -10971,6 +11029,29 @@
             "redirect_document_id": false
         },
         {
+
+            "source_path_from_root": "/articles/cosmos-db/mongodb/vcore/high-availability.md",
+            "redirect_url": "/azure/reliability/reliability-cosmos-mongodb",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/cosmos-db/mongodb/vcore/failover-disaster-recovery.md",
+            "redirect_url": "/azure/reliability/reliability-cosmos-mongodb",
+            "redirect_document_id": false 
+        },
+        {  
+
+            "source_path_from_root": "/articles/notification-hubs/notification-hubs-high-availability.md",
+            "redirect_url": "/azure/reliability/reliability-notification-hubs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/reliability/reliability-guidance-overview.md",
+            "redirect_url": "/azure/reliability/overview-reliability-guidance",
+            "redirect_document_id": false
+        },
+        {
+
             "source_path_from_root": "/articles/event-hubs/move-across-regions.md",
             "redirect_url": "/azure/operational-excellence/relocation-event-hub",
             "redirect_document_id": false
@@ -10995,6 +11076,6 @@
             "redirect_url": "/azure/operational-excellence/relocation-storage-account",
             "redirect_document_id": false 
         }
-        
+
     ]
 }

CONTRIBUTING.md

@@ -16,9 +16,7 @@ There are many ways to contribute to the documentation. Review the following sec
 
 ### Report bugs and suggesting enhancements
 
-Please use the Feedback tool at the bottom of any article to submit bugs and suggestions.
-
-![Feedback Tool](media/feedback-tool.png)
+Use the Feedback tool at the bottom of any article to submit bugs and suggestions. Select **This product** for product feedback and **This page** for documentation related feedback. 
 
 ### Edit in GitHub
 

articles/active-directory-b2c/conditional-access-identity-protection-overview.md

@@ -2,7 +2,7 @@
 title: Identity Protection and Conditional Access in Azure AD B2C
 description: Learn how Identity Protection gives you visibility into risky sign-ins and risk detections. Find out how and Conditional Access lets you enforce organizational policies based on risk events in your Azure AD B2C tenants.
 ms.service: active-directory
-ms.subservice: conditional-access
+ms.subservice: B2C
 ms.topic: overview
 ms.date: 01/11/2024
 ms.author: kengaderdus
@@ -29,7 +29,7 @@ If you're already familiar with [Identity Protection](../active-directory/identi
 
 By pairing Conditional Access policies with Identity Protection risk detection, you can respond to risky authentications with the appropriate policy action.
 
-- **Gain a new level of visibility into the authentication risks for your apps and your customer base**. With signals from billions of monthly authentications across Microsoft Entra ID and Microsoft Account, the risk detection algorithms will now flag authentications as low, medium, or high risk for your local consumer or citizen authentications.
+- **Gain a new level of visibility into the authentication risks for your apps and your customer base**. With signals from billions of monthly authentications across Microsoft Entra ID and Microsoft Account, the risk detection algorithms flag authentications as low, medium, or high risk for your local consumer or citizen authentications.
 - **Automatically address risks by configuring your own adaptive authentication**. For specified applications, you can require a specific set of users to provide a second authentication factor, as in multi-factor authentication (MFA). Or you can block access based on the risk level detected. As with other Azure AD B2C experiences, you can customize resulting end-user experience  with your organization’s voice, style, and brand. You can also display mitigation alternatives if the user isn't able to gain access.
 - **Control access based on location, groups, and apps**.  Conditional Access can also be used to control non-risk based situations. For example, you can require MFA for customers accessing a specific app, or block access from specified geographies.
 - **Integrate with Azure AD B2C user flows and Identity Experience Framework custom policies**. Use your existing customized experiences and add the controls you need to interface with Conditional Access. You can also implement advanced scenarios for granting access, such as  knowledge-based access or your own preferred MFA provider.

articles/active-directory-b2c/conditional-access-user-flow.md

@@ -3,7 +3,7 @@ title: Add Conditional Access to a user flow in Azure AD B2C
 description: Learn how to add Conditional Access to your Azure AD B2C user flows. Configure multifactor authentication (MFA) settings and Conditional Access policies in your user flows to enforce policies and remediate risky sign-ins.
 
 ms.service: active-directory
-ms.subservice: conditional-access
+ms.subservice: B2C
 ms.topic: overview
 ms.date: 01/11/2024
 ms.author: kengaderdus
@@ -40,13 +40,13 @@ The following example shows a Conditional Access technical profile that is used
 </TechnicalProfile>
 ```
 
-To ensure that Identity Protection signals are evaluated properly, you'll want to call the `ConditionalAccessEvaluation` technical profile for all users, including both [local and social accounts](technical-overview.md#consumer-accounts). Otherwise, Identity Protection will indicate an incorrect degree of risk associated with users.
+To ensure that Identity Protection signals are evaluated properly, you'll want to call the `ConditionalAccessEvaluation` technical profile for all users, including both [local and social accounts](technical-overview.md#consumer-accounts). Otherwise, Identity Protection indicates an incorrect degree of risk associated with users.
 ::: zone-end
 In the *Remediation* phase that follows, the user is challenged with MFA. Once complete, Azure AD B2C informs Identity Protection that the identified sign-in threat has been remediated and by which method. In this example, Azure AD B2C signals that the user has successfully completed the multifactor authentication challenge.
 The remediation may also happen through other channels. For example, when the account's password is reset, either by the administrator or by the user. You can check the user *Risk state* in the [risky users report](identity-protection-investigate-risk.md#navigating-the-risky-users-report).
 ::: zone pivot="b2c-custom-policy"
 > [!IMPORTANT]
-> To remediate the risk successfully within the journey, make sure the *Remediation* technical profile is called after the *Evaluation* technical profile is executed. If  *Evaluation* is invoked without *Remediation*, the risk state will be *At risk*.
+> To remediate the risk successfully within the journey, make sure the *Remediation* technical profile is called after the *Evaluation* technical profile is executed. If  *Evaluation* is invoked without *Remediation*, the risk state indicates as *At risk*.
 When the *Evaluation* technical profile recommendation returns `Block`, the call to the *Evaluation* technical profile is not required. The risk state is set to *At risk*.
 The following example shows a Conditional Access technical profile used to remediate the identified threat:
 
@@ -122,7 +122,7 @@ To add a Conditional Access policy:
 
     | Include  |License   |   Notes|
     |---|---|---|
-    |**All users**    | P1, P2  | This policy will affect all of your users. To be sure not to lock yourself out, exclude your administrative account by choosing **Exclude**, selecting **Directory roles**, and then selecting **Global Administrator** in the list. You can also select **Users and Groups** and then select your account in the **Select excluded users** list.  |
+    |**All users**    | P1, P2  | This policy affects all of your users. To be sure not to lock yourself out, exclude your administrative account by choosing **Exclude**, selecting **Directory roles**, and then selecting **Global Administrator** in the list. You can also select **Users and Groups** and then select your account in the **Select excluded users** list.  |
 
 1. Select **Cloud apps or actions**, and then **Select apps**. Browse for your [relying party application](tutorial-register-applications.md).
 1. Select **Conditions**, and then select from the following conditions. For example, select **Sign-in risk** and **High**, **Medium**, and **Low** risk levels.
@@ -228,7 +228,7 @@ To configure your user based conditional access:
 7. Under **Conditions** > **User risk**, set **Configure** to **Yes**. Under **Configure user risk levels needed for policy to be enforced** 
    1. Select **High** and **Medium**.
    2. Select **Done**.
-8. Under **Access controls** > **Grant**, select **Grant access**, **Require password change**, and select **Select**. **Require multi-factor authentication** will also be required by default.
+8. Under **Access controls** > **Grant**, select **Grant access**, **Require password change**, and select **Select**. **Require multi-factor authentication** is also be required by default.
 9. Confirm your settings and set **Enable policy** to **On**.
 10. Select **Create** to create to enable your policy.
 
@@ -345,7 +345,7 @@ The following template can be used to create a Conditional Access policy with di
 ## Add Conditional Access to a user flow
 
 After you've added the Microsoft Entra Conditional Access policy, enable Conditional Access in your user flow or custom policy. When you enable Conditional Access, you don't need to specify a policy name.
-Multiple Conditional Access policies may apply to an individual user at any time. In this case, the most strict access control policy takes precedence. For example, if one policy requires MFA while the other blocks access, the user will be blocked.
+Multiple Conditional Access policies may apply to an individual user at any time. In this case, the most strict access control policy takes precedence. For example, if one policy requires MFA while the other blocks access, the user is blocked.
 
 ## Enable multifactor authentication (optional)
 
@@ -386,7 +386,7 @@ To enable Conditional Access for a user flow, make sure the version supports Con
 ### Configure claim other than phone number to be used for MFA
 
 In the Conditional Access policy above, the `DoesClaimExist` claim transformation method checks if a claim contains a value, for example if the `strongAuthenticationPhoneNumber` claim contains a phone number. 
-The claims transformation isn't limited to the `strongAuthenticationPhoneNumber` claim. Depending on the scenario, you can use any other claim. In the following XML snippet, the `strongAuthenticationEmailAddress` claim is checked instead. The claim you choose must have a valid value, otherwise the `IsMfaRegistered` claim will be set to `False`. When set to `False`, the Conditional Access policy evaluation returns a `Block` grant type, preventing the user from completing user flow.
+The claims transformation isn't limited to the `strongAuthenticationPhoneNumber` claim. Depending on the scenario, you can use any other claim. In the following XML snippet, the `strongAuthenticationEmailAddress` claim is checked instead. The claim you choose must have a valid value, otherwise the `IsMfaRegistered` claim is set to `False`. When set to `False`, the Conditional Access policy evaluation returns a `Block` grant type, preventing the user from completing user flow.
 
 ```xml
  <ClaimsTransformation Id="IsMfaRegisteredCT" TransformationMethod="DoesClaimExist">

articles/active-directory-b2c/configure-a-sample-node-web-app.md

@@ -6,16 +6,12 @@ titleSuffix: Azure AD B2C
 author: kengaderdus
 manager: CelesteDG
 ms.service: active-directory
-
-ms.custom: devx-track-js, linux-related-content
+ms.custom: devx-track-js
 ms.topic: how-to
 ms.date: 01/11/2024
 ms.author: kengaderdus
 ms.subservice: B2C
-
-
 #Customer intent: As a developer, I want to configure authentication in a Node.js web application using Azure Active Directory B2C, so that I can enable users to sign in, sign out, update profile, and reset password using Azure AD B2C user flows.
-
 ---
 
 # Configure authentication in a sample Node.js web application by using Azure Active Directory B2C

articles/active-directory-b2c/custom-domain.md

@@ -331,14 +331,6 @@ https://<domain-name>/11111111-1111-1111-1111-111111111111/v2.0/
 ```
 ::: zone pivot="b2c-custom-policy"
 
-## (Optional) Block access to the default domain name
-
-After you add the custom domain and configure your application, users will still be able to access the &lt;tenant-name&gt;.b2clogin.com domain. If you want to prevent access, you can configure the policy to check the authorization request "host name" against an allowed list of domains. The host name is the domain name that appears in the URL. The host name is available through `{Context:HostName}` [claim resolvers](claim-resolver-overview.md). Then you can present a custom error message. 
-
-1. Get the example of a conditional access policy that checks the host name from [GitHub](https://github.com/azure-ad-b2c/samples/tree/master/policies/check-host-name).
-1. In each file, replace the string `yourtenant` with the name of your Azure AD B2C tenant. For example, if the name of your B2C tenant is *contosob2c*, all instances of `yourtenant.onmicrosoft.com` become `contosob2c.onmicrosoft.com`.
-1. Upload the policy files in the following order: `B2C_1A_TrustFrameworkExtensions_HostName.xml` and then `B2C_1A_signup_signin_HostName.xml`.
-
 ::: zone-end