resolve merge conflict

Author: laujan

.openpublishing.publish.config.json

@@ -1330,6 +1330,7 @@
   "articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
   "articles/spring-apps/.openpublishing.redirection.spring-apps.json",
   "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
+  "articles/storage/.openpublishing.redirection.storage.json",
   "articles/storsimple/.openpublishing.redirection.storsimple.json",
   "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
   "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",

.openpublishing.redirection.azure-monitor.json

@@ -6623,6 +6623,21 @@
             "source_path_from_root": "/articles/azure-monitor/insights/resource-group-insights.md",
             "redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/data-collection-endpoint-sample.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-endpoint-overview#sample-data-collection-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/data-collection.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/resource-manager-data-collection-rules.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-create-edit?tabs=arm#manually-create-a-dcr",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory-b2c/add-identity-provider.md

@@ -1,12 +1,11 @@
 ---
-title: Add an identity provider - Azure Active Directory B2C  
+title: Add an identity provider
+titleSuffix: Azure AD B2C 
 description: Learn how to add an identity provider to your Active Directory B2C tenant.
-
 author: garrodonnell
 manager: CelesteDG
-
 ms.author: godonnell
-ms.date: 02/08/2023
+ms.date: 03/22/2024
 ms.custom: mvc
 ms.topic: how-to
 ms.service: active-directory

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

@@ -2,14 +2,11 @@
 title: Set up a sign-up and sign-in flow
 titleSuffix: Azure AD B2C
 description: Learn how to set up a sign-up and sign-in flow in Azure Active Directory B2C.
-
 author: garrodonnell
 manager: CelesteDG
-
 ms.service: active-directory
-
 ms.topic: how-to
-ms.date: 02/09/2023
+ms.date: 03/22/2024
 ms.author: godonnell
 ms.subservice: B2C
 ms.custom: "b2c-support"

articles/active-directory-b2c/index-web-app.yml

@@ -8,7 +8,7 @@ metadata:
   author: kengaderdus
   manager: CelesteDG
   ms.author: kengaderdus
-  ms.date: 08/31/2022
+  ms.date: 02/21/2024
   ms.service: active-directory
   ms.subservice: B2C
   ms.topic: landing-page

articles/active-directory-b2c/language-customization.md

@@ -1,11 +1,11 @@
 ---
 title: Language customization in Azure Active Directory B2C
-description: Learn about customizing the language experience in your user flows in Azure Active Directory B2C.
+description: Learn how to customize the language experience in your user flows in Azure Active Directory B2C.
 author: garrodonnell
 manager: CelesteDG
 ms.service: active-directory
 ms.topic: how-to
-ms.date: 12/28/2022
+ms.date: 03/22/2024
 ms.author: godonnell
 ms.subservice: B2C
 zone_pivot_groups: b2c-policy-type
@@ -28,7 +28,7 @@ You might not need that level of control over what languages your customer sees.
 
 * **ui-locales specified language**: After you enable language customization, your user flow is translated to the language that's specified here.
 * **Browser-requested language**: If no `ui_locales` parameter was specified, your user flow is translated to the browser-requested language, *if the language is supported*.
-* **Policy default language**: If the browser doesn't specify a language, or it specifies one that is not supported, the user flow is translated to the user flow default language.
+* **Policy default language**: If the browser doesn't specify a language, or it specifies one that isn't supported, the user flow is translated to the user flow default language.
 
 > [!NOTE]
 > If you're using custom user attributes, you need to provide your own translations. For more information, see [Customize your strings](#customize-your-strings).
@@ -41,7 +41,7 @@ Watch this video to learn how to localize or customize language using Azure AD B
 
 Localization requires three steps: 
 
-1. Set-up the explicit list of supported languages
+1. Set up the explicit list of supported languages
 1. Provide language-specific strings and collections
 1. Edit the [content definition](contentdefinitions.md) for the page. 
 
@@ -124,7 +124,7 @@ Replace `<ExtensionAttributeValue>` with the new string to be displayed.
 
 ### Provide a list of values by using LocalizedCollections
 
