Skip to content

Commit 80abd49

Browse files
committed
[BULK] DocuTune - Updates to Azure AD rebranding g
1 parent 6e2d217 commit 80abd49

7 files changed

+52
-40
lines changed

Diff for: articles/dev-box/concept-dev-box-concepts.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ IT administrators and platform engineers configure the network that's used for d
4646

4747
When you're creating a network connection, you must choose the Active Directory join type:
4848

49-
- If your dev boxes need to connect exclusively to cloud-based resources, use native Azure Active Directory (Azure AD).
50-
- If your dev boxes need to connect to on-premises resources and cloud-based resources, use hybrid Azure AD.
49+
- If your dev boxes need to connect exclusively to cloud-based resources, use native Microsoft Entra ID.
50+
- If your dev boxes need to connect to on-premises resources and cloud-based resources, use hybrid Microsoft Entra ID.
5151

52-
To learn more about native Azure AD join and hybrid Azure AD join, see [Plan your Azure Active Directory device deployment](../active-directory/devices/plan-device-deployment.md).
52+
To learn more about native Microsoft Entra join and Microsoft Entra hybrid join, see [Plan your Microsoft Entra device deployment](../active-directory/devices/plan-device-deployment.md).
5353

5454
The virtual network specified in a network connection also determines the region for a dev box. You can create multiple network connections based on the regions where you support developers. You can then use those connections when you're creating dev box pools to ensure that dev box users create dev boxes in a region close to them. Using a region close to the dev box user provides the best experience.
5555

