Skip to content

Commit a25be01

Browse files
ianwhytezianwhytez
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into stonith
2 parents d49bdee + ff8403a commit a25be01

File tree

18 files changed

+199
-226
lines changed

18 files changed

+199
-226
lines changed

‎articles/active-directory-b2c/enable-authentication-spa-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ The resources referenced by the *index.html* file are detailed in the following
109109
|[`ui.js`](https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa/blob/main/App/ui.js) | Controls the UI elements. |
110110
| | |
111111

112-
To render the SPA index file, in the *myApp* folder, create a file named *index.html*, which contains the following HTML snippet.
112+
To render the SPA index file, in the *myApp* folder, create a file named *index.html*, which contains the following HTML snippet:
113113

114114
```html
115115
<!DOCTYPE html>
@@ -221,7 +221,7 @@ To specify your Azure AD B2C user flows, do the following:
221221

222222
In this step, implement the methods to initialize the sign-in flow, API access token acquisition, and the sign-out methods.
223223

224-
For more information, see the [MSAL PublicClientApplication class reference](https://azuread.github.io/microsoft-authentication-library-for-js/ref/classes/_azure_msal_browser.publicclientapplication.html), and [Use the Microsoft Authentication Library (MSAL) to sign in the user](../active-directory/develop/tutorial-v2-javascript-spa.md#use-the-microsoft-authentication-library-msal-to-sign-in-the-user) articles.
224+
For more information, see the [MSAL PublicClientApplication class reference](https://azuread.github.io/microsoft-authentication-library-for-js/ref/classes/_azure_msal_browser.publicclientapplication.html), and [Use the Microsoft Authentication Library (MSAL) to sign in the user](../active-directory/develop/tutorial-v2-javascript-spa.md#use-the-msal-to-sign-in-the-user) articles.
225225

226226
To sign in the user, do the following:
227227

@@ -442,7 +442,7 @@ To call your web API by using the token you acquired, do the following:
442442

443443
## Step 10: Add the UI elements reference
444444

445-
The SPA app uses JavaScript to control the UI elements. For example, it displays the sign-in and sign-out buttons, and renders the users ID token claims to the screen.
445+
The SPA app uses JavaScript to control the UI elements. For example, it displays the sign-in and sign-out buttons, and renders the users' ID token claims to the screen.
446446
447447
To add the UI elements reference, do the following:
448448

‎articles/active-directory/develop/scenario-desktop-acquire-token-username-password.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ For more information on all the modifiers that can be applied to `AcquireTokenBy
254254

255255
# [Java](#tab/java)
256256

257-
The following extract is from the [MSAL Java code samples](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/src/samples/public-client/).
257+
The following extract is from the [MSAL Java code samples](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/msal4j-sdk/src/samples/public-client/UsernamePasswordFlow.java).
258258

