Skip to content

Commit fef9eb6

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-azure-oci
2 parents e25e438 + 6989081 commit fef9eb6

File tree

161 files changed

+956
-1154
lines changed

Some content is hidden

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

161 files changed

+956
-1154
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19304,6 +19304,11 @@
1930419304
"redirect_url": "/azure/active-directory/develop/quickstart-v2-register-an-app",
1930519305
"redirect_document_id": true
1930619306
},
19307+
{
19308+
"source_path": "articles/active-directory/authentication/howto-mfa-sdk.md",
19309+
"redirect_url": "/azure/active-directory/develop/",
19310+
"redirect_document_id": true
19311+
},
1930719312
{
1930819313
"source_path": "articles/active-directory/active-directory-claims-mapping.md",
1930919314
"redirect_url": "/azure/active-directory/develop/active-directory-claims-mapping",

articles/active-directory-b2c/active-directory-b2c-get-started-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Azure AD B2C requires you to register two applications that are used to sign up
7979
1. In **App registrations (Legacy)**, select **New application registration**.
8080
2. For **Name**, enter `ProxyIdentityExperienceFramework`.
8181
3. For **Application type**, choose **Native**.
82-
4. For **Redirect URI**, enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com`, where `yourtenant` is your Azure AD B2C tenant.
82+
4. For **Redirect URI**, enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com`, where `your-tenant-name` is your Azure AD B2C tenant.
8383
5. Click **Create**. After it's created, copy the application ID and save it to use later.
8484
6. On the Settings page, select **Required permissions**, and then select **Add**.
8585
7. Choose **Select an API**, search for and select **IdentityExperienceFramework**, and then click **Select**.

articles/active-directory/authentication/TOC.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,6 @@
142142
href: active-directory-certificate-based-authentication-android.md
143143
- name: CBA on iOS Devices
144144
href: active-directory-certificate-based-authentication-ios.md
145-
- name: Develop
146-
items:
147-
- name: Build MFA into custom apps
148-
href: howto-mfa-sdk.md
149145
- name: Reporting
150146
items:
151147
- name: SSPR Reports

articles/active-directory/authentication/howto-mfa-sdk.md

Lines changed: 0 additions & 161 deletions
This file was deleted.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ When users reset their password from the login screen of a Windows 10 device, a
113113

114114
## Limitations
115115

116+
Account unlock, mobile app notification, and mobile app code are not supported by SSPR for Windows 10.
117+
116118
When testing this functionality using Hyper-V, the "Reset password" link does not appear.
117119

118120
* Go to the VM you are using to test click on **View** and then uncheck **Enhanced session**.

articles/active-directory/hybrid/TOC.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
href: tutorial-phs-backup.md
1919
- name: Concepts
2020
items:
21+
- name: Hybrid Identity
22+
items:
23+
- name: Cloud Governed Management for On-Premises Workloads
24+
href: cloud-governed-management-for-on-premises.md
2125
- name: Azure AD Connect and Connect Health
2226
items:
2327
- name: What is Azure AD Connect and Connect Health?

0 commit comments

Comments
 (0)