Skip to content

Commit 7c7fa9e

Browse files
GitHubber17GitHubber17
authored
Merge pull request #78538 from MicrosoftDocs/master
Merge master to live Sunday 4:00 PM
2 parents ec7b0bf + 8dfcf92 commit 7c7fa9e

File tree

125 files changed

+1256
-399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1256
-399
lines changed

‎.openpublishing.redirection.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11045,11 +11045,6 @@
1104511045
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
1104611046
"redirect_document_id": false
1104711047
},
11048-
{
11049-
"source_path": "articles/event-hubs/event-hubs-dedicated-cluster-create-portal.md",
11050-
"redirect_url": "/azure/event-hubs/event-hubs-dedicated-overview",
11051-
"redirect_document_id": false
11052-
},
1105311048
{
1105411049
"source_path": "articles/event-hubs/event-hubs-dotnet-framework-getstarted-receive-eph.md",
1105511050
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-framework-getstarted-send",

‎articles/active-directory/authentication/howto-authentication-phone-sign-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@ One of the prerequisites to create this new, strong credential, is that the devi
8686
8787
## Next steps
8888
89-
[Learn about device registration](../devices/overview.md#getting-devices-under-the-control-of-azure-ad)
89+
[Learn about device registration](../devices/overview.md#getting-devices-in-azure-ad)
9090
9191
[Learn about Azure Multi-Factor Authentication](../authentication/howto-mfa-getstarted.md)

‎articles/active-directory/devices/device-management-azure-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The **Devices** page enables you to:
5858

5959
## Configure device settings
6060

61-
To manage your devices using the Azure portal, your devices need to be either [registered or joined](overview.md#getting-devices-under-the-control-of-azure-ad) to Azure AD. As an administrator, you can fine-tune the process of registering and joining devices by configuring the device settings.
61+
To manage your devices using the Azure portal, your devices need to be either [registered or joined](overview.md#getting-devices-in-azure-ad) to Azure AD. As an administrator, you can fine-tune the process of registering and joining devices by configuring the device settings.
6262

6363
![Configure device settings](./media/device-management-azure-portal/22.png)
6464

‎articles/active-directory/devices/index.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
### YamlMime:YamlDocument
22
documentType: LandingData
3-
title: Azure AD Device Management Documentation
3+
title: Azure AD Device Identity Management Documentation
44
metadata:
55
document_id:
6-
title: Azure Active Directory Device Management Documentation - Tutorials, concepts, references | Microsoft Docs
7-
description: Learn how to configure and test Azure Active device management.
6+
title: Azure Active Directory Device Identity Management Documentation - Tutorials, concepts, references | Microsoft Docs
7+
description: Learn how to configure and manage device identities in Azure AD.
88
services: active-directory
99
ms.subservice: devices
1010
author: MicrosoftGuyJFlo
@@ -16,7 +16,7 @@ metadata:
1616
ms.date: 08/14/2018
1717
ms.author: joflore
1818
abstract:
19-
description: "Through devices, your users are getting access to your corporate assets. To protect your corporate assets, as an IT administrator, you want to have control over these devices. This enables you to make sure that your users are accessing your resources from devices that meet your standards for security and compliance.<br>Device management is also the foundation for device-based conditional access. With device-based conditional access, you can ensure that access to resources in your environment is only possible with managed devices."
19+
description: "Through devices in Azure AD, your users are getting access to your corporate assets. To protect your corporate assets, as an IT administrator, you want to manage these device identities in Azure AD. This enables you to make sure that your users are accessing your resources from devices that meet your standards for security and compliance.<br>Device Identity management is also the foundation for device-based conditional access. With device-based conditional access, you can ensure that access to resources in your environment is only possible with managed devices."
2020
sections:
2121
- title: Step-by-step tutorials
2222
items:

‎articles/active-directory/devices/overview.md

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: What is device management in Azure Active Directory? | Microsoft Docs
3-
description: Learn how device management can help you to get control over the devices that are accessing resources in your environment.
2+
title: What is device identity management in Azure Active Directory? | Microsoft Docs
3+
description: Learn how device identity management can help you to manage devices that are accessing resources in your environment.
44
services: active-directory
55
documentationcenter: ''
66
author: MicrosoftGuyJFlo
@@ -17,28 +17,28 @@ ms.topic: overview
1717
ms.date: 03/01/2019
1818
ms.author: joflore
1919
ms.reviewer: jairoc
20-
#Customer intent: As an IT admin, I want to learn how to bring the devices that are accessing my resources under control, so that I can ensure that my users are accessing my resources from devices that meet my standards for security and compliance.
20+
#Customer intent: As an IT admin, I want to learn how to bring and manage device identities in Azure AD, so that I can ensure that my users are accessing my resources from devices that meet my standards for security and compliance.
2121

2222
ms.collection: M365-identity-device-management
2323
---
24-
# What is device management in Azure Active Directory?
24+
# What is device identity management in Azure Active Directory?
2525

2626
In a mobile-first, cloud-first world, Azure Active Directory (Azure AD) enables single sign-on to devices, apps, and services from anywhere. With the proliferation of devices - including Bring Your Own Device (BYOD), IT professionals are faced with two opposing goals:
2727

2828
- Empower the end users to be productive wherever and whenever
2929
- Protect the corporate assets at any time
3030

31-
Through devices, your users are getting access to your corporate assets. To protect your corporate assets, as an IT administrator, you want to have control over these devices. This enables you to make sure that your users are accessing your resources from devices that meet your standards for security and compliance.
31+
Through devices in Azure AD, your users are getting access to your corporate assets. To protect your corporate assets, as an IT administrator, you want to manage these devices identities. This enables you to make sure that your users are accessing your resources from devices that meet your standards for security and compliance.
3232

3333
Device management is also the foundation for [device-based conditional access](../conditional-access/require-managed-devices.md). With device-based conditional access, you can ensure that access to resources in your environment is only possible with managed devices.
3434

35-
This article explains how device management in Azure Active Directory works.
35+
This article explains how device identity management in Azure Active Directory works.
3636

3737
> [!VIDEO https://www.youtube.com/embed/NeezfKhomQU]
3838
39-
## Getting devices under the control of Azure AD
39+
## Getting devices in Azure AD
4040

41-
To get a device under the control of Azure AD, you have two options:
41+
To get a device in Azure AD, you have two options:
4242

4343
- Registering
4444
- Joining
@@ -63,7 +63,7 @@ Your organization’s users can add a work or school account to a personal devic
6363
- When accessing a work application for the first time
6464
- Manually via the **Settings** menu in the case of Windows 10
6565

66-
You can configure Azure AD registered devices for Windows 10, iOS, Android and macOS.
66+
You can configure an Azure AD registered device state for **Windows 10 personal, iOS, Android and macOS** devices.
6767

6868
## Azure AD joined devices
6969

@@ -90,7 +90,6 @@ Implementing Azure AD joined devices provides you with the following benefits:
9090
- **Access to Windows Store for Business** using an Azure AD account. Your users can choose from an inventory of applications pre-selected by the organization.
9191
- **Windows Hello** support for secure and convenient access to work resources.
9292
- **Restriction of access** to apps from only devices that meet compliance policy.
93-
9493
- **Seamless access to on-premises resources** when the device has line of sight to the on-premises domain controller.
9594

9695
While Azure AD join is primarily intended for organizations that do not have an on-premises Windows Server Active Directory infrastructure, you can certainly use it in scenarios where:
@@ -126,9 +125,9 @@ You can configure Hybrid Azure AD joined devices for Windows 10 and down-level d
126125

127126
## Summary
128127

129-
With device management in Azure AD, you can:
128+
With device identity management in Azure AD, you can:
130129

131-
- Simplify the process of bringing devices under the control of Azure AD
130+
- Simplify the process of bringing and managing devices in Azure AD
132131
- Provide your users with an easy to use access to your organization’s cloud-based resources
133132

134133
As a rule of a thumb, you should use:
@@ -153,9 +152,9 @@ As a rule of a thumb, you should use:
153152

154153
## Next steps
155154

156-
- To get an overview of how to manage device in the Azure portal, see [managing devices using the Azure portal](device-management-azure-portal.md)
157-
- To learn more about device-based conditional access, see [configure Azure Active Directory device-based conditional access policies](../conditional-access/require-managed-devices.md).
155+
- To get an overview of how to manage device identities in the Azure portal, see [managing devices identities using the Azure portal](device-management-azure-portal.md)
158156
- To setup:
159157
- Azure Active Directory registered Windows 10 devices, see [how to configure Azure Active Directory registered Windows 10 devices](../user-help/device-management-azuread-registered-devices-windows10-setup.md)
160-
- Azure Active Directory joined devices, see [how to configure Azure Active Directory joined devices](../user-help/device-management-azuread-joined-devices-setup.md)
161-
- Hybrid Azure AD joined devices, see [How to plan your hybrid Azure Active Directory join implementation](hybrid-azuread-join-plan.md).
158+
- Azure Active Directory joined devices, see [how to plan your Azure Active Directory join implementation](azureadjoin-plan.md)
159+
- Hybrid Azure AD joined devices, see [How to plan your hybrid Azure Active Directory join implementation](hybrid-azuread-join-plan.md).
160+
- To learn more about device-based conditional access, see [configure Azure Active Directory device-based conditional access policies](../conditional-access/require-managed-devices.md).

‎articles/active-directory/governance/access-reviews-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ To onboard access reviews, follow these steps.
108108

109109
1. Follow the instructions to onboard access reviews in the current directory.
110110

111-
## License requirements for using Azure AD access reviews
111+
## License requirements
112112

113113
[!INCLUDE [Azure AD Premium P2 license](../../../includes/active-directory-p2-license.md)]
114114

‎articles/active-directory/governance/entitlement-management-overview.md

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.tgt_pltfrm: na
1212
ms.devlang: na
1313
ms.topic: conceptual
1414
ms.subservice: compliance
15-
ms.date: 04/27/2019
15+
ms.date: 05/30/2019
1616
ms.author: rolyon
1717
ms.reviewer: mwahl
1818
ms.collection: M365-identity-device-management
@@ -68,22 +68,13 @@ Here are the types of resources you can manage access to with entitlement manage
6868

6969
- Azure AD security groups
7070
- Office 365 groups
71-
- Azure AD enterprise applications
72-
- SaaS applications
73-
- Custom-integrated applications
74-
- SharePoint Online site collections
75-
- SharePoint Online sites
71+
- Azure AD enterprise applications, including SaaS application and custom-integrated applications that support federation or provisioning
72+
- SharePoint Online site collections and sites
7673

77-
## Prerequisites
74+
You can also control access to other resources that rely upon Azure AD security groups or Office 365 groups. For example:
7875

79-
To use Azure AD entitlement management (Preview), you must have one of the following licenses:
80-
81-
- Azure AD Premium P2
82-
- Enterprise Mobility + Security (EMS) E5 license
83-
84-
For more information, see [Sign up for Azure Active Directory Premium editions](../fundamentals/active-directory-get-started-premium.md) or [Enterprise Mobility + Security E5 Trial](https://aka.ms/emse5trial).
85-
86-
Specialized clouds, such as Azure Government, Azure Germany, and Azure China 21Vianet, are not currently available for use in this preview.
76+
- You can give users licenses for Microsoft Office 365 by using an Azure AD security group in an access package and configuring [group-based licensing](../users-groups-roles/licensing-groups-assign.md) for that group
77+
- You can give users access to manage Azure resources by using an Azure AD security group in an access package and creating an [Azure role assignment](../../role-based-access-control/role-assignments-portal.md) for that group
8778

8879
## What are access packages and policies?
8980

@@ -172,6 +163,12 @@ The following table lists the permissions for each of these roles.
172163
| [Add catalog owners or access package managers](entitlement-management-catalog-create.md#add-catalog-owners-or-access-package-managers) | :heavy_check_mark: | | :heavy_check_mark: | | |
173164
| [Edit/delete a catalog](entitlement-management-catalog-create.md#edit-a-catalog) | :heavy_check_mark: | | :heavy_check_mark: | | |
174165

166+
## License requirements
167+
168+
[!INCLUDE [Azure AD Premium P2 license](../../../includes/active-directory-p2-license.md)]
169+
170+
Specialized clouds, such as Azure Government, Azure Germany, and Azure China 21Vianet, are not currently available for use in this preview.
171+
175172
## Next steps
176173

177174
- [Tutorial: Create your first access package](entitlement-management-access-package-first.md)

‎articles/active-directory/governance/entitlement-management-process.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.tgt_pltfrm: na
1212
ms.devlang: na
1313
ms.topic: conceptual
1414
ms.subservice: compliance
15-
ms.date: 04/26/2019
15+
ms.date: 05/30/2019
1616
ms.author: rolyon
1717
ms.reviewer: mamkumar
1818
ms.collection: M365-identity-device-management
@@ -42,7 +42,7 @@ A user that needs access to an access package can submit an access request. Depe
4242
| --- | --- |
4343
| Submitted | User submits a request. |
4444
| Pending approval | If the policy for an access package requires approval, a request moves to pending approval. |
45-
| Expired | If no approvers review a request within the approval request timeout, the request expires. To try again, the user will have to resubmit their request. |
45+
| Expired | If no approvers approve a request within the approval request timeout, the request expires. To try again, the user will have to resubmit their request. |
4646
| Denied | Approver denies a request. |
4747
| Approved | Approver approves a request. |
4848
| Delivering | User has **not** been assigned access to all the resources in the access package. If this is an external user, the user has not yet accessed the resource directory and accepted the permissions prompt. |
@@ -69,15 +69,15 @@ The following table provides more detail about each of these email notifications
6969
| 7 | Your access to *[access package]* expires in X day(s) | X days before the requestor's access to the access package expires | Requestor |
7070
| 8 | Your access to *[access package]* has expired | When the requestor's access to an access package expires | Requestor |
7171

72-
### Review access request emails
72+
### Access request emails
7373

7474
When a requestor submits an access request for an access package that is configured to require approval, all approvers configured in the policy receive an email notification with details of the request. Details include the requestor's name, organization, access start and end date if provided, business justification, when the request was submitted, and when the request will expire. The email includes a link where approvers can approve or deny the access request. Here is a sample email notification that is sent to an approver when a requestor submits an access request.
7575

7676
![Review access request email](./media/entitlement-management-shared/email-approve-request.png)
7777

7878
### Approved or denied emails
7979

80-
Requestors are notified when their access request is approved and available for access, or when their access request is denied. When an approver reviews an access request submitted by a requestor, they can approve or deny the access request. The approver needs to add a business justification for their decision.
80+
Requestors are notified when their access request is approved and available for access, or when their access request is denied. When an approver receives an access request submitted by a requestor, they can approve or deny the access request. The approver needs to add a business justification for their decision.
8181

8282
When an access request is approved, entitlement management starts the process of granting the requestor access to each of the resources in the access package. After the requestor has been granted access to every resource in the access package, an email notification is sent to the requestor that their access request was approved and that they now have access to the access package. Here is a sample email notification that is sent to a requestor when they are granted access to an access package.
8383

‎articles/active-directory/governance/entitlement-management-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ There are several ways that you can configure entitlement management for your or
4848
> | **2.** [Add resource roles to access package](entitlement-management-access-package-edit.md#add-resource-roles)<ul><li>Groups</li><li>Applications</li><li>SharePoint sites</li></ul> | ![Add resource roles](./media/entitlement-management-scenarios/resource-roles.png) |
4949
> | **3.** [Add a policy](entitlement-management-access-package-edit.md#policy-for-users-in-your-directory)<ul><li>For users in your directory</li><li>Require approval</li><li>Expiration settings</li></ul> | ![Add policy](./media/entitlement-management-scenarios/policy.png) |
5050
51-
### I want to allow users from my business partners (including users not yet in my directory) to request access to groups, applications, or SharePoint sites
51+
### I want to allow users from my business partners directory (including users not yet in my directory) to request access to groups, applications, or SharePoint sites
5252

5353
> [!div class="mx-tableFixed"]
5454
> | Steps | Example |

0 commit comments

Comments
 (0)