Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-encrypt

halkazwini · halkazwini · commit 4f8cfc10cffa · 2024-09-11T14:52:33.000-05:00
diff --git a/articles/azure-maps/media/tutorial-create-store-locator/finished-simple-store-locator-mobile.png b/articles/azure-maps/media/tutorial-create-store-locator/finished-simple-store-locator-mobile.png
diff --git a/articles/azure-maps/media/tutorial-create-store-locator/finished-simple-store-locator.png b/articles/azure-maps/media/tutorial-create-store-locator/finished-simple-store-locator.png
diff --git a/articles/azure-maps/media/tutorial-create-store-locator/store-locator-wireframe-mobile.png b/articles/azure-maps/media/tutorial-create-store-locator/store-locator-wireframe-mobile.png
diff --git a/articles/azure-maps/media/tutorial-create-store-locator/store-locator-wireframe.png b/articles/azure-maps/media/tutorial-create-store-locator/store-locator-wireframe.png
diff --git a/articles/azure-maps/tutorial-create-store-locator.md b/articles/azure-maps/tutorial-create-store-locator.md
@@ -4,7 +4,7 @@ titleSuffix: Microsoft Azure Maps
 description: Tutorial on how to use Microsoft Azure Maps to create store locator web applications.
 author: sinnypan
 ms.author: sipa
-ms.date: 11/01/2023
+ms.date: 09/05/2024
 ms.topic: tutorial
 ms.service: azure-maps
 ms.subservice: web-sdk
@@ -79,7 +79,7 @@ The following screenshot shows the general layout of the Contoso Coffee store lo
 
 To maximize the usefulness of this store locator, we include a responsive layout that adjusts when a user's screen width is smaller than 700 pixels wide. A responsive layout makes it easy to use the store locator on a small screen, like on a mobile device. Here's a screenshot showing a sample of the small-screen layout:  
 
-:::image type="content" source="./media/tutorial-create-store-locator/store-locator-wireframe-mobile.png" alt-text="A screenshot showing what the Contoso Coffee store locator application looks like on a mobile device.":::
+:::image type="content" source="./media/tutorial-create-store-locator/store-locator-wireframe-mobile.png" lightbox="./media/tutorial-create-store-locator/store-locator-wireframe-mobile.png" alt-text="A screenshot showing what the Contoso Coffee store locator application looks like on a mobile device.":::
 
 <a id="create a data-set"></a>
 
@@ -151,7 +151,7 @@ If you open the text file in Notepad, it looks similar to the following text:
 
     Your workspace folder should now look like the following screenshot:
 
-    :::image type="content" source="./media/tutorial-create-store-locator/store-locator-workspace.png" alt-text="Screenshot of the images folder in the Contoso Coffee directory.":::
+    :::image type="content" source="./media/tutorial-create-store-locator/store-locator-workspace.png" lightbox="./media/tutorial-create-store-locator/store-locator-workspace.png" alt-text="Screenshot of the images folder in the Contoso Coffee directory.":::
 
 ## Create the HTML
 
diff --git a/articles/cost-management-billing/manage/add-change-subscription-administrator.md b/articles/cost-management-billing/manage/add-change-subscription-administrator.md
@@ -18,12 +18,7 @@ This article describes how to add or change the administrator role for a user us
 
 This article applies to a Microsoft Online Service Program (pay-as-you-go) account or a Visual Studio account. If you have a Microsoft Customer Agreement (Azure plan) account, see [Understand Microsoft Customer Agreement administrative roles in Azure](understand-mca-roles.md). If you have an Azure Enterprise Agreement, see [Manage Azure Enterprise Agreement roles](understand-ea-roles.md).
 
