Merge pull request #262846 from bandersmsft/aad-entra-fixes

MCM - Fixed Entra rebrand stragglers

Author: v-dirichards

articles/cost-management-billing/cost-management-billing-faq.yml

@@ -435,7 +435,7 @@ Azure Enterprise users can convert from a Microsoft Account (MSA or Live ID) to
 To begin:
 
 1. Add the work or school account to the Azure EA Portal in the role(s) needed.
-1. If you get errors, the account may not be valid in the active directory.  Azure uses User Principal Name (UPN), which isn't always identical to the email address.
+1. If you get errors, the account may not be valid in Microsoft Entra ID.  Azure uses User Principal Name (UPN), which isn't always identical to the email address.
 1. Authenticate to the Azure EA portal using the work or school account.
 
 ### To convert subscriptions from Microsoft accounts to work or school accounts:

articles/cost-management-billing/manage/ea-portal-administration.md

@@ -30,8 +30,8 @@ You use the Azure EA portal to grant access to users with different authenticati
 ### Authentication level types
 
 - Microsoft Account Only - For organizations that want to use, create, and manage users through Microsoft accounts.
-- Work or School Account - For organizations that have set up Active Directory with Federation to the Cloud and all accounts are on a single tenant.
-- Work or School Account Cross Tenant - For organizations that have set up Active Directory with Federation to the Cloud and will have accounts in multiple tenants.
+- Work or School Account - For organizations that have set up Microsoft Entra ID with federation to the cloud and all accounts are on a single tenant.
+- Work or School Account Cross Tenant - For organizations that have set up Microsoft Entra ID with federation to the cloud and will have accounts in multiple tenants.
 - Mixed Account - Allows you to add users with Microsoft Account and/or with a Work or School Account.
 
 The first work or school account added to the enrollment determines the _default_ domain. To add a work or school account with another tenant, you must change the authentication level under the enrollment to cross-tenant authentication.
