Skip to content

Commit 1aefdf8

Browse files
authored
Merge pull request #78844 from MicrosoftDocs/master
6/5 PM Publish
2 parents 18a0d58 + cd26721 commit 1aefdf8

File tree

155 files changed

+964
-1146
lines changed

Some content is hidden

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

155 files changed

+964
-1146
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19299,6 +19299,11 @@
1929919299
"redirect_url": "/azure/active-directory/develop/quickstart-v2-register-an-app",
1930019300
"redirect_document_id": true
1930119301
},
19302+
{
19303+
"source_path": "articles/active-directory/authentication/howto-mfa-sdk.md",
19304+
"redirect_url": "/azure/active-directory/develop/",
19305+
"redirect_document_id": true
19306+
},
1930219307
{
1930319308
"source_path": "articles/active-directory/active-directory-claims-mapping.md",
1930419309
"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/devices/device-management-azure-portal.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ ms.reviewer: jairoc
2222

2323
ms.collection: M365-identity-device-management
2424
---
25-
# How to manage device identity using the Azure portal
25+
# Manage device identity using the Azure portal
2626

27-
With device identity management in Azure Active Directory (Azure AD), you can ensure that your users are accessing your resources from devices that meet your standards for security and compliance.
27+
With device identity management in Azure Active Directory (Azure AD), you can ensure that your users are accessing your resources from devices that meet your standards for security and compliance.
2828

2929
This article:
3030

@@ -115,7 +115,7 @@ This section provides you with information about common device identity manageme
115115

116116
### Manage an Intune device
117117

118-
If you are an Intune administrator, you can manage devices marked as **Microsoft Intune**.
118+
If you are an Intune administrator, you can manage devices marked as **Microsoft Intune**.
119119

120120
![Manage an Intune device](./media/device-management-azure-portal/31.png)
121121

@@ -134,7 +134,7 @@ To enable / disable a device, you have two options:
134134
**Remarks:**
135135

136136
- You need to be a global administrator or cloud device administrator in Azure AD to enable / disable a device.
137-
- Disabling a device prevents a device from successfully authenticating with Azure AD, thereby preventing the device from accessing your Azure AD resources that are guarded by device CA or using your WH4B credentials.
137+
- Disabling a device prevents a device from successfully authenticating with Azure AD, thereby preventing the device from accessing your Azure AD resources that are guarded by device CA or using your WH4B credentials.
138138

139139
### Delete an Azure AD device
140140

@@ -152,7 +152,7 @@ To delete a device, you have two options:
152152

153153
- You need to be a global administrator or an Intune administrator in Azure AD to delete a device.
154154
- Deleting a device:
155-
- Prevents a device from accessing your Azure AD resources.
155+
- Prevents a device from accessing your Azure AD resources.
156156
- Removes all details that are attached to the device, for example, BitLocker keys for Windows devices.
157157
- Represents a non-recoverable activity and is not recommended unless it is required.
158158

@@ -174,9 +174,9 @@ To view or copy the BitLocker keys, you need to be either the owner of the devic
174174

175175
- Global Administrator
176176
- Helpdesk Administrator
177-
- Security Administrators
178-
- Security Readers
179-
- Intune Service Administrators
177+
- Security Administrator
178+
- Security Reader
179+
- Intune Service Administrator
180180

181181
> [!NOTE]
182182
> Hybrid Azure AD Joined Windows 10 devices do not have an owner. So, if you are looking for a device by owner and didn't find it, search by the device ID.

articles/active-directory/devices/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,5 +152,5 @@ As a rule of a thumb, you should use:
152152
- To set up:
153153
- Azure Active Directory registered Windows 10 devices, see [How to configure Azure Active Directory registered Windows 10 devices](../user-help/device-management-azuread-registered-devices-windows10-setup.md).
154154
- Azure Active Directory joined devices, see [How to plan your Azure Active Directory join implementation](azureadjoin-plan.md).
155-
- Hybrid Azure AD joined devices, see [How to plan your hybrid Azure Active Directory join implementation](hybrid-azuread-join-plan.md).
155+
- Hybrid Azure AD joined devices, see [How to plan your hybrid Azure Active Directory join implementation](hybrid-azuread-join-plan.md).
156156
- To learn more about device-based conditional access, see [Configure Azure Active Directory device-based conditional access policies](../conditional-access/require-managed-devices.md).

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)