-Microsoft recommends that you manage access to resources using Azure RBAC. However, if you are still using the classic deployment model and managing the classic resources by using [Azure Service Management PowerShell Module](/powershell/azure/servicemanagement/install-azure-ps), you'll need to use a classic administrator.
-
-> [!TIP]
-> If you only use the Azure portal to manage the classic resources, you don't need to use the classic administrator.
-
-For more information, see [Azure Resource Manager vs. classic deployment](../../azure-resource-manager/management/deployment-models.md) and [Azure classic subscription administrators](../../role-based-access-control/classic-administrators.md).
+Microsoft recommends that you manage access to resources using Azure RBAC. Classic administrative roles are retried. For more information, see [Prepare for Azure classic administrator roles retirement](classic-administrator-retire.md).
 
 ## Determine account billing administrator
 
diff --git a/articles/cost-management-billing/manage/billing-subscription-transfer.md b/articles/cost-management-billing/manage/billing-subscription-transfer.md
@@ -7,7 +7,7 @@ ms.reviewer: sgautam
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 03/26/2024
+ms.date: 09/11/2024
 ms.author: banders
 ---
 
@@ -21,7 +21,7 @@ If you want to keep your billing ownership but change subscription type, see [Sw
 
 If you're an Enterprise Agreement (EA) customer, your enterprise administrator can transfer billing ownership of your subscriptions between accounts.
 
-Only the billing administrator of an account can transfer ownership of a subscription.
+Only the account administrator of an account can transfer ownership of a subscription.
 
 When you send or accept a transfer request, you agree to terms and conditions. For more information, see [Transfer terms and conditions](subscription-transfer.md#transfer-terms-and-conditions).
 
@@ -66,7 +66,7 @@ Visual Studio and Microsoft Cloud Partner Program subscriptions have monthly rec
 
 If you've accepted the billing ownership of an Azure subscription, we recommend you review these next steps:
 
-1. Review and update the Service Admin, Co-Admins, and Azure role assignments. To learn more, see [Add or change Azure subscription administrators](add-change-subscription-administrator.md) and [Assign Azure roles using the Azure portal](../../role-based-access-control/role-assignments-portal.yml).
+1. Review and update Azure role assignments. To learn more, see [Add or change Azure subscription administrators](add-change-subscription-administrator.md) and [Assign Azure roles using the Azure portal](../../role-based-access-control/role-assignments-portal.yml).
 1. Update credentials associated with this subscription's services including:
    1. Management certificates that grant the user admin rights to subscription resources. For more information, see [Create and upload a management certificate for Azure](../../cloud-services/cloud-services-certs-create.md)
    1. Access keys for services like Storage. For more information, see [About Azure storage accounts](../../storage/common/storage-account-create.md)
@@ -124,4 +124,4 @@ If you have questions or need help,  [create a support request](https://go.micro
 
 ## Next steps
 
-- Review and update the Service Admin, Co-Admins, and Azure role assignments. To learn more, see [Add or change Azure subscription administrators](add-change-subscription-administrator.md) and [Assign Azure roles using the Azure portal](../../role-based-access-control/role-assignments-portal.yml).
+- Review and update Azure role assignments. To learn more, see [Add or change Azure subscription administrators](add-change-subscription-administrator.md) and [Assign Azure roles using the Azure portal](../../role-based-access-control/role-assignments-portal.yml).
diff --git a/articles/cost-management-billing/manage/cancel-azure-subscription.md b/articles/cost-management-billing/manage/cancel-azure-subscription.md
@@ -6,7 +6,7 @@ ms.reviewer: tomasa
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: conceptual
-ms.date: 03/12/2024
+ms.date: 09/11/2024
 ms.author: banders
 ---
 
@@ -55,11 +55,11 @@ The following table describes the permission required to cancel a subscription.
 
 |Subscription type     |Who can cancel  |
 |---------|---------|
-|Subscriptions created when you sign up for Azure through the Azure website. For example, when you sign up for an [Azure Free Account](https://azure.microsoft.com/offers/ms-azr-0044p/), [account with pay-as-you-go rates](https://azure.microsoft.com/offers/ms-azr-0003p/) or as a [Visual studio subscriber](https://azure.microsoft.com/pricing/member-offers/credit-for-visual-studio-subscribers/). |  Service administrator and subscription owner  |
+|Subscriptions created when you sign up for Azure through the Azure website. For example, when you sign up for an [Azure Free Account](https://azure.microsoft.com/offers/ms-azr-0044p/), [account with pay-as-you-go rates](https://azure.microsoft.com/offers/ms-azr-0003p/) or as a [Visual studio subscriber](https://azure.microsoft.com/pricing/member-offers/credit-for-visual-studio-subscribers/). |  Subscription owner  |
 |[Microsoft Enterprise Agreement](https://azure.microsoft.com/pricing/enterprise-agreement/) and [Enterprise Dev/Test](https://azure.microsoft.com/offers/ms-azr-0148p/)     |  Subscription owner       |
 |[Azure plan](https://azure.microsoft.com/offers/ms-azr-0017g/) and [Azure plan for DevTest](https://azure.microsoft.com/offers/ms-azr-0148g/)     |  Subscription owners      |
 
-An account administrator without the service administrator or subscription owner role can’t cancel an Azure subscription. For more information, see [Azure classic subscription administrators](../../role-based-access-control/classic-administrators.md).
+An account administrator without the subscription owner role can’t cancel an Azure subscription. For more information, see [Azure classic subscription administrators](../../role-based-access-control/classic-administrators.md).
 
 ## Cancel a subscription in the Azure portal
 
diff --git a/articles/cost-management-billing/manage/classic-administrator-retire.md b/articles/cost-management-billing/manage/classic-administrator-retire.md
@@ -12,15 +12,15 @@ ms.author: banders
 
 # Prepare for Azure classic administrator roles retirement
 
-Azure classic administrator roles retire on August 31, 2024.
+Azure classic administrator roles retired on August 31, 2024.
 
 If your organization has any active Co-Administrator or Service Administrator roles, you need to transition them to Azure role-based access control (RBAC) roles by then. [Azure Service manager and all Azure classic resources](https://azure.microsoft.com/updates/cloud-services-retirement-announcement/) also retire on that date.
 
 ## Required action
 
-To avoid potential disruptions in service, transition any classic administrator roles that still need access to your subscription to Azure RBAC roles by August 31, 2024. For more information, see [Prepare for Co-Administrators retirement](https://aka.ms/ClassicAdmins).
+To avoid potential disruptions in service, transition any classic administrator roles that still need access to your subscription to Azure RBAC roles. For more information, see [Prepare for Co-Administrators retirement](https://aka.ms/ClassicAdmins).
 
-On August 31, 2024 and later:
+After August 31, 2024:
 
 - When you create an Azure subscription, the classic Service Administrator role isn't assigned to the subscription. Instead, the user creating the subscription is assigned the Azure RBAC [Owner](../../role-based-access-control/built-in-roles.md#owner) role.
 - During the [Azure subscription Change Directory operation](/entra/fundamentals/how-subscriptions-associated-directory#associate-a-subscription-to-a-directory), the user isn't assigned the Service Administrator role. Instead, the user completing the Change Directory action is assigned the Azure RBAC [Owner](../../role-based-access-control/built-in-roles.md#owner) role.
diff --git a/articles/cost-management-billing/manage/grant-access-to-create-subscription.md b/articles/cost-management-billing/manage/grant-access-to-create-subscription.md
@@ -6,7 +6,7 @@ ms.service: cost-management-billing
 ms.subservice: billing
 ms.reviewer: andalmia
 ms.topic: conceptual
-ms.date: 03/21/2024
+ms.date: 09/11/2024
 ms.author: banders
 ---
 
@@ -174,7 +174,7 @@ To [create subscriptions under an enrollment account](programmatically-create-su
     az role assignment create --role Owner --assignee-object-id <userObjectId> --scope /providers/Microsoft.Billing/enrollmentAccounts/<enrollmentAccountObjectId>
     ```
 
-    Once a user becomes an Azure RBAC Owner for your enrollment account, they can [programmatically create subscriptions](programmatically-create-subscription-enterprise-agreement.md) under it. A subscription created by a delegated user still has the original Account Owner as Service Admin, but it also has the delegated user as an Azure RBAC Owner by default.
+    Once a user becomes an Azure RBAC Owner for your enrollment account, they can [programmatically create subscriptions](programmatically-create-subscription-enterprise-agreement.md) under it. When a delegated user creates a subscription, they get the Azure RBAC [Owner](../../role-based-access-control/built-in-roles.md#owner) role for the subscription.
 
     ---
 
diff --git a/articles/cost-management-billing/manage/manage-billing-access.md b/articles/cost-management-billing/manage/manage-billing-access.md
@@ -6,26 +6,24 @@ ms.reviewer: amberb
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 12/07/2023
+ms.date: 09/11/2024
 ms.author: banders
 ---
 
 # Manage access to billing information for Azure
 
 You can provide others access to the billing information for your account in the Azure portal. The type of billing roles and the instructions to provide access to the billing information vary by the type of your billing account. To determine the type of your billing account, see [Check the type of your billing account](#check-the-type-of-your-billing-account).
 
-The article applies to customers with Microsoft Online Service program accounts. If you're an Azure customer with an Enterprise Agreement (EA) and are the Enterprise Administrator, you can give permissions to the Department Administrators and Account Owners in the Azure portal. For more information, see [Understand Azure Enterprise Agreement administrative roles in Azure](understand-ea-roles.md). If you're a Microsoft Customer Agreement customer, see, [Understand Microsoft Customer Agreement administrative roles in Azure](understand-mca-roles.md).
+The article applies to customers with Microsoft Online Service Program (MOSP) accounts. If you're an Azure customer with an Enterprise Agreement (EA) and are the Enterprise Administrator, you can give permissions to the Department Administrators and Account Owners in the Azure portal. For more information, see [Understand Azure Enterprise Agreement administrative roles in Azure](understand-ea-roles.md). If you're a Microsoft Customer Agreement customer, see, [Understand Microsoft Customer Agreement administrative roles in Azure](understand-mca-roles.md).
 
 ## Account administrators for Microsoft Online Service program accounts
 
-An Account Administrator is the only owner for a Microsoft Online Service Program billing account. The role is assigned to a person who signed up for Azure. Account Administrators are authorized to perform various billing tasks like create subscriptions, view invoices or change the billing for a subscription.
+By default, the Account Administrator is the only owner for an MOSP billing account. When a user creates an MOSP subscription, they get the Account Administrator role for the subscription. They also get the Azure Role-based access control (RBAC) Owner role for it. The role is assigned to a person who signed up for Azure. Account Administrators are authorized to perform various billing tasks like create subscriptions, view invoices or change the billing for a subscription.
 
 ## Give others access to view billing information
 
 Account administrator can grant others access to Azure billing information by assigning one of the following roles on a subscription in their account.
 
-- Service Administrator
-- Coadministrator
 - Owner
 - Contributor
 - Reader
diff --git a/articles/cost-management-billing/manage/mca-request-billing-ownership.md b/articles/cost-management-billing/manage/mca-request-billing-ownership.md
@@ -208,13 +208,13 @@ Use the following troubleshooting information if you're having trouble transferr
 
 It's possible that the original billing account owner who created an Azure account and an Azure subscription leaves your organization. If that situation happens, then their user identity is no longer in the organization's Microsoft Entra ID. Then the Azure subscription doesn't have a billing owner. This situation prevents anyone from performing billing operations to the account, including viewing and paying bills. The subscription could go into a past-due state. Eventually, the subscription could get disabled because of nonpayment. Ultimately, the subscription could get deleted, affecting every service that runs on the subscription.
 
-When a subscription no longer has a valid billing account owner, Azure sends an email to other Billing account owners, Service Administrators (if any), Co-Administrators (if any), and Subscription Owners informing them of the situation and provides them with a link to accept billing ownership of the subscription. Any one of the users can select the link to accept billing ownership. For more information about billing roles, see [Billing Roles](understand-mca-roles.md) and [Azure roles, Microsoft Entra roles, and classic subscription administrator roles](../../role-based-access-control/rbac-and-directory-admin-roles.md).
+When a subscription no longer has a valid billing account owner, Azure sends an email to other Billing account owner and Subscription Owners informing them of the situation and provides them with a link to accept billing ownership of the subscription. Any one of the users can select the link to accept billing ownership. For more information about billing roles, see [Billing Roles](understand-mca-roles.md) and [Azure roles, Microsoft Entra roles, and classic subscription administrator roles](../../role-based-access-control/rbac-and-directory-admin-roles.md).
 
 Here's an example of what the email looks like.
 
 :::image type="content" source="./media/mca-request-billing-ownership/orphaned-subscription-email.png" alt-text="Screenshot showing an example email to accept billing ownership." lightbox="./media/mca-request-billing-ownership/orphaned-subscription-email.png" :::
 
-Additionally, Azure shows a banner in the subscription's details window in the Azure portal to Billing owners, Service Administrators, Co-Administrators, and Subscription Owners. Select the link in the banner to accept billing ownership.
+Additionally, Azure shows a banner in the subscription's details window in the Azure portal to Billing owners and Subscription Owners. Select the link in the banner to accept billing ownership.
 
 :::image type="content" source="./media/mca-request-billing-ownership/orphaned-subscription-example.png" alt-text="Screenshot showing an example of a subscription without a valid billing owner." lightbox="./media/mca-request-billing-ownership/orphaned-subscription-example.png" :::
 
diff --git a/articles/cost-management-billing/manage/transfer-subscriptions-subscribers-csp.yml b/articles/cost-management-billing/manage/transfer-subscriptions-subscribers-csp.yml
@@ -43,7 +43,7 @@ procedureSection:
         Ensure that the source and target CSP subscriptions are in the same Microsoft Entra tenant.  
           You can't change the Microsoft Entra tenant for an Azure CSP subscription. Instead, you must add or associate the source subscription to the CSP Microsoft Entra tenant. For more information, see [Associate or add an Azure subscription to your Microsoft Entra tenant](../../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md).
           > [!IMPORTANT]
-          > - When you associate a subscription to a different Microsoft Entra directory, users that have roles assigned using [Azure role-based access control (Azure RBAC)](../../role-based-access-control/role-assignments-portal.yml) lose their access. Classic subscription administrators, including Service Administrator and Co-Administrators, also lose access.
+          > - When you associate a subscription to a different Microsoft Entra directory, users that have roles assigned using [Azure role-based access control (Azure RBAC)](../../role-based-access-control/role-assignments-portal.yml) lose their access.
           > - Policy Assignments are also removed from a subscription when the subscription is associated with a different directory.
       - |  
         The user account that you use to do the transfer must have [Azure RBAC](add-change-subscription-administrator.md) owner access on both subscriptions.
@@ -68,7 +68,7 @@ procedureSection:
           The change directory option isn't supported for the CSP subscription. For example, you're transferring from a CSP to a pay-as-you-go subscription. You need to change the directory of the pay-as-you-go subscription to match the directory.
 
           > [!IMPORTANT]
-          >  - When you associate a subscription to a different directory, users that have roles assigned using [Azure RBAC](../../role-based-access-control/role-assignments-portal.yml) lose their access. Classic subscription administrators, including Service Administrator and Co-Administrators, also lose access.
+          >  - When you associate a subscription to a different directory, users that have roles assigned using [Azure RBAC](../../role-based-access-control/role-assignments-portal.yml) lose their access.
           >  - Policy Assignments are also removed from a subscription when the subscription is associated with a different directory.
       - |
         The customer user account that you use to do the transfer must have [Azure RBAC](add-change-subscription-administrator.md) owner access on both subscriptions.