259259
```java
260260
PublicClientApplication pca = PublicClientApplication.builder(clientId)

‎articles/active-directory/develop/tutorial-v2-javascript-spa.md

Lines changed: 120 additions & 109 deletions
Large diffs are not rendered by default.

‎articles/container-instances/container-instances-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ sections:
142142
- question: |
143143
Does the ACI service reserve ports for service functionality?
144144
answer: |
145-
Yes, the ACI service does reserve the following ports for service functionality: 22, 443, 1025-1027, 3389-3399, 9999, 19000, 19080, 19390, 191000, 20000-30000, 49152-65534. Please avoid using these ports in your container group definition.
145+
Yes, the ACI service does reserve the following ports for service functionality: 22, 443, 1025-1027, 3389-3399, 9999, 19000, 19080, 19390, 19100, 20000-30000, 49152-65534. Please avoid using these ports in your container group definition.
146146
147147
- name: Pricing
148148
questions:

‎articles/cost-management-billing/manage/subscription-transfer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ Dev/Test products aren't shown in the following table. Transfers for Dev/Test pr
7575
| EA | MCA - individual | • For details, see [Transfer Azure subscription billing ownership for a Microsoft Customer Agreement](mca-request-billing-ownership.md).<br><br> • Self-service reservation transfers are supported. |
7676
| EA | EA | • Transferring between EA enrollments requires a [billing support ticket](https://azure.microsoft.com/support/create-ticket/).<br><br> • Self-service reservation transfers are supported.<br><br> • Transfer within the same enrollment is the same action as changing the account owner. For details, see [Change EA subscription or account ownership](ea-portal-administration.md#change-azure-subscription-or-account-ownership). |
7777
| EA | MCA - Enterprise | • Transferring all enrollment products is completed as part of the MCA transition process from an EA. For more information, see [Complete Enterprise Agreement tasks in your billing account for a Microsoft Customer Agreement](mca-enterprise-operations.md).<br><br> • If you want to transfer specific products, not all of the products in an enrollment, see [Transfer Azure subscription billing ownership for a Microsoft Customer Agreement](mca-request-billing-ownership.md). - Self-service reservation transfers are supported. |
78-
| EA | MPA | • Transfer is only allowed for direct EA to MPA. A direct EA is signed between Microsoft and an EA customer.<br><br>• Only CSP direct bill partners certified as an [Azure Expert Managed Services Provider (MSP)](https://partner.microsoft.com/membership/azure-expert-msp) can request to transfer Azure products for their customers that have a Direct Enterprise Agreement (EA). For more information, see [Get billing ownership of Azure subscriptions to your MPA account](mpa-request-ownership.md). Product transfers are allowed only for customers who have accepted a Microsoft Customer Agreement (MCA) and purchased an Azure plan with the CSP Program.<br><br> • Transfer from EA Government to MPA isn't supported.<br><br>• There are limitations and restrictions. For more information, see [Transfer EA subscriptions to a CSP partner](transfer-subscriptions-subscribers-csp.md#transfer-ea-subscriptions-to-a-csp-partner). |
78+
| EA | MPA | • Transfer is only allowed for direct EA to MPA. A direct EA is signed between Microsoft and an EA customer.<br><br>• Only CSP direct bill partners certified as an [Azure Expert Managed Services Provider (MSP)](https://partner.microsoft.com/membership/azure-expert-msp) can request to transfer Azure products for their customers that have a Direct Enterprise Agreement (EA). For more information, see [Get billing ownership of Azure subscriptions to your MPA account](mpa-request-ownership.md). Product transfers are allowed only for customers who have accepted a Microsoft Customer Agreement (MCA) and purchased an Azure plan with the CSP Program.<br><br> • Transfer from EA Government to MPA isn't supported.<br><br>• There are limitations and restrictions. For more information, see [Transfer EA subscriptions to a CSP partner](transfer-subscriptions-subscribers-csp.md#transfer-ea-or-mca-enterprise-subscriptions-to-a-csp-partner). |
7979
| MCA - individual | MOSP (PAYG) | • For details, see [Transfer billing ownership of an Azure subscription to another account](billing-subscription-transfer.md).<br><br> • Reservations don't automatically transfer and transferring them isn't supported. |
8080
| MCA - individual | MCA - individual | • For details, see [Transfer Azure subscription billing ownership for a Microsoft Customer Agreement](mca-request-billing-ownership.md).<br><br> • Self-service reservation transfers are supported. |
8181
| MCA - individual | EA | • For details, see [Transfer a subscription to an EA](mosp-ea-transfer.md#transfer-the-subscription-to-the-ea).<br><br> • Self-service reservation transfers are supported. |
8282
| MCA - individual | MCA - Enterprise | • For details, see [Transfer Azure subscription billing ownership for a Microsoft Customer Agreement](mca-request-billing-ownership.md).<br><br>• Self-service reservation transfers are supported. |
8383
| MCA - Enterprise | MOSP | • Requires a [billing support ticket](https://azure.microsoft.com/support/create-ticket/).<br><br> • Reservations don't automatically transfer and transferring them isn't supported. |
8484
| MCA - Enterprise | MCA - individual | • For details, see [Transfer Azure subscription billing ownership for a Microsoft Customer Agreement](mca-request-billing-ownership.md).<br><br> • Self-service reservation transfers are supported. |
8585
| MCA - Enterprise | MCA - Enterprise | • For details, see [Transfer Azure subscription billing ownership for a Microsoft Customer Agreement](mca-request-billing-ownership.md).<br><br> • Self-service reservation transfers are supported. |
86-
| MCA - Enterprise | MPA | • Only CSP direct bill partners certified as an [Azure Expert Managed Services Provider (MSP)](https://partner.microsoft.com/membership/azure-expert-msp) can request to transfer Azure products for their customers that have a Microsoft Customer Agreement with a Microsoft representative. For more information, see [Get billing ownership of Azure subscriptions to your MPA account](mpa-request-ownership.md). Product transfers are allowed only for customers who have accepted a Microsoft Customer Agreement (MCA) and purchased an Azure plan with the CSP Program.<br><br> • Self-service reservation transfers are supported.<br><br> • There are limitations and restrictions. For more information, see [Transfer EA subscriptions to a CSP partner](transfer-subscriptions-subscribers-csp.md#transfer-ea-subscriptions-to-a-csp-partner). |
86+
| MCA - Enterprise | MPA | • Only CSP direct bill partners certified as an [Azure Expert Managed Services Provider (MSP)](https://partner.microsoft.com/membership/azure-expert-msp) can request to transfer Azure products for their customers that have a Microsoft Customer Agreement with a Microsoft representative. For more information, see [Get billing ownership of Azure subscriptions to your MPA account](mpa-request-ownership.md). Product transfers are allowed only for customers who have accepted a Microsoft Customer Agreement (MCA) and purchased an Azure plan with the CSP Program.<br><br> • Self-service reservation transfers are supported.<br><br> • There are limitations and restrictions. For more information, see [Transfer EA subscriptions to a CSP partner](transfer-subscriptions-subscribers-csp.md#transfer-ea-or-mca-enterprise-subscriptions-to-a-csp-partner). |
8787
| Previous Azure offer in CSP | Previous Azure offer in CSP | • Requires a [billing support ticket](https://azure.microsoft.com/support/create-ticket/).<br><br> • Reservations don't automatically transfer and transferring them isn't supported. |
8888
| Previous Azure offer in CSP | MPA | For details, see [Transfer a customer's Azure subscriptions to a different CSP (under an Azure plan)](/partner-center/transfer-azure-subscriptions-under-azure-plan). |
8989
| MPA | EA | • Automatic transfer isn't supported. Any transfer requires resources to move from the existing MPA product manually to a newly created or an existing EA product.<br><br> • Use the information in the [Perform resource transfers](#perform-resource-transfers) section. <br><br> • Reservations don't automatically transfer and transferring them isn't supported. |

‎articles/cost-management-billing/manage/transfer-subscriptions-subscribers-csp.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
title: Transfer Azure subscriptions between subscribers and CSPs
33
description: Learn how you can transfer Azure subscriptions between subscribers and CSPs.
44
author: bandersmsft
5-
ms.reviewer: dhgandhi
5+
ms.reviewer: sgautam
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: how-to
9-
ms.date: 09/23/2022
9+
ms.date: 10/19/2022
1010
ms.author: banders
1111
---
1212

1313
# Transfer Azure subscriptions between subscribers and CSPs
1414

15-
This article provides high-level steps used to transfer Azure subscriptions to and from Cloud Solution Provider (CSP) partners and their customers. The information here is intended for the Azure subscriber to help them coordinate with their partner. Information that Microsoft partners use for the transfer process is documented at [Learn how to transfer a customer's Azure subscriptions to another partner](/partner-center/switch-azure-subscriptions-to-a-different-partner).
15+
This article provides high-level steps used to transfer Azure subscriptions to and from Cloud Solution Provider (CSP) partners and their customers. This information is intended for the Azure subscriber to help them coordinate with their partner. Information that Microsoft partners use for the transfer process is documented at [Transfer subscriptions under and Azure plan from one partner to another](azure-plan-subscription-transfer-partners.md).
1616

17-
Before you start a transfer request, you should download or export any cost and billing information that you want to keep. Billing and utilization information doesn't transfer with the subscription. For more information about exporting cost management data, see [Create and manage exported data](../costs/tutorial-export-acm-data.md). For more information about downloading your invoice and usage data, see [Download or view your Azure billing invoice and daily usage data](download-azure-invoice-daily-usage-date.md).
17+
Download or export cost and billing information that you want to keep before you start a transfer request. Billing and utilization information doesn't transfer with the subscription. For more information about exporting cost management data, see [Create and manage exported data](../costs/tutorial-export-acm-data.md). For more information about downloading your invoice and usage data, see [Download or view your Azure billing invoice and daily usage data](download-azure-invoice-daily-usage-date.md).
1818

19-
## Transfer EA subscriptions to a CSP partner
19+
## Transfer EA or MCA enterprise subscriptions to a CSP partner
2020

21-
CSP direct bill partners certified as an [Azure Expert Managed Services Provider (MSP)](https://partner.microsoft.com/membership/azure-expert-msp) can request to transfer Azure subscriptions for their customers that have a Direct Enterprise Agreement (EA). Subscription transfers are allowed only for customers who have accepted a Microsoft Customer Agreement (MCA) and purchased an Azure plan with the CSP Program.
21+
CSP direct bill partners certified as an [Azure Expert Managed Services Provider (MSP)](https://partner.microsoft.com/membership/azure-expert-msp) can request to transfer Azure subscriptions for their customers. The customers must have a Direct Enterprise Agreement (EA) or a Microsoft account team (Microsoft Customer Agreement enterprise). Subscription transfers are allowed only for customers who have accepted an MCA and purchased an Azure plan with the CSP Program.
2222

2323
When the request is approved, the CSP can then provide a combined invoice to their customers. To learn more about CSPs transferring subscriptions, see [Get billing ownership of Azure subscriptions for your MPA account](mpa-request-ownership.md).
2424

2525
>[!IMPORTANT]
26-
> After transfering an EA subscription to a CSP partner, any quota increases previously applied to the EA subscription will be reset to the default value. If additional quota is required after the subscription transfer, have your CSP provider submit a [quota increase](../../azure-portal/supportability/regional-quota-requests.md) request.
26+
> After transfering an EA or MCA enterprise subscription to a CSP partner, any quota increases previously applied to the EA subscription will be reset to the default value. If additional quota is required after the subscription transfer, have your CSP provider submit a [quota increase](../../azure-portal/supportability/regional-quota-requests.md) request.
2727
2828
## Other subscription transfers to a CSP partner
2929

30-
To transfer any other Azure subscriptions to a CSP partner, the subscriber needs to move resources from source subscriptions to CSP subscriptions. Use the following guidance to move resources between subscriptions.
30+
To transfer any other Azure subscriptions that aren't supported for billing transfer to MPA as documented in the [Azure subscription transfer hub](subscription-transfer.md#product-transfer-support) article, the subscriber needs to move resources from source subscriptions to CSP subscriptions. Use the following guidance to move resources between subscriptions.
3131

3232
1. Establish a [reseller relationship](/partner-center/request-a-relationship-with-a-customer) with the customer. Review the [CSP Regional Authorization Overview](/partner-center/regional-authorization-overview) to ensure both customer and Partner tenant are within the same authorized regions.
3333
1. Work with your CSP partner to create target Azure CSP subscriptions.
@@ -46,13 +46,13 @@ To transfer any other Azure subscriptions to a CSP partner, the subscriber needs
4646
> [!IMPORTANT]
4747
> - Moving Azure resources between subscriptions might result in service downtime, based on resources in the subscriptions.
4848
49-
## Transfer CSP subscription to other offer
49+
## Transfer CSP subscription to other offers
5050

51-
To transfer any other subscriptions from a CSP Partner to any other Azure offer, the subscriber needs to move resources between source CSP subscriptions and target subscriptions. This is work done by a partner and a customer - it is not work done by a Microsoft representative.
51+
It's possible to transfer other subscriptions from a CSP Partner to other Azure offers that aren't supported for billing transfer from MPA as documented in the [Azure subscription transfer hub](subscription-transfer.md#product-transfer-support) article. However, the subscriber needs to manually move resources between source CSP subscriptions and target subscriptions. All work done by a partner and a customer - it isn't work done by a Microsoft representative.
5252

5353
1. The customer creates target Azure subscriptions.
5454
1. Ensure that the source and target subscriptions are in the same Azure Active Directory (Azure AD) tenant. For more information about changing an Azure AD tenant, see [Associate or add an Azure subscription to your Azure Active Directory tenant](../../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md).
55-
Note that 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 change the directory of the pay-as-you-go subscription to match the directory.
55+
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.
5656

5757
> [!IMPORTANT]
5858
> - When you associate a subscription to a different directory, users that have roles assigned using [Azure RBAC](../../role-based-access-control/role-assignments-portal.md) lose their access. Classic subscription administrators, including Service Administrator and Co-Administrators, also lose access.
@@ -68,5 +68,6 @@ To transfer any other subscriptions from a CSP Partner to any other Azure offer,
6868
> - Moving Azure resources between subscriptions might result in service downtime, based on resources in the subscriptions.
6969
7070
## Next steps
71+
7172
- [Get billing ownership of Azure subscriptions for your MPA account](mpa-request-ownership.md).
7273
- Read about how to [Manage accounts and subscriptions with Azure Billing](../index.yml).

0 commit comments

Comments
 (0)