Skip to content

Commit e10b143

Browse files
committed
corrected conflicts
1 parent 7da40a2 commit e10b143

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Do not use. This role is automatically assigned to the Azure AD Connect service,
190190

191191
### [Directory Writers](#directory-writers-permissions)
192192

193-
This is a legacy role that is to be assigned to applications that do not support the [Consent Framework](../develop/quickstart-v1-integrate-apps-with-azure-ad.md). It should not be assigned to any users.
193+
This is a legacy role that is to be assigned to applications that do not support the [Consent Framework](../develop/quickstart-register-app.md). It should not be assigned to any users.
194194

195195
### [Dynamics 365 administrator / CRM Administrator](#crm-service-administrator-permissions)
196196

@@ -215,7 +215,7 @@ This administrator manages federation between Azure Active Directory tenants and
215215

216216
### [Global Administrator / Company Administrator](#company-administrator-permissions)
217217

218-
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. Only global administrators can assign other administrator roles. There can be more than one global administrator at your company. Global admins can reset the password for any user and all other administrators.
218+
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]
221221
> 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).

articles/active-directory/users-groups-roles/licensing-directory-independence.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ You can configure each Azure AD tenant independently to get data synchronized fr
4141
To add an Azure AD tenant in the Azure portal, sign in to [the Azure portal](https://portal.azure.com) with an account that is an Azure AD global administrator, and, on the left, select **New**.
4242

4343
> [!NOTE]
44-
> Unlike other Azure resources, your tenants are not child resources of an Azure subscription. If your Azure subscription is canceled or expired, you can still access your tenant data using Azure PowerShell or the Microsoft 365 admin center. You can also [associate another subscription with the tenant](../fundamentals/active-directory-how-subscriptions-associated-directory.md).
44+
> Unlike other Azure resources, your tenants are not child resources of an Azure subscription. If your Azure subscription is canceled or expired, you can still access your tenant data using Azure PowerShell, the Microsoft Graph API, or the Microsoft 365 admin center. You can also [associate another subscription with the tenant](../fundamentals/active-directory-how-subscriptions-associated-directory.md).
4545
>
4646
4747
## Next steps

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ Content-type: application/json
3636
Body
3737

3838
``` HTTP
39-
{
40-
"principalId":"a98eb769-7bd4-4489-86f6-ad96e1d58b62",
41-
"roleDefinitionId":"b0f54661-2d74-4c50-afa3-1ec803f12efe",
42-
"resourceScope":"/"
39+
{
40+
"principalId":"ab2e1023-bddc-4038-9ac1-ad4843e7e539",
41+
"roleDefinitionId":"194ae4cb-b126-40b2-bd5b-6091b380977d",
42+
"resourceScopes":["/"]
4343
}
4444
```
4545

@@ -179,7 +179,7 @@ Response
179179
``` HTTP
180180
HTTP/1.1 200 OK
181181
{
182-
"id":"lAPpYvVpN0KRkAEhdxReEJC2sEqbR_9Hr48lds9SGHI-1"
182+
"id":"mhxJMipY4UanIzy2yE-r7JIiSDKQoTVJrLE9etXyrY0-1",
183183
"principalId":"ab2e1023-bddc-4038-9ac1-ad4843e7e539",
184184
"roleDefinitionId":"10dae51f-b6af-4016-8d66-8c2a99b929b3",
185185
"resourceScopes":["/"]

0 commit comments

Comments
 (0)