Skip to content

Commit ee40f3e

Browse files
committed
fix
2 parents e9be9cf + f925af7 commit ee40f3e

File tree

103 files changed

+2224
-2061
lines changed

Some content is hidden

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

103 files changed

+2224
-2061
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48810,6 +48810,21 @@
4881048810
"source_path": "articles/terraform/terraform-vm-managed-identities-for-azure-resources.md",
4881148811
"redirect_url": "/azure/terraform/terraform-create-complete-vm",
4881248812
"redirect_document_id": false
48813+
},
48814+
{
48815+
"source_path": "articles/cognitive-services/Speech-Service/speech-devices-sdk-android-quickstart.md",
48816+
"redirect_url": "/azure/cognitive-services/speech-service/speech-devices-sdk-quickstart?pivots=platform-android",
48817+
"redirect_document_id": false
48818+
},
48819+
{
48820+
"source_path": "articles/cognitive-services/Speech-Service/speech-devices-sdk-linux-quickstart.md",
48821+
"redirect_url": "/azure/cognitive-services/speech-service/speech-devices-sdk-quickstart?pivots=platform-linux",
48822+
"redirect_document_id": false
48823+
},
48824+
{
48825+
"source_path": "articles/cognitive-services/Speech-Service/speech-devices-sdk-windows-quickstart.md",
48826+
"redirect_url": "/azure/cognitive-services/speech-service/speech-devices-sdk-quickstart?pivots=platform-windows",
48827+
"redirect_document_id": false
4881348828
}
4881448829
]
4881548830
}

articles/active-directory/conditional-access/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- name: Tutorials
1414
items:
1515
- name: Require Azure Multi-Factor Authentication
16-
href: /authentication/tutorial-enable-azure-mfa.md?toc=/azure/conditional-access/toc.json&bc=/azure/conditional-access/breadcrumb/toc.json
16+
href: ../authentication/tutorial-enable-azure-mfa.md?toc=/azure/active-directory/conditional-access/toc.json&bc=/azure/active-directory/conditional-access/breadcrumb/toc.json
1717
- name: Concepts
1818
expanded: false
1919
items:

articles/active-directory/conditional-access/concept-conditional-access-grant.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 02/11/2020
9+
ms.date: 02/21/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -52,13 +52,17 @@ Selecting this checkbox will require users to perform Azure Multi-Factor Authent
5252