-If you want to provide a set list of values for responses, you need to create a `LocalizedCollections` attribute. `LocalizedCollections` is an array of `Name` and `Value` pairs. The order for the items will be the order they are displayed. To add `LocalizedCollections`, use the following format:
+If you want to provide a set list of values for responses, you need to create a `LocalizedCollections` attribute. `LocalizedCollections` is an array of `Name` and `Value` pairs. The order for the items will be the order they're displayed. To add `LocalizedCollections`, use the following format:
 
 ```json
 {
@@ -183,7 +183,7 @@ https://wingtiptoysb2c.blob.core.windows.net/fr/wingtip/unified.html
 
 ## Add custom languages
 
-You can also add languages that Microsoft currently does not provide translations for. You'll need to provide the translations for all the strings in the user flow. Language and locale codes are limited to those in the ISO 639-1 standard. The locale code format should be "ISO_639-1_code"-"CountryCode", for example `en-GB`. For more information, please refer to [locale ID formats](/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a).
+You can also add languages that Microsoft currently doesn't provide translations for. You'll need to provide the translations for all the strings in the user flow. Language and locale codes are limited to those in the ISO 639-1 standard. The locale code format should be "ISO_639-1_code"-"CountryCode", for example `en-GB`. For more information, please refer to [locale ID formats](/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a).
 
 1. In your Azure AD B2C tenant, select **User flows**.
 2. Click the user flow where you want to add custom languages, and then click **Languages**.
@@ -466,7 +466,7 @@ Microsoft provides the `ui_locales` OIDC parameter to social logins. But some so
 
 ### Browser behavior
 
-Chrome and Firefox both request for their set language. If it's a supported language, it's displayed before the default. Microsoft Edge currently does not request a language and goes straight to the default language.
+Chrome and Firefox both request for their set language. If it's a supported language, it's displayed before the default. Microsoft Edge currently doesn't request a language and goes straight to the default language.
 
 ## Supported languages
 

articles/active-directory-b2c/sign-in-options.md

@@ -2,20 +2,16 @@
 title: Sign-in options supported by Azure AD B2C
 titleSuffix: Azure AD B2C
 description: Learn about the sign-up and sign-in options you can use with Azure Active Directory B2C, including username and password, email, phone, or federation with social or external identity providers.
-
 author: garrodonnell
 manager: CelesteDG
-
 ms.service: active-directory
-
 ms.topic: concept-article
-ms.date: 02/08/2023
+ms.date: 03/22/2024
 ms.author: godonnell
 ms.subservice: B2C
 
 #Customer Intent: As a developer integrating Azure AD B2C into my application, I want to understand the different sign-in options available so that I can choose the appropriate method for my users and configure the sign-in flow accordingly.
 
-
 ---
 # Sign-in options in Azure AD B2C
 

articles/active-directory-b2c/user-overview.md

@@ -1,24 +1,21 @@
 ---
 title: Overview of user accounts in Azure Active Directory B2C
 description: Learn about the types of user accounts that can be used in Azure Active Directory B2C.
-
 author: garrodonnell
 manager: CelesteDG
-
 ms.service: active-directory
-
+ms.date: 02/13/2024
 ms.topic: concept-article
-ms.date: 12/28/2022
 ms.author: godonnell
 ms.subservice: B2C
 ms.custom: b2c-support
 
-#Customer intent: As a developer or IT administrator, I want to understand the different types of user accounts available Azure AD B2C, so that I can properly manage and configure user accounts properly.
+#Customer intent: As a developer or IT administrator, I want to understand the different types of user accounts available Azure AD B2C, so that I can properly manage and configure user accounts for my tenant.
 ---
 
 # Overview of user accounts in Azure Active Directory B2C
 
-In Azure Active Directory B2C (Azure AD B2C), there are several types of accounts that can be created. Microsoft Entra ID, Microsoft Entra B2B, and Azure Active Directory B2C (Azure AD B2C) share in the types of user accounts that can be used.
+In Azure Active Directory B2C (Azure AD B2C), there are several types of accounts that can be created. These account types are shared across Microsoft Entra ID, Microsoft Entra B2B, and Azure Active Directory B2C (Azure AD B2C).
 
 The following types of accounts are available:
 
@@ -31,39 +28,35 @@ The following types of accounts are available:
 
 ## Work account
 
-A work account is created the same way for all tenants based on Microsoft Entra ID. To create a work account, you can use the information in [Quickstart: Add new users to Microsoft Entra ID](../active-directory/fundamentals/add-users.md). A work account is created using the **New user** choice in the Azure portal.
+A work account is created the same way for all tenants based on Microsoft Entra ID. To create a work account, you can use the information in [Quickstart: Add new users to Microsoft Entra ID](/entra/fundamentals/how-to-create-delete-users). A work account is created using the **New user** choice in the Azure portal.
 
 When you add a new work account, you need to consider the following configuration settings:
 
-- **Name** and **User name** - The **Name** property contains the given and surname of the user. The **User name** is the identifier that the user enters to sign in. The user name includes the full domain. The domain name portion of the user name must either be the initial default domain name *your-domain.onmicrosoft.com*, or a verified, non-federated [custom domain](../active-directory/fundamentals/add-custom-domain.md) name such as *contoso.com*. 
+- **Name** and **User name** - The **Name** property contains the given and surname of the user. The **User name** is the identifier that the user enters to sign in. The user name includes the full domain. The domain name portion of the user name must either be the initial default domain name *your-domain.onmicrosoft.com*, or a verified, non-federated [custom domain](/entra/fundamentals/add-custom-domain) name such as *contoso.com*. 
 - **Email** - The new user can also sign in using an email address. We do not support special characters or multibyte characters in email, for example Japanese characters.
 - **Profile** - The account is set up with a profile of user data. You have the opportunity to enter a first name, last name, job title, and department name. You can edit the profile after the account is created.
 - **Groups** - Use groups to perform management tasks such as assigning licenses or permissions to many users, or devices at once. You can put the new account into an existing [group](../active-directory/fundamentals/how-to-manage-groups.md) in your tenant.
-- **Directory role** - You need to specify the level of access that the user account has to resources in your tenant. The following permission levels are available:
-
-    - **User** - Users can access assigned resources but cannot manage most tenant resources.
-    - **Global administrator** - Global administrators have full control over all tenant resources.
-    - **Limited administrator** - Select the administrative role or roles for the user. For more information about the roles that can be selected, see [Assigning administrator roles in Microsoft Entra ID](../active-directory/roles/permissions-reference.md).
+- **Directory role** - You need to specify the level of access that the user account has to resources in your tenant. For more information about the roles that can be selected, see [Microsoft Entra built-in roles](/entra/identity/role-based-access-control/permissions-reference).
 
 ### Create a work account
 
 You can use the following information to create a new work account:
 
-- [Azure portal](../active-directory/fundamentals/add-users.md)
+- [Azure portal](/entra/fundamentals/how-to-create-delete-users)
 - [Microsoft Graph](/graph/api/user-post-users)
 
 ### Update a user profile
 
 You can use the following information to update the profile of a user:
 
-- [Azure portal](../active-directory/fundamentals/how-to-manage-user-profile-info.md)
+- [Azure portal](/entra/fundamentals/how-to-manage-user-profile-info)
 - [Microsoft Graph](/graph/api/user-update)
 
 ### Reset a password for a user
 
 You can use the following information to reset the password of a user:
 
-- [Azure portal](../active-directory/fundamentals/users-reset-password-azure-portal.md)
+- [Azure portal](/entra/fundamentals/users-reset-password-azure-portal)
 - [Microsoft Graph](/graph/api/user-update)
 
 ## Guest user

articles/advisor/advisor-alerts-bicep.md

@@ -1,9 +1,7 @@
 ---
 title: Create Azure Advisor alerts for new recommendations using Bicep
 description: Learn how to set up an alert for new recommendations from Azure Advisor using Bicep.
-author: orspod
 ms.topic: quickstart
-ms.author: orspodek
 ms.custom: subject-armqs, mode-arm, devx-track-bicep
 ms.date: 04/26/2022
 ---

articles/advisor/advisor-azure-resource-graph.md

@@ -1,11 +1,8 @@
 ---
 title: Advisor data in Azure Resource Graph
 description: Make queries for Advisor data in Azure Resource Graph
-author: orspod
 ms.topic: article
 ms.date: 03/12/2020
-ms.author: orspodek
-
 ---
 
 # Query for Advisor data in Resource Graph Explorer (Azure Resource Graph)