@@ -49,23 +49,23 @@ To update the Authentication Level:
 
 Microsoft accounts must have an associated ID created at [https://signup.live.com](https://signup.live.com/).
 
-Work or school accounts are available to organizations that have set up Active Directory with federation and where all accounts are on a single tenant. Users can be added with work or school federated user authentication if the company's internal Active Directory is federated.
+Work or school accounts are available to organizations that have set up Microsoft Entra ID with federation and where all accounts are on a single tenant. Users can be added with work or school federated user authentication if the company's internal Microsoft Entra ID is federated.
 
-If your organization doesn't use Active Directory federation, you can't use your work or school email address. Instead, register or create a new email address and register it as a Microsoft account.
+If your organization doesn't use Microsoft Entra ID federation, you can't use your work or school email address. Instead, register or create a new email address and register it as a Microsoft account.
 
 ## Unable to access the Azure EA portal
 
 If you get an error message when you try to sign in to the Azure EA portal, use the following the troubleshooting steps:
 
 - Ensure that you're using the correct Azure EA portal URL, which is https://ea.azure.com.
 - Determine if your access to the Azure EA portal was added as a work or school account or as a Microsoft account.
-  - If you're using your work account, enter your work email and work password. Your work password is provided by your organization. You can check with your IT department about how to reset the password if you've issues with it.
+  - If you're using your work account, enter your work email and work password. Your work password is provided by your organization. You can check with your IT department about how to reset the password if you have issues with it.
   - If you're using a Microsoft account, enter your Microsoft account email address and password. If you've forgotten your Microsoft account password, you can reset it at [https://account.live.com/password/reset](https://account.live.com/password/reset).
 - Use an in-private or incognito browser session to sign in so that no cookies or cached information from previous or existing sessions are kept. Clear your browser's cache and use an in-private or incognito window to open https://ea.azure.com.
 - If you get an _Invalid User_ error when using a Microsoft account, it might be because you have multiple Microsoft accounts. The one that you're trying to sign in with isn't the primary email address.
 Or, if you get an _Invalid User_ error, it might be because the wrong account type was used when the user was added to the enrollment. For example, a work or school account instead of a Microsoft account. In this example, you have another EA admin  add the correct account or you need to contact [support](https://support.microsoft.com/supportforbusiness/productselection?sapId=cf791efa-485b-95a3-6fad-3daf9cd4027c).
   - If you need to check the primary alias, go to [https://account.live.com](https://account.live.com). Then, select **Your Info** and then select **Manage how to sign in to Microsoft**. Follow the prompts to verify an alternate email address and obtain a code to access sensitive information. Enter the security code. Select **Set it up later** if you don't want to set up two-factor authentication.
-  - You'll see the **Manage how to sign in to Microsoft** page where you can view your account aliases. Check that the primary alias is the one that you're using to sign in to the Azure EA portal. If it isn't, you can make it your primary alias. Or, you can use the primary alias for Azure EA portal instead.
+  - You see the **Manage how to sign in to Microsoft** page where you can view your account aliases. Check that the primary alias is the one that you're using to sign in to the Azure EA portal. If it isn't, you can make it your primary alias. Or, you can use the primary alias for Azure EA portal instead.
 
 ## Next steps
 

articles/cost-management-billing/manage/ea-portal-troubleshoot.md

@@ -23,11 +23,11 @@ This article helps you configure Azure subscription policies for subscription op
 
 Use the following policy settings to control the movement of Azure subscriptions from and into directories.
 
-### Subscriptions leaving AAD directory
+### Subscriptions leaving a Microsoft Entra ID directory
 
 The policy allows or stops users from moving subscriptions out of the current directory. [Subscription owners](../../role-based-access-control/built-in-roles.md#owner) can [change the directory of an Azure subscription](../../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md) to another one where they're a member. It poses governance challenges, so global administrators can allow or disallow directory users from changing the directory.
 
-### Subscriptions entering AAD directory
+### Subscriptions entering a Microsoft Entra ID directory
 
 The policy allows or stops users from other directories, who have access in the current directory, to move subscriptions into the current directory. [Subscription owners](../../role-based-access-control/built-in-roles.md#owner) can [change the directory of an Azure subscription](../../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md) to another one where they're a member. It poses governance challenges, so global administrators can allow or disallow directory users from changing the directory.
 

articles/cost-management-billing/manage/manage-azure-subscription-policy.md

@@ -89,7 +89,7 @@ landingContent:
     linkLists:
     - linkListType: concept
       links:
-      - text: What is Active Directory?
+      - text: What is Microsoft Entra ID?
         url: ../../active-directory/fundamentals/active-directory-whatis.md
       - text: Manage tenants
         url: manage-tenants.md

articles/cost-management-billing/microsoft-customer-agreement/index.yml

@@ -42,7 +42,7 @@ You have four options to scope a reservation, depending on your needs:
 - **Single resource group scope** - Applies the reservation discount to the matching resources in the selected resource group only.
 - **Single subscription scope** - Applies the reservation discount to the matching resources in the selected subscription.
 - **Shared scope** - Applies the reservation discount to matching resources in eligible subscriptions that are in the billing context. If a subscription is moved to different billing context, the benefit no longer applies to the subscription. It continues to apply to other subscriptions in the billing context.
-    - For Enterprise Agreement customers, the billing context is the enrollment. The reservation shared scope would include multiple Active Directory tenants in an enrollment.
+    - For Enterprise Agreement customers, the billing context is the enrollment. The reservation shared scope would include multiple Microsoft Entra tenants in an enrollment.
     - For Microsoft Customer Agreement customers, the billing scope is the billing profile.
     - For individual subscriptions with pay-as-you-go rates, the billing scope is all eligible subscriptions created by the account administrator.
 - **Management group** - Applies the reservation discount to the matching resource in the list of subscriptions that are a part of both the management group and billing scope. The management group scope applies to all subscriptions throughout the entire management group hierarchy. To buy a reservation for a management group, you must have at least read permission on the management group and be a reservation owner or reservation purchaser on the billing subscription.

articles/cost-management-billing/reservations/prepare-buy-reservation.md

@@ -25,7 +25,7 @@ For pricing information, see the [Azure Synapse Analytics reserved capacity offe
 You can buy Azure Synapse Analytics reserved capacity in the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_Reservations/ReservationsBrowseBlade). Pay for the reservation [up front or with monthly payments](./prepare-buy-reservation.md). To buy reserved capacity:
 
 - You must have the owner role for at least one enterprise, Pay-As-You-Go, or Microsoft Customer Agreement subscription.
-- For Enterprise subscriptions, the **Add Reserved Instances** option must be enabled in the [EA portal](https://ea.azure.com/). If the setting is disabled, you must be an EA Admin to enable it. Direct Enterprise customers can update the **Reserved Instances** setting ine the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_GTM/ModernBillingMenuBlade/AllBillingScopes). Navigate to the Policies menu to change settings.
+- For Enterprise subscriptions, the **Add Reserved Instances** option must be enabled in the [EA portal](https://ea.azure.com/). If the setting is disabled, you must be an EA Admin to enable it. Direct Enterprise customers can update the **Reserved Instances** setting in the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_GTM/ModernBillingMenuBlade/AllBillingScopes). Navigate to the Policies menu to change settings.
 
 - For the Cloud Solution Provider (CSP) program, only the admin agents or sales agents can purchase Azure Synapse Analytics reserved capacity.
 
@@ -48,7 +48,7 @@ For example, assume your total consumption of Azure Synapse Analytics is DW3000c
    - **Single resource group scope** — Applies the reservation discount to the matching resources in the selected resource group only.
    - **Single subscription scope** — Applies the reservation discount to the matching resources in the selected subscription.
    - **Shared scope** — Applies the reservation discount to matching resources in eligible subscriptions that are in the billing context. For Enterprise Agreement customers, the billing context is the enrollment. For individual subscriptions with pay-as-you-go rates, the billing scope is all eligible subscriptions created by the account administrator.
-       - For enterprise customers, the billing context is the EA enrollment. The reservation shared scope would include multiple Active Directory Microsoft Entra tenants in an enrollment.
+       - For enterprise customers, the billing context is the EA enrollment. The reservation shared scope would include multiple Microsoft Entra tenants in an enrollment.
        - For Microsoft Customer Agreement customers, the billing scope is the billing profile.
        - For Pay-As-You-Go customers, the shared scope is all Pay-As-You-Go subscriptions created by the account administrator.
    - **Management group** — Applies the reservation discount to the matching resource in the list of subscriptions that are a part of both the management group and billing scope.

articles/cost-management-billing/reservations/prepay-sql-data-warehouse-charges.md

@@ -22,7 +22,7 @@ You have the following options to scope a savings plan, depending on your needs:
 - **Single resource group scope** - Applies the savings plan benefit to the eligible resources in the selected resource group only.
 - **Single subscription scope** - Applies the savings plan benefit to the eligible resources in the selected subscription.
 - **Shared scope** - Applies the savings plan benefit to eligible resources within subscriptions that are in the billing context. If a subscription was moved to different billing context, the benefit will no longer be applied to this subscription and will continue to apply to other subscriptions in the billing context.
-  - For Enterprise Agreement customers, the billing context is the enrollment. The savings plan shared scope would include multiple Active Directory tenants in an enrollment.
+  - For Enterprise Agreement customers, the billing context is the enrollment. The savings plan shared scope would include multiple Microsoft Entra tenants in an enrollment.
   - For Microsoft Customer Agreement customers, the billing scope is the billing profile.
 - **Management group** - Applies the savings plan benefit to eligible resources in the list of subscriptions that are a part of both the management group and billing scope. To buy a savings plan for a management group, you must have at least read permission on the management group and be a savings plan owner on the billing subscription.
 

articles/cost-management-billing/savings-plan/scope-savings-plan.md

@@ -159,7 +159,7 @@
         href: manage/programmatically-create-subscription-enterprise-agreement.md
       - name: Create MCA subscriptions programmatically
         href: manage/programmatically-create-subscription-microsoft-customer-agreement.md
-      - name: Create MCA subscriptions programmatically across AD tenants
+      - name: Create MCA subscriptions programmatically across tenants
         href: manage/programmatically-create-subscription-microsoft-customer-agreement-across-tenants.md
       - name: Create MPA subscriptions programmatically
         href: manage/programmatically-create-subscription-microsoft-partner-agreement.md