Skip to content

Commit 5d8a259

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 43ef3d4 + 6c6b8ba commit 5d8a259

File tree

259 files changed

+2480
-1053
lines changed

Some content is hidden

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

259 files changed

+2480
-1053
lines changed

articles/active-directory/app-provisioning/index.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ metadata:
1010
ms.subservice: app-provisioning
1111
ms.workload: identity
1212
ms.topic: landing-page
13-
ms.date: 02/06/2020
14-
author: msmimart
15-
ms.author: mimart
16-
manager: celested
13+
ms.date: 08/12/2021
14+
author: kenwith
15+
ms.author: kenwith
16+
manager: mtillman
1717

1818
landingContent:
1919
- title: Provision users and groups to a cloud app

articles/active-directory/app-proxy/application-proxy-configure-custom-domain.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-proxy
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 10/24/2019
11+
ms.date: 08/12/2021
1212
ms.author: kenwith
1313
ms.reviewer: japere
1414
---
@@ -35,12 +35,14 @@ If you're not able to make the internal and external URLs match, it's not as imp
3535

3636
There are several options for setting up your DNS configuration, depending on your requirements:
3737

38+
3839
### Same internal and external URL, different internal and external behavior
3940

4041
If you don't want your internal users to be directed through the Application Proxy, you can set up a *split-brain DNS*. A split DNS infrastructure directs internal hosts to an internal domain name server, and external hosts to an external domain name server, for name resolution.
4142

4243
![Split-brain DNS](./media/application-proxy-configure-custom-domain/split-brain-dns.png)
4344

45+
4446
### Different internal and external URLs
4547

4648
If the internal and external URLs are different, you don't need to configure split-brain behavior, because user routing is determined by the URL. In this case, you change only the external DNS, and route the external URL to the Application Proxy endpoint.

articles/active-directory/authentication/concepts-azure-multi-factor-authentication-prompts-session-lifetime.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: multi-factor-authentication
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 08/31/2020
9+
ms.date: 08/12/2021
1010

1111
ms.author: justinha
1212
author: justinha
@@ -30,8 +30,8 @@ To give your users the right balance of security and ease of use by asking them
3030

3131
* If you have Azure AD Premium:
3232
* Enable single sign-on (SSO) across applications using [managed devices](../devices/overview.md) or [Seamless SSO](../hybrid/how-to-connect-sso.md).
33-
* If reauthentication is required, use a Conditional Access [sign-in Frequency policy](../conditional-access/howto-conditional-access-session-lifetime.md).
34-
* For users that sign in from non-managed devices or mobile device scenarios, use Conditional Access to enable persistent browser sessions and sign-in frequency policies.
33+
* If reauthentication is required, use a Conditional Access [sign-in frequency policy](../conditional-access/howto-conditional-access-session-lifetime.md).
34+
* For users that sign in from non-managed devices or mobile device scenarios, persistent browser sessions may not be preferable, or you might use Conditional Access to enable persistent browser sessions with sign-in frequency policies. Limit the duration to an appropriate time based on the sign-in risk, where a user with less risk has a longer session duration.
3535
* If you have Microsoft 365 apps licenses or the free Azure AD tier:
3636
* Enable single sign-on (SSO) across applications using [managed devices](../devices/overview.md) or [Seamless SSO](../hybrid/how-to-connect-sso.md).
3737
* Keep the *Remain signed-in* option enabled and guide your users to accept it.

articles/active-directory/develop/v2-permissions-and-consent.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ In OAuth 2.0, these types of permission sets are called *scopes*. They're also o
4343

4444
An app most commonly requests these permissions by specifying the scopes in requests to the Microsoft identity platform authorize endpoint. However, some high-privilege permissions can be granted only through administrator consent. They can be requested or granted by using the [administrator consent endpoint](#admin-restricted-permissions). Keep reading to learn more.
4545

46+
In requests to the authorization, token or consent endpoints for the Microsoft Identity platform, if the resource identifier is omitted in the scope parameter, the resource is assumed to be Microsoft Graph. For example, `scope=User.Read` is equivalent to `https://graph.microsoft.com/User.Read`.
47+
4648
## Permission types
4749

4850
The Microsoft identity platform supports two types of permissions: *delegated permissions* and *application permissions*.

articles/active-directory/roles/TOC.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,16 @@
4040
items:
4141
- name: List role assignments
4242
href: view-assignments.md
43-
- name: List role assignments for groups
43+
- name: List role assignments for a user
44+
href: list-role-assignments-users.md
45+
- name: List role assignments for a group
4446
href: groups-view-assignments.md
4547
- name: Assign roles
4648
items:
4749
- name: Assign roles to users
4850
href: manage-roles-portal.md
51+
- name: Assign roles to a user at different scopes
52+
href: assign-roles-different-scopes.md
4953
- name: Create a role-assignable group
5054
href: groups-create-eligible.md
5155
- name: Assign roles to groups

0 commit comments

Comments
 (0)