Diff for: articles/dev-box/dev-box-faq.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ sections:
3939
For more information, see: [Compute gallery image requirements](how-to-configure-azure-compute-gallery.md#compute-gallery-image-requirements).
4040
4141
- question: Why does it take 25 minutes or more to provision a dev box?
42-
answer: The provisioning process for a dev box involves interacting with several services, including authenticating with Azure Active Directory (Azure AD). The new dev box must be created, initiate networking connectivity services, authenticate to and join the Azure AD, register with Intune, and check for any Azure AD security requirements. Depending on the complexity of the dev box definition, there might also be installation and configuration tasks on the dev box itself to provide you with the environment you need to start work. When your dev box is fully provisioned, it's running, ready for you to sign in.
42+
answer: The provisioning process for a dev box involves interacting with several services, including authenticating with Microsoft Entra ID. The new dev box must be created, initiate networking connectivity services, authenticate to and join the Microsoft Entra ID, register with Intune, and check for any Microsoft Entra security requirements. Depending on the complexity of the dev box definition, there might also be installation and configuration tasks on the dev box itself to provide you with the environment you need to start work. When your dev box is fully provisioned, it's running, ready for you to sign in.
4343

4444
- question: How can I check my Dev Box quota? # Question.
4545
answer: |

Diff for: articles/dev-box/how-to-authenticate.md

+12-8
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,21 @@ ms.date: 09/07/2023
1414
> Before authenticating, ensure that the user or identity has the appropriate permissions to perform the desired action. For more information, see [configuring project admins](./how-to-project-admin.md) and [configuring Dev Box users](./how-to-dev-box-user.md).
1515
1616

17-
## Using Azure AD authentication for REST APIs
17+
<a name='using-azure-ad-authentication-for-rest-apis'></a>
1818

19-
Use the following procedures to authenticate with Azure AD. You can follow along in [Azure Cloud Shell](../../articles/cloud-shell/quickstart.md), on an Azure virtual machine, or on your local machine.
19+
## Using Microsoft Entra authentication for REST APIs
20+
21+
Use the following procedures to authenticate with Microsoft Entra ID. You can follow along in [Azure Cloud Shell](../../articles/cloud-shell/quickstart.md), on an Azure virtual machine, or on your local machine.
2022

2123
### Sign in to the user's Azure subscription
2224

23-
Start by authenticating with Azure AD by using the Azure CLI. This step isn't required in Azure Cloud Shell.
25+
Start by authenticating with Microsoft Entra ID by using the Azure CLI. This step isn't required in Azure Cloud Shell.
2426

2527
```azurecli
2628
az login
2729
```
2830

29-
The command opens a browser window to the Azure AD authentication page. It requires you to give your Azure AD user ID and password.
31+
The command opens a browser window to the Microsoft Entra authentication page. It requires you to give your Microsoft Entra user ID and password.
3032

3133
Next, set the correct subscription context. If you authenticate from an incorrect subscription or tenant you may receive unexpected 403 Forbidden errors.
3234

@@ -35,9 +37,11 @@ az account set --subscription <subscription_id>
3537
```
3638

3739

38-
### Retrieve the Azure AD access token
40+
<a name='retrieve-the-azure-ad-access-token'></a>
41+
42+
### Retrieve the Microsoft Entra access token
3943

40-
Use the Azure CLI to acquire an access token for the Azure AD authenticated user.
44+
Use the Azure CLI to acquire an access token for the Microsoft Entra authenticated user.
4145
Note that the resource ID is different depending on if you are accessing administrator (control plane) APIs or developer (data plane) APIs.
4246

4347
For administrator APIs, use the following command:
@@ -50,7 +54,7 @@ For developer APIs, use the following command:
5054
az account get-access-token --resource https://devcenter.azure.com
5155
```
5256

53-
After authentication is successful, Azure AD returns an access token for current Azure subscription:
57+
After authentication is successful, Microsoft Entra ID returns an access token for current Azure subscription:
5458

5559
```json
5660
{
@@ -72,4 +76,4 @@ The token is a Base64 string. The token is valid for at least 5 minutes with the
7276
To access REST APIs, you must set the Authorization header on your request. The header value should be the string `Bearer` followed by a space and the token you received in the previous step.
7377

7478
## Next steps
75-
- Review [Azure Active Directory fundamentals](../../articles/active-directory/fundamentals/whatis.md).
79+
- Review [Microsoft Entra fundamentals](../../articles/active-directory/fundamentals/whatis.md).

Diff for: articles/dev-box/how-to-configure-network-connections.md

+16-12
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ When you're planning network connectivity for your dev boxes, you must:
2020
- Ensure that you have sufficient permissions to create and configure network connections.
2121
- Ensure that you have at least one virtual network and subnet available for your dev boxes.
2222
- Identify the region or location that's closest to your dev box users. Deploying dev boxes into a region that's close to users gives them a better experience.
23-
- Determine whether dev boxes should connect to your existing networks by using Azure Active Directory (Azure AD) join or hybrid Azure AD join.
23+
- Determine whether dev boxes should connect to your existing networks by using Microsoft Entra join or Microsoft Entra hybrid join.
2424

2525
## Permissions
2626

@@ -78,20 +78,22 @@ The following sections show you how to create and configure a network connection
7878

7979
The Dev Box service requires a configured and working Active Directory join, which defines how dev boxes join your domain and access resources. There are two choices:
8080

81-
- **Azure AD join**: If your organization uses Azure AD, you can use an Azure AD join (sometimes called a native Azure AD join). Dev box users sign in to Azure AD-joined dev boxes by using their Azure AD account and access resources based on the permissions assigned to that account. Azure AD join enables access to cloud-based and on-premises apps and resources.
81+
- **Microsoft Entra join**: If your organization uses Microsoft Entra ID, you can use a Microsoft Entra join (sometimes called a native Microsoft Entra join). Dev box users sign in to Microsoft Entra joined dev boxes by using their Microsoft Entra account and access resources based on the permissions assigned to that account. Microsoft Entra join enables access to cloud-based and on-premises apps and resources.
8282

83-
For more information, see [Plan your Azure Active Directory join deployment](../active-directory/devices/device-join-plan.md).
84-
- **Hybrid Azure AD join**: If your organization has an on-premises Active Directory implementation, you can still benefit from some of the functionality in Azure AD by using hybrid Azure AD-joined dev boxes. These dev boxes are joined to your on-premises Active Directory instance and registered with Azure AD.
83+
For more information, see [Plan your Microsoft Entra join deployment](../active-directory/devices/device-join-plan.md).
84+
- **Microsoft Entra hybrid join**: If your organization has an on-premises Active Directory implementation, you can still benefit from some of the functionality in Microsoft Entra ID by using Microsoft Entra hybrid joined dev boxes. These dev boxes are joined to your on-premises Active Directory instance and registered with Microsoft Entra ID.
8585

86-
Hybrid Azure AD-joined dev boxes require network line of sight to your on-premises domain controllers periodically. Without this connection, devices become unusable.
86+
Microsoft Entra hybrid joined dev boxes require network line of sight to your on-premises domain controllers periodically. Without this connection, devices become unusable.
8787

88-
For more information, see [Plan your hybrid Azure Active Directory join deployment](../active-directory/devices/hybrid-join-plan.md).
88+
For more information, see [Plan your Microsoft Entra hybrid join deployment](../active-directory/devices/hybrid-join-plan.md).
8989

9090
### Create a network connection
9191

9292
Follow the steps on the relevant tab to create your network connection.
9393

94-
#### [**Azure AD join**](#tab/AzureADJoin/)
94+
<a name='azure-ad-join'></a>
95+
96+
#### [**Microsoft Entra join**](#tab/AzureADJoin/)
9597

9698
1. Sign in to the [Azure portal](https://portal.azure.com).
9799

@@ -105,22 +107,24 @@ Follow the steps on the relevant tab to create your network connection.
105107

106108
|Name|Value|
107109
|----|----|
108-
|**Domain join type**|Select **Azure active directory join**.|
110+
|**Domain join type**|Select **Microsoft Entra join**.|
109111
|**Subscription**|Select the subscription in which you want to create the network connection.|
110112
|**ResourceGroup**|Select an existing resource group, or select **Create new** and then enter a name for the new resource group.|
111113
|**Name**|Enter a descriptive name for the network connection.|
112114
|**Virtual network**|Select the virtual network that you want the network connection to use.|
113115
|**Subnet**|Select the subnet that you want the network connection to use.|
114116

115-
:::image type="content" source="./media/how-to-manage-network-connection/create-native-network-connection-full-blank.png" alt-text="Screenshot that shows the Basics tab on the pane for creating a network connection, with the option for Azure Active Directory join selected.":::
117+
:::image type="content" source="./media/how-to-manage-network-connection/create-native-network-connection-full-blank.png" alt-text="Screenshot that shows the Basics tab on the pane for creating a network connection, with the option for Microsoft Entra join selected.":::
116118

117119
1. Select **Review + Create**.
118120

119121
1. On the **Review** tab, select **Create**.
120122

121123
1. When the deployment is complete, select **Go to resource**. Confirm that the connection appears on the **Network connections** page.
122124

123-
#### [**Hybrid Azure AD join**](#tab/HybridAzureADJoin/)
125+
<a name='hybrid-azure-ad-join'></a>
126+
127+
#### [**Microsoft Entra hybrid join**](#tab/HybridAzureADJoin/)
124128

125129
1. Sign in to the [Azure portal](https://portal.azure.com).
126130

@@ -134,7 +138,7 @@ Follow the steps on the relevant tab to create your network connection.
134138

135139
|Name|Value|
136140
|----|----|
137-
|**Domain join type**|Select **Hybrid Azure active directory join**.|
141+
|**Domain join type**|Select **Microsoft Entra hybrid join**.|
138142
|**Subscription**|Select the subscription in which you want to create the network connection.|
139143
|**ResourceGroup**|Select an existing resource group, or select **Create new** and then enter a name for the new resource group.|
140144
|**Name**|Enter a descriptive name for the network connection.|
@@ -145,7 +149,7 @@ Follow the steps on the relevant tab to create your network connection.
145149
|**AD username UPN**| Enter the username, in user principal name (UPN) format, that you want to use for connecting Cloud PCs to your Active Directory domain. For example: `svcDomainJoin@corp.contoso.com`. This service account must have permission to join computers to the domain and the target OU (if one is set). |
146150
|**AD domain password**| Enter the password for the user. |
147151

148-
:::image type="content" source="./media/how-to-manage-network-connection/create-hybrid-network-connection-full-blank.png" alt-text="Screenshot that shows the Basics tab on the pane for creating a network connection, with the option for hybrid Azure Active Directory join selected.":::
152+
:::image type="content" source="./media/how-to-manage-network-connection/create-hybrid-network-connection-full-blank.png" alt-text="Screenshot that shows the Basics tab on the pane for creating a network connection, with the option for Microsoft Entra hybrid join selected.":::
149153

150154
1. Select **Review + Create**.
151155

Diff for: articles/dev-box/overview-what-is-microsoft-dev-box.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Dev Box has the following benefits for IT admins:
4646
- Dev boxes automatically enroll in Intune. Use the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431) to manage dev boxes.
4747
- Keep all Windows devices up to date by using expedited quality updates in Intune to deploy zero-day patches across your organization.
4848
- If a dev box is compromised, isolate it while helping users get backup and running on a new dev box.
49-
- Dev Box provides secure access in a secure environment. Access controls in Azure Active Directory (Azure AD) organize access by project or user type:
50-
- Join dev boxes natively to an Azure AD or Active Directory domain.
49+
- Dev Box provides secure access in a secure environment. Access controls in Microsoft Entra ID organize access by project or user type:
50+
- Join dev boxes natively to a Microsoft Entra ID or Active Directory domain.
5151
- Set conditional access policies that require users to connect via a compliant device.
5252
- Require multifactor authentication at sign-in.
5353
- Configure risk-based sign-in policies for dev boxes that access sensitive source code and customer data.
@@ -75,7 +75,7 @@ This diagram shows the components of the Dev Box service and the relationships b
7575

7676
Dev Box service configuration begins with the creation of a dev center, which represents the units of organization in the enterprise. Dev centers are logical containers to help organize dev box resources. There's no limit on the number of dev centers that you can create, but most organizations need only one.
7777

78-
Azure network connections enable dev boxes to communicate with your organization's network. The network connection provides a link between the dev center and your organization's virtual networks. In the network connection, you define how a dev box joins Azure AD. Use an Azure AD join to connect exclusively to cloud-based resources, or use a hybrid Azure AD join to connect to on-premises resources and cloud-based resources.
78+
Azure network connections enable dev boxes to communicate with your organization's network. The network connection provides a link between the dev center and your organization's virtual networks. In the network connection, you define how a dev box joins Microsoft Entra ID. Use a Microsoft Entra join to connect exclusively to cloud-based resources, or use a Microsoft Entra hybrid join to connect to on-premises resources and cloud-based resources.
7979

8080
Dev box definitions define the configuration of the dev boxes that are available to users. You can use an image from Azure Marketplace, like the **Visual Studio 2022 Enterprise on Windows 11 Enterprise + Microsoft 365 Apps 22H2** image. Or you can create your own custom image and store it in Azure Compute Gallery. Specify a SKU with compute and storage to complete the dev box definition.
8181

Diff for: articles/dev-box/quickstart-configure-dev-box-arm-template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ If your environment meets the prerequisites and you're familiar with using ARM t
2626

2727
- If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
2828
- Owner or Contributor role on an Azure subscription or resource group.
29-
- Entra AD. Your organization must use Entra AD for identity and access management.
29+
- Microsoft Entra AD. Your organization must use Microsoft Entra AD for identity and access management.
3030

3131
## Review the template
3232

0 commit comments

Comments
 (0)