5353
Organizations who have deployed Microsoft Intune can use the information returned from their devices to identify devices that meet specific compliance requirements. This policy compliance information is forwarded from Intune to Azure AD where Conditional Access can make decisions to grant or block access to resources. For more information about compliance policies, see the article [Set rules on devices to allow access to resources in your organization using Intune](https://docs.microsoft.com/intune/protect/device-compliance-get-started).
5454

55+
A device can be marked as compliant by Intune (for any device OS) or by third-party MDM system for Windows 10 devices. Third-party MDM systems for device OS types other than Windows 10 are not supported.
56+
57+
Devices must be registered in Azure AD before they can be marked as compliant. More information about device registration can be found in the article, [What is a device identity](../devices/overview.md).
58+
5559
### Require hybrid Azure AD joined device
5660

5761
Organizations can choose to use the device identity as part of their Conditional Access policy. Organizations can require that devices are hybrid Azure AD joined using this checkbox. For more information about device identities, see the article [What is a device identity?](../devices/overview.md).
5862

5963
### Require approved client app
6064

61-
Organizations can require that an access attempt to the selected cloud apps needs to be made from an approved client app.
65+
Organizations can require that an access attempt to the selected cloud apps needs to be made from an approved client app. These approved client aps support [Intune app protection policies](/intune/app-protection-policy) independent of any mobile-device management (MDM) solution.
6266

6367
This setting applies to the following client apps:
6468

@@ -99,9 +103,7 @@ This setting applies to the following client apps:
99103

100104
### Require app protection policy
101105

102-
In your Conditional Access policy, you can require an app protection policy be present on the client app before access is available to the selected cloud apps.
103-
104-
![Control access with app protection policy](./media/technical-reference/22.png)
106+
In your Conditional Access policy, you can require an [Intune app protection policy](/intune/app-protection-policy) be present on the client app before access is available to the selected cloud apps.
105107

106108
This setting applies to the following client apps:
107109

@@ -116,6 +118,10 @@ This setting applies to the following client apps:
116118
- The **Require app protection policy** requirements:
117119
- Only supports the iOS and Android for device platform condition.
118120

121+
### Terms of use
122+
123+
If your organization has created terms of use, additional options may be visible under grant controls. These options allow administrators to require acknowledgment of terms of use as a condition of accessing the resources protected by the policy. More information about terms of use can be found in the article, [Azure Active Directory terms of use](terms-of-use.md).
124+
119125
## Next steps
120126

121127
- [Conditional Access: Session controls](concept-conditional-access-session.md)

articles/active-directory/fundamentals/active-directory-licensing-whatis-azure-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You must have one of the following licenses to use group-based licensing:
3030

3131
- Paid or trial subscription for Azure AD Premium P1 and above
3232

33-
- Paid or trial edition of Office 365 Enterprise E3 or Office 365 A3 or Office 365 GCC G3 and above
33+
- Paid or trial edition of Office 365 Enterprise E3 or Office 365 A3 or Office 365 GCC G3 or Office 365 E3 for GCCH or Office 365 E3 for DOD and above
3434

3535
### Required number of licenses
3636
For any groups assigned a license, you must also have a license for each unique member. While you don't have to assign each member of the group a license, you must have at least enough licenses to include all of the members. For example, if you have 1,000 unique members who are part of licensed groups in your tenant, you must have at least 1,000 licenses to meet the licensing agreement.

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Application Administrators can manage application credentials that allows them t
5555

5656
If an application is assigned to any other role that are not mentioned above, then Application Administrator cannot manage credentials of that application.
5757

58-
This role also grants the ability to _consent_ to delegated permissions and application permissions, with the exception of permissions on the Microsoft Graph and Azure AD Graph.
58+
This role also grants the ability to _consent_ to delegated permissions and application permissions, with the exception of permissions on the Microsoft Graph API.
5959

6060
> [!IMPORTANT]
6161
> This exception means that you can still consent to permissions for _other_ apps (e.g. third party apps or apps that you have registered), but not to permissions on Azure AD itself. You can still _request_ these permissions as part of the app registration, but _granting_ (i.e. consenting to) these permissions requires an Azure AD admin. This means that a malicious user cannot easily elevate their permissions, for example by creating and consenting to an app that can write to the entire directory and through that app's permissions elevate themselves to become a global admin.
@@ -121,7 +121,7 @@ Makes purchases, manages subscriptions, manages support tickets, and monitors se
121121

122122
### [Cloud Application Administrator](#cloud-application-administrator-permissions)
123123

124-
Users in this role have the same permissions as the Application Administrator role, excluding the ability to manage application proxy. This role grants the ability to create and manage all aspects of enterprise applications and application registrations. This role also grants the ability to consent to delegated permissions, and application permissions excluding Microsoft Graph and Azure AD Graph. Users assigned to this role are not added as owners when creating new application registrations or enterprise applications.
124+
Users in this role have the same permissions as the Application Administrator role, excluding the ability to manage application proxy. This role grants the ability to create and manage all aspects of enterprise applications and application registrations. This role also grants the ability to consent to delegated permissions, and application permissions excluding the Microsoft Graph API. Users assigned to this role are not added as owners when creating new application registrations or enterprise applications.
125125

126126
Cloud Application Administrators can manage application credentials that allows them to impersonate the application. So, users assigned to this role can manage application credentials of only those applications that are either not assigned to any Azure AD roles or those assigned to following admin roles only:
127127
* Application Developer
@@ -197,14 +197,14 @@ This is a legacy role that is to be assigned to applications that do not support
197197
Users with this role have global permissions within Microsoft Dynamics 365 Online, when the service is present, as well as the ability to manage support tickets and monitor service health. More information at [Use the service admin role to manage your tenant](https://docs.microsoft.com/dynamics365/customer-engagement/admin/use-service-admin-role-manage-tenant).
198198

199199
> [!NOTE]
200-
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "Dynamics 365 Service Administrator." It is "Dynamics 365 Administrator" in the [Azure portal](https://portal.azure.com).
200+
> In the Microsoft Graph API and Azure AD PowerShell, this role is identified as "Dynamics 365 Service Administrator." It is "Dynamics 365 Administrator" in the [Azure portal](https://portal.azure.com).
201201
202202
### [Exchange Administrator](#exchange-service-administrator-permissions)
203203

204204
Users with this role have global permissions within Microsoft Exchange Online, when the service is present. Also has the ability to create and manage all Office 365 Groups, manage support tickets, and monitor service health. More information at [About Office 365 admin roles](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d).
205205

206206
> [!NOTE]
207-
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "Exchange Service Administrator." It is "Exchange Administrator" in the [Azure portal](https://portal.azure.com). It is "Exchange Online administrator" in the [Exchange admin center](https://go.microsoft.com/fwlink/p/?LinkID=529144).
207+
> In the Microsoft Graph API and Azure AD PowerShell, this role is identified as "Exchange Service Administrator." It is "Exchange Administrator" in the [Azure portal](https://portal.azure.com). It is "Exchange Online administrator" in the [Exchange admin center](https://go.microsoft.com/fwlink/p/?LinkID=529144).
208208
209209
### [External Identity Provider Administrator](#external-identity-provider-administrator-permissions)
210210

@@ -218,7 +218,7 @@ This administrator manages federation between Azure Active Directory tenants and
218218
Users with this role have access to all administrative features in Azure Active Directory, as well as services that use Azure Active Directory identities like Microsoft 365 security center, Microsoft 365 compliance center, Exchange Online, SharePoint Online, and Skype for Business Online. The person who signs up for the Azure Active Directory tenant becomes a global administrator. There can be more than one global administrator at your company. Global admins can reset the password for any user and all other administrators.
219219

220220
> [!NOTE]
221-
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "Company Administrator". It is "Global Administrator" in the [Azure portal](https://portal.azure.com).
221+
> In the Microsoft Graph API and Azure AD PowerShell, this role is identified as "Company Administrator". It is "Global Administrator" in the [Azure portal](https://portal.azure.com).
222222
>
223223
>
224224
@@ -271,7 +271,7 @@ Users with this role can change passwords, invalidate refresh tokens, manage ser
271271
272272
Delegating administrative permissions over subsets of users and applying policies to a subset of users is possible with [Administrative Units (now in public preview)](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-administrative-units).
273273

274-
This role was previously called "Password Administrator" in the [Azure portal](https://portal.azure.com/). The "Helpdesk Administrator" name in Azure AD now matches its name in Azure AD PowerShell, Azure AD Graph API and Microsoft Graph API.
274+
This role was previously called "Password Administrator" in the [Azure portal](https://portal.azure.com/). The "Helpdesk Administrator" name in Azure AD now matches its name in Azure AD PowerShell and the Microsoft Graph API.
275275

276276
### [Intune Administrator](#intune-service-administrator-permissions)
277277

@@ -280,7 +280,7 @@ Users with this role have global permissions within Microsoft Intune Online, whe
280280
This role can create and manage all security groups. However, Intune Admin does not have admin rights over Office groups. That means the admin cannot update owners or memberships of all Office groups in the tenant. However, he/she can manage the Office group that he creates which comes as a part of his/her end user privileges. So, any Office group (not security group) that he/she creates should be counted against his/her quota of 250.
281281

282282
> [!NOTE]
283-
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "Intune Service Administrator ". It is "Intune Administrator" in the [Azure portal](https://portal.azure.com).
283+
> In the Microsoft Graph API and Azure AD PowerShell, this role is identified as "Intune Service Administrator ". It is "Intune Administrator" in the [Azure portal](https://portal.azure.com).
284284
285285
### [Kaizala Administrator](#kaizala-administrator-permissions)
286286

@@ -323,7 +323,7 @@ Users with this role have limited ability to manage passwords. This role does no
323323
Users with this role have global permissions within Microsoft Power BI, when the service is present, as well as the ability to manage support tickets and monitor service health. More information at [Understanding the Power BI admin role](https://docs.microsoft.com/power-bi/service-admin-role).
324324

325325
> [!NOTE]
326-
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "Power BI Service Administrator ". It is "Power BI Administrator" in the [Azure portal](https://portal.azure.com).
326+
> In the Microsoft Graph API and Azure AD PowerShell, this role is identified as "Power BI Service Administrator ". It is "Power BI Administrator" in the [Azure portal](https://portal.azure.com).
327327
328328
### [Power Platform Administrator](#power-platform-administrator-permissions)
329329

@@ -405,21 +405,21 @@ Windows Defender ATP and EDR | View and investigate alerts. When you turn on rol
405405
Users with this role can open support requests with Microsoft for Azure and Office 365 services, and views the service dashboard and message center in the [Azure portal](https://portal.azure.com) and [Microsoft 365 admin center](https://admin.microsoft.com). More information at [About admin roles](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d).
406406

407407
> [!NOTE]
408-
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "Service Support Administrator." It is "Service Administrator" in the [Azure portal](https://portal.azure.com), the [Microsoft 365 admin center](https://admin.microsoft.com), and the Intune portal.
408+
> In the Microsoft Graph API and Azure AD PowerShell, this role is identified as "Service Support Administrator." It is "Service Administrator" in the [Azure portal](https://portal.azure.com), the [Microsoft 365 admin center](https://admin.microsoft.com), and the Intune portal.
409409
410410
### [SharePoint Administrator](#sharepoint-service-administrator-permissions)
411411

412412
Users with this role have global permissions within Microsoft SharePoint Online, when the service is present, as well as the ability to create and manage all Office 365 Groups, manage support tickets, and monitor service health. More information at [About admin roles](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d).
413413

414414
> [!NOTE]
415-
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "SharePoint Service Administrator." It is "SharePoint Administrator" in the [Azure portal](https://portal.azure.com).
415+
> In the Microsoft Graph API and Azure AD PowerShell, this role is identified as "SharePoint Service Administrator." It is "SharePoint Administrator" in the [Azure portal](https://portal.azure.com).
416416
417417
### [Skype for Business / Lync Administrator](#lync-service-administrator-permissions)
418418

419419
Users with this role have global permissions within Microsoft Skype for Business, when the service is present, as well as manage Skype-specific user attributes in Azure Active Directory. Additionally, this role grants the ability to manage support tickets and monitor service health, and to access the Teams and Skype for Business Admin Center. The account must also be licensed for Teams or it can't run Teams PowerShell cmdlets. More information at [About the Skype for Business admin role](https://support.office.com/article/about-the-skype-for-business-admin-role-aeb35bda-93fc-49b1-ac2c-c74fbeb737b5) and Teams licensing information at [Skype for Business and Microsoft Teams add-on licensing](https://docs.microsoft.com/skypeforbusiness/skype-for-business-and-microsoft-teams-add-on-licensing/skype-for-business-and-microsoft-teams-add-on-licensing)
420420

421421
> [!NOTE]
422-
> In Microsoft Graph API, Azure AD Graph API, and Azure AD PowerShell, this role is identified as "Lync Service Administrator." It is "Skype for Business Administrator" in the [Azure portal](https://portal.azure.com/).
422+
> In the Microsoft Graph API and Azure AD PowerShell, this role is identified as "Lync Service Administrator." It is "Skype for Business Administrator" in the [Azure portal](https://portal.azure.com/).
423423
424424
### [Teams Communications Administrator](#teams-communications-administrator-permissions)
425425

@@ -1681,7 +1681,7 @@ Can manage all aspects of users and groups, including resetting passwords for li
16811681

16821682
## Role template IDs
16831683

1684-
Role template IDs are used mainly by Graph API or PowerShell users.
1684+
Role template IDs are used mainly by the Microsoft Graph API or PowerShell users.
16851685

16861686
Graph displayName | Azure portal display name | directoryRoleTemplateId
16871687
----------------- | ------------------------- | -------------------------

articles/active-directory/users-groups-roles/domains-manage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ An error is returned when:
9999

100100
If you find that any of the conditions haven’t been met, manually clean up the references and try to delete the domain again.
101101

102-
## Use PowerShell or Graph API to manage domain names
102+
## Use PowerShell or the Microsoft Graph API to manage domain names
103103

104-
Most management tasks for domain names in Azure Active Directory can also be completed using Microsoft PowerShell, or programmatically using Azure AD Graph API.
104+
Most management tasks for domain names in Azure Active Directory can also be completed using Microsoft PowerShell, or programmatically using the Microsoft Graph API.
105105

106106
* [Using PowerShell to manage domain names in Azure AD](https://docs.microsoft.com/powershell/module/azuread/?view=azureadps-2.0#domains)
107-
* [Using Graph API to manage domain names in Azure AD](https://msdn.microsoft.com/Library/Azure/Ad/Graph/api/domains-operations)
107+
* [Domain resource type](https://docs.microsoft.com/graph/api/resources/domain?view=graph-rest-1.0)
108108

109109
## Next steps
110110

0 commit comments

Comments
 (0)