Skip to content

Commit 38cec7c

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 6a8b6a6 + 174d7b3 commit 38cec7c

File tree

314 files changed

+3120
-2208
lines changed

Some content is hidden

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

314 files changed

+3120
-2208
lines changed

articles/active-directory/authentication/howto-authentication-passwordless-faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ For a full list of endpoints needed to use Microsoft online products, see [Offic
106106
To check if the Windows 10 client device has the right domain join type, use the following command:
107107

108108
```console
109-
Dsregcmd/status
109+
Dsregcmd /status
110110
```
111111

112112
The following sample output shows that the device is Azure AD joined as *AzureADJoined* is set to *YES*:

articles/active-directory/authentication/howto-authentication-passwordless-phone.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,17 @@ Users can register for passwordless phone sign-in directly within the Microsoft
8787
6. Once signed-in, continue following the additional steps to set up phone sign-in.
8888

8989
### Guided registration with My Sign-ins
90+
> [!NOTE]
91+
> Users will only be able to register Microsoft Authenticator via combined registration if the Microsoft Authenticator authentication mode is to Any or Push.
92+
9093
To register the Microsoft Authenticator app, follow these steps:
9194

9295
1. Browse to [https://aka.ms/mysecurityinfo](https://aka.ms/mysecurityinfo).
9396
1. Sign in, then select **Add method** > **Authenticator app** > **Add** to add Microsoft Authenticator.
9497
1. Follow the instructions to install and configure the Microsoft Authenticator app on your device.
9598
1. Select **Done** to complete Microsoft Authenticator configuration.
9699

97-
### Enable phone sign-in
100+
#### Enable phone sign-in
98101

99102
After users registered themselves for the Microsoft Authenticator app, they need to enable phone sign-in:
100103

articles/active-directory/develop/custom-extension-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ After the Azure Function app is created, create an HTTP trigger function. The HT
6363
1. Within your **Function App**, from the menu select **Functions**.
6464
1. From the top menu, select **+ Create**.
6565
1. In the **Create Function** window, leave the **Development environment** property as **Develop in portal**, and then select the **HTTP trigger** template.
66-
1. Under **Template details**, enter *CustomExtensionsAPI* for the **New Function** property.
66+
1. Under **Template details**, enter *CustomAuthenticationExtensionsAPI* for the **New Function** property.
6767
1. For the **Authorization level**, select **Function**.
6868
1. Select **Create**
6969

0 commit comments

Comments
 (0)