Skip to content

Commit 01955be

Browse files
Merge branch 'MicrosoftDocs:main' into patch-3
2 parents e1baa1c + e160348 commit 01955be

File tree

74 files changed

+628
-100
lines changed

Some content is hidden

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

74 files changed

+628
-100
lines changed

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/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**.
46.1 KB
Loading
44.9 KB
Loading
69.5 KB
Loading

articles/attestation/policy-version-1-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This article introduces the workings of the attestation service and the policy e
1919

2020
The minimum version of the policy supported by the service is version 1.0.
2121

22-
:::image type="content" source="./media/maa-policy-version-10.png" alt-text="A diagram showing Azure attestation using policy version 1.0":::
22+
:::image type="content" source="./media/maa-policy-version-1-0-small.png" alt-text="A diagram showing Azure attestation using policy version 1.0" lightbox="./media/maa-policy-version-1-0.png":::
2323

2424
The attestation service flow is as follows:
2525
- The platform sends the attestation evidence in the attest call to the attestation service.

0 commit comments

Comments
 (0)