Skip to content

Commit 725d8be

Browse files
committed
Merge branch 'main' into eur/caption-quickstart
2 parents c5eb317 + 817c784 commit 725d8be

File tree

319 files changed

+3754
-1763
lines changed

Some content is hidden

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

319 files changed

+3754
-1763
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/active-directory/manage-apps/my-apps-deployment-plan.md",
5+
"redirect_url": "/azure/active-directory/manage-apps/myapps-overview",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/active-directory/authentication/cloud-native-certificate-based-authentication-faq.yml",
510
"redirect_url": "/azure/active-directory/authentication/certificate-based-authentication-faq",

articles/active-directory-b2c/configure-authentication-sample-angular-spa-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export const b2cPolicies = {
145145
export const msalConfig: Configuration = {
146146
auth: {
147147
clientId: '<your-MyApp-application-ID>',
148-
authority: b2cPolicies.authorities.signUpSignIn,
148+
authority: b2cPolicies.authorities.signUpSignIn.authority,
149149
knownAuthorities: [b2cPolicies.authorityDomain],
150150
redirectUri: '/',
151151
},

articles/active-directory/authentication/how-to-mfa-registration-campaign.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 03/22/2022
9+
ms.date: 05/05/2022
1010

1111
ms.author: justinha
1212
author: mjsantani
@@ -63,7 +63,7 @@ In addition to choosing who can be nudged, you can define how many days a user c
6363

6464
![Installation complete](./media/how-to-nudge-authenticator-app/finish.png)
6565

66-
1. If a user wishes to not install the Authenticator app, they can tap **Not now** to snooze the prompt for a number of days, which can be defined by an admin.
66+
1. If a user wishes to not install Microsoft Authenticator, they can tap **Not now** to snooze the prompt for up to 14 days, which can be set by an admin.
6767

6868
![Snooze installation](./media/how-to-nudge-authenticator-app/snooze.png)
6969

articles/active-directory/authentication/howto-authentication-use-email-signin.md

Lines changed: 80 additions & 44 deletions
Large diffs are not rendered by default.

articles/active-directory/authentication/howto-sspr-deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 02/02/2022
9+
ms.date: 05/05/2022
1010

1111
ms.author: justinha
1212
author: gargi-sinha
@@ -257,7 +257,7 @@ To enable your support team's success, you can create a FAQ based on questions y
257257
| User isn't receiving a text or call on their office or cell phone| A user is trying to verify their identity via text or call but isn't receiving a text/call. |
258258
| User can't access the password reset portal| A user wants to reset their password but isn't enabled for password reset and can't access the page to update passwords. |
259259
| User can't set a new password| A user completes verification during the password reset flow but can't set a new password. |
260-
| User doesn't see a Reset Password link on a Windows 10 device| A user is trying to reset password from the Windows 10 lock screen, but the device is either not joined to Azure AD, or the Intune device policy isn't enabled |
260+
| User doesn't see a Reset Password link on a Windows 10 device| A user is trying to reset password from the Windows 10 lock screen, but the device is either not joined to Azure AD, or the Microsoft Endpoint Manager device policy isn't enabled |
261261

262262
### Plan rollback
263263

articles/active-directory/authentication/howto-sspr-windows.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ To configure a Windows 10 device for SSPR at the sign-in screen, review the foll
7171
- Azure AD joined
7272
- Hybrid Azure AD joined
7373

74-
### Enable for Windows 10 using Intune
74+
### Enable for Windows 10 using Microsoft Endpoint Manager
7575

76-
Deploying the configuration change to enable SSPR from the login screen using Intune is the most flexible method. Intune allows you to deploy the configuration change to a specific group of machines you define. This method requires Intune enrollment of the device.
76+
Deploying the configuration change to enable SSPR from the login screen using Microsoft Endpoint Manager is the most flexible method. Microsoft Endpoint Manager allows you to deploy the configuration change to a specific group of machines you define. This method requires Microsoft Endpoint Manager enrollment of the device.
7777

78-
#### Create a device configuration policy in Intune
78+
#### Create a device configuration policy in Microsoft Endpoint Manager
7979

80-
1. Sign in to the [Azure portal](https://portal.azure.com) and select **Intune**.
80+
1. Sign in to the [Azure portal](https://portal.azure.com) and select **Endpoint Manager**.
8181
1. Create a new device configuration profile by going to **Device configuration** > **Profiles**, then select **+ Create Profile**
8282
- For **Platform** choose *Windows 10 and later*
8383
- For **Profile type**, choose *Custom*
@@ -94,7 +94,7 @@ Deploying the configuration change to enable SSPR from the login screen using In
9494
Select **Add**, then **Next**.
9595
1. The policy can be assigned to specific users, devices, or groups. Assign the profile as desired for your environment, ideally to a test group of devices first, then select **Next**.
9696

97-
For more information, see [Assign user and device profiles in Microsoft Intune](/mem/intune/configuration/device-profile-assign).
97+
For more information, see [Assign user and device profiles in Microsoft Microsoft Endpoint Manager](/mem/intune/configuration/device-profile-assign).
9898

9999
1. Configure applicability rules as desired for your environment, such as to *Assign profile if OS edition is Windows 10 Enterprise*, then select **Next**.
100100
1. Review your profile, then select **Create**.
332 KB
Loading
Loading
Loading

articles/active-directory/external-identities/external-collaboration-settings-configure.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: B2B
88
ms.topic: how-to
9-
ms.date: 04/26/2022
9+
ms.date: 05/05/2022
1010

1111
ms.author: mimart
1212
author: msmimart
1313
manager: celestedg
14-
ms.reviewer: mal
1514

1615
ms.collection: M365-identity-device-management
1716
---
@@ -32,7 +31,7 @@ For B2B collaboration with other Azure AD organizations, you should also review
3231

3332
## Configure settings in the portal
3433

35-
1. Sign in to the [Azure portal](https://portal.azure.com) using a Global administrator or Security administrator account and open the **Azure Active Directory** service.
34+
1. Sign in to the [Azure portal](https://portal.azure.com) using a Global administrator account and open the **Azure Active Directory** service.
3635
1. Select **External Identities** > **External collaboration settings**.
3736

3837
1. Under **Guest user access**, choose the level of access you want guest users to have:
@@ -41,7 +40,7 @@ For B2B collaboration with other Azure AD organizations, you should also review
4140

4241
- **Guest users have the same access as members (most inclusive)**: This option gives guests the same access to Azure AD resources and directory data as member users.
4342

44-
- **Guest users have limited access to properties and memberships of directory objects**: (Default) This setting blocks guests from certain directory tasks, like enumerating users, groups, or other directory resources. Guests can see membership of all non-hidden groups.
43+
- **Guest users have limited access to properties and memberships of directory objects**: (Default) This setting blocks guests from certain directory tasks, like enumerating users, groups, or other directory resources. Guests can see membership of all non-hidden groups. [Learn more about default guest permissions](../fundamentals/users-default-permissions.md#member-and-guest-users).
4544

4645
- **Guest user access is restricted to properties and memberships of their own directory objects (most restrictive)**: With this setting, guests can access only their own profiles. Guests are not allowed to see other users' profiles, groups, or group memberships.
4746

0 commit comments

Comments
 (0)