Skip to content

Commit b666659

Browse files
authored
Merge pull request #161 from alexbuckgit/alexbuckgit/docutune-autopr-20231019-211654-0943973-ignore-build
[BULK] - DocuTune - Rebranding of Azure Active Directory to Microsoft Entra terminology
2 parents a502b1a + e8c5da2 commit b666659

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

docs/microsoft-365-developer-program-faq.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ sections:
3232
You can sign up for the developer program by using one of the following account types:
3333
3434
- **Microsoft account** (created by you for personal use) - Provides access to all consumer-oriented Microsoft products and cloud services, such as Outlook (Hotmail), Messenger, OneDrive, MSN, Xbox Live, or Microsoft 365. Signing up for an Outlook.com mailbox automatically creates a Microsoft account. After a Microsoft account is created, it can be used to access consumer-related Microsoft cloud services or Azure.
35-
- **Work account** (issued by an admin for business use) - Provides access to all small, medium, and enterprise business-level Microsoft cloud services, such as Azure, Microsoft Intune, or Microsoft 365. When you sign up to one of these services as an organization, a cloud-based directory is automatically provisioned in Azure Active Directory to represent your organization. For more information, see [Manage your Azure AD directory](/azure/active-directory/active-directory-administer).
35+
- **Work account** (issued by an admin for business use) - Provides access to all small, medium, and enterprise business-level Microsoft cloud services, such as Azure, Microsoft Intune, or Microsoft 365. When you sign up to one of these services as an organization, a cloud-based directory is automatically provisioned in Microsoft Entra ID to represent your organization. For more information, see [Manage your Microsoft Entra directory](/azure/active-directory/active-directory-administer).
3636
- **Visual Studio ID** (created for your Visual Studio Professional or Enterprise subscriptions) - We recommend that you use this option to join the developer program from within the Visual Studio Gallery to get the full benefits as a Visual Studio subscriber. You can also link your Visual Studio subscription to your Microsoft 365 developer sandbox during the setup process.
3737
3838
- question: |
@@ -55,7 +55,7 @@ sections:
5555
- question: |
5656
What ID do I use to sign in to the Developer Program dashboard?
5757
answer: |
58-
Use your member ID to sign in to the Developer Program dashboard to access information about your subscription. This is the Microsoft account or Azure Active Directory-enabled email that you used to sign in when you joined the program.
58+
Use your member ID to sign in to the Developer Program dashboard to access information about your subscription. This is the Microsoft account or Microsoft Entra-enabled email that you used to sign in when you joined the program.
5959
6060
- question: |
6161
What ID do I use to sign in to my developer subscription?
@@ -97,12 +97,12 @@ sections:
9797
- Advanced analytics with Power BI
9898
- Enterprise Mobility + Security (EMS) for compliance and information protection
9999
- Office 365 Advanced Threat Protection
100-
- Azure Active Directory for building advanced identity and access management solutions
100+
- Microsoft Entra ID for building advanced identity and access management solutions
101101
102102
The Microsoft 365 E5 Developer subscription includes the following:
103103
104-
- Azure Active Directory Premium P1
105-
- Azure Active Directory Premium P2
104+
- Microsoft Entra ID P1
105+
- Microsoft Entra ID P2
106106
- Azure Advanced Threat Protection
107107
- Azure Information Protection Premium P1
108108
- Azure Information Protection Premium P2
@@ -111,7 +111,7 @@ sections:
111111
- Flow for Office 365
112112
- Information Protection for Office 365 - Premium
113113
- Information Protection for Office 365 - Standard
114-
- Microsoft Azure Active Directory Rights
114+
- Microsoft Entra Rights
115115
- Microsoft Azure Multi-Factor Authentication
116116
- Microsoft Cloud App Security
117117
- Microsoft Forms (Plan E5)
@@ -272,7 +272,7 @@ sections:
272272
- question: |
273273
Should I choose an instant sandbox or a configurable sandbox?
274274
answer: |
275-
If you choose an instant sandbox, you can cut your sandbox configuration time from days to seconds. The Microsoft 365 instant sandbox comes pre-provisioned with Microsoft Teams, SharePoint, Outlook, and Office. It also includes licenses for 24 test users plus one admin, and the latest Microsoft 365 apps for your PC and Mac, including Power Apps, Power BI, Enterprise Mobility + Security, Office 365 Advanced Threat Protection, and Azure Active Directory.
275+
If you choose an instant sandbox, you can cut your sandbox configuration time from days to seconds. The Microsoft 365 instant sandbox comes pre-provisioned with Microsoft Teams, SharePoint, Outlook, and Office. It also includes licenses for 24 test users plus one admin, and the latest Microsoft 365 apps for your PC and Mac, including Power Apps, Power BI, Enterprise Mobility + Security, Office 365 Advanced Threat Protection, and Microsoft Entra ID.
276276
277277
In addition, you get pre-installed sample data, including the new Teams sample data pack, which simulate a small corporate environment to help you build solutions across the Microsoft 365 platform. For details, see Developer sandbox sample data.
278278

docs/microsoft-365-developer-program-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You can choose to set up either an instant sandbox or a configurable sandbox.
1616

1717
## Instant sandbox
1818

19-
If you choose an instant sandbox, you can cut your sandbox configuration time from days to seconds. The Microsoft 365 instant sandbox comes pre-provisioned with Microsoft Teams, SharePoint, Outlook, and Office. It also includes licenses for 24 test users plus one admin, and the latest Microsoft 365 apps for your PC and Mac, including Power Apps, Power BI, Enterprise Mobility + Security, Office 365 Advanced Threat Protection, and Azure Active Directory.
19+
If you choose an instant sandbox, you can cut your sandbox configuration time from days to seconds. The Microsoft 365 instant sandbox comes pre-provisioned with Microsoft Teams, SharePoint, Outlook, and Office. It also includes licenses for 24 test users plus one admin, and the latest Microsoft 365 apps for your PC and Mac, including Power Apps, Power BI, Enterprise Mobility + Security, Office 365 Advanced Threat Protection, and Microsoft Entra ID.
2020

2121
In addition, you get pre-installed sample data, including the new Teams sample data pack, as well as Microsoft Graph user, mail, and calendar data and SharePoint Framework sample data, which simulate a small corporate environment to help you build solutions across the Microsoft 365 platform. For details, see [Developer sandbox sample data](install-sample-packs.md).
2222

docs/microsoft-365-developer-program.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Do you have a Visual Studio Pro or Enterprise subscription? If so, you can take
1717
1818
1. Go to the [Join the Microsoft 365 Developer Program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) page.
1919

20-
2. In the upper-right corner, choose **Sign in** to sign in with your Microsoft account or Azure Active Directory-enabled email.
20+
2. In the upper-right corner, choose **Sign in** to sign in with your Microsoft account or Microsoft Entra-enabled email.
2121

2222
> [!NOTE]
2323
> Remember the account that you sign in with. You'll sign in to the [Developer Program dashboard](https://developer.microsoft.com/en-us/microsoft-365/profile) with this account. This account is different than the admin ID that you'll use for your Microsoft 365 developer subscription.
@@ -53,5 +53,3 @@ Do you have a Visual Studio Pro or Enterprise subscription? If so, you can take
5353
- For information about expiring subscriptions, see [Subscription expiration and renewal](subscription-expiration-and-renewal.md).
5454
- For frequently asked questions about the Microsoft 365 Developer Program, see the [FAQ](microsoft-365-developer-program-faq.yml).
5555
- Explore the [Microsoft 365 developer documentation](/microsoft-365/developer).
56-
57-

0 commit comments

Comments
 (0)