Skip to content

Commit bcdae40

Browse files
authored
Merge pull request #72317 from MicrosoftDocs/master
Merge master to live Sunday 4:00 PM
2 parents 727f713 + 4c6c748 commit bcdae40

File tree

356 files changed

+29799
-3415
lines changed

Some content is hidden

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

356 files changed

+29799
-3415
lines changed

.openpublishing.redirection.json

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2870,6 +2870,11 @@
28702870
"redirect_url": "/azure/azure-portal/azure-portal-dashboards",
28712871
"redirect_document_id": false
28722872
},
2873+
{
2874+
"source_path": "articles/azure-resource-manager/resource-manager-tutorial-move-resources.md",
2875+
"redirect_url": "/azure/azure-resource-manager/resource-group-move-resources",
2876+
"redirect_document_id": false
2877+
},
28732878
{
28742879
"source_path": "articles/azure-resource-manager/resource-manager-templates-parameters.md",
28752880
"redirect_url": "/azure/azure-resource-manager/resource-group-authoring-templates#parameters",
@@ -36793,9 +36798,29 @@
3679336798
},
3679436799
{
3679536800
"source_path": "articles/cognitive-services/Custom-Vision-Service/rest-api-tutorial.md",
36796-
"redirect_url": "/azure/cognitive-services/Custom-Vision-Service/getting-started-build-a-classifier",
36801+
"redirect_url": "/azure/cognitive-services/Custom-Vision-Service/getting-started-build-a-classifier",
36802+
"redirect_document_id": false
36803+
},
36804+
{
36805+
"source_path": "articles/data-catalog/data-catalog-prerequisites.md",
36806+
"redirect_url": "/azure/data-catalog/data-catalog-get-started",
3679736807
"redirect_document_id": false
3679836808
},
36809+
{
36810+
"source_path": "articles/data-catalog/data-catalog-release-notes.md",
36811+
"redirect_url": "/azure/data-catalog/data-catalog-get-started",
36812+
"redirect_document_id": false
36813+
},
36814+
{
36815+
"source_path": "articles/data-catalog/data-catalog-whats-new.md",
36816+
"redirect_url": "/azure/data-catalog/data-catalog-get-started",
36817+
"redirect_document_id": false
36818+
},
36819+
{
36820+
"source_path": "articles/data-catalog/data-catalog-what-is-data-catalog.md",
36821+
"redirect_url": "/azure/data-catalog/overview",
36822+
"redirect_document_id": true
36823+
},
3679936824
{
3680036825
"source_path": "articles/biztalk-services/biztalk-backup-restore.md",
3680136826
"redirect_url": "/azure/logic-apps/logic-apps-move-from-mabs",

articles/active-directory-b2c/tutorial-register-applications.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ If you haven't already created your own [Azure AD B2C Tenant](tutorial-create-te
4444

4545
## Create a client secret
4646

47-
If you’re application exchanges a code for a token, you need to create an application secret.
47+
If your application exchanges a code for a token, you need to create an application secret.
4848

4949
1. Select **Keys** and then click **Generate key**.
5050
2. Select **Save** to view the key. Make note of the **App key** value. You use the value as the application secret in your application's code.
@@ -58,4 +58,4 @@ In this article, you learned how to:
5858
> * Create a client secret
5959
6060
> [!div class="nextstepaction"]
61-
> [Create user flows in Azure Active Directory B2C](tutorial-create-user-flows.md)
61+
> [Create user flows in Azure Active Directory B2C](tutorial-create-user-flows.md)

articles/active-directory/authentication/concept-registration-mfa-sspr-combined.md

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

articles/active-directory/authentication/howto-registration-mfa-sspr-combined-troubleshoot.md

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

articles/active-directory/authentication/howto-registration-mfa-sspr-combined.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Get started with combined registration for Azure AD SSPR and MFA (preview) - Azure Active Directory
2+
title: Get started with combined registration for Azure AD SSPR and Multi-Factor Authentication (preview) - Azure Active Directory
33
description: Enable combined Azure AD Multi-Factor Authentication and self-service password reset registration (preview)
44

55
services: active-directory
@@ -17,40 +17,40 @@ ms.collection: M365-identity-device-management
1717
---
1818
# Enable combined security information registration (preview)
1919

20-
Before enabling the new experience, review the article [Combined security information registration (preview)](concept-registration-mfa-sspr-combined.md) to ensure you understand the functionality and impact of this feature.
20+
Before enabling the new experience, review the article [Combined security information registration (preview)](concept-registration-mfa-sspr-combined.md) to ensure you understand the functionality and effects of this feature.
2121

2222
![Combined security information registration enhanced experience](media/howto-registration-mfa-sspr-combined/combined-security-info-more-required.png)
2323

2424
| |
2525
| --- |
26-
| Combined security information registration for Azure Multi-Factor Authentication and Azure AD self-service password reset is a public preview feature of Azure Active Directory. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/)|
26+
| Combined security information registration for Azure Multi-Factor Authentication and Azure Active Directory (Azure AD) self-service password reset is a public preview feature of Azure AD. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).|
2727
| |
2828

2929
## Enable combined registration
3030

31-
Complete the following steps to enable combined registration:
31+
Complete these steps to enable combined registration:
3232

3333
1. Sign in to the Azure portal as a user administrator or global administrator.
34-
2. Browse to **Azure Active Directory** > **User settings** > **Manage settings for access panel preview features**.
34+
2. Go to **Azure Active Directory** > **User settings** > **Manage settings for access panel preview features**.
3535
3. Under **Users can use preview features for registering and managing security info - refresh**, choose to enable for a **Selected** group of users or for **All** users.
3636

37-
![Enable the combined security info preview experience for All users](media/howto-registration-mfa-sspr-combined/combined-security-info-enable.png)
37+
![Enable the combined security info preview experience for All users](media/howto-registration-mfa-sspr-combined/combined-security-info-enable.png)
3838

3939
> [!IMPORTANT]
40-
> Starting in March of 2019 the phone call options will not be available to MFA and SSPR users in free/trial Azure AD tenants. SMS messages are not impacted by this change. Phone call will continue to be available to users in paid Azure AD tenants. This change only impacts free/trial Azure AD tenants.
40+
> Starting in March 2019, the phone call options won't be available to Multi-Factor Authentication and SSPR users in free/trial Azure AD tenants. SMS messages are not affected by this change. The phone call options will still be available to users in paid Azure AD tenants.
4141
4242
> [!NOTE]
43-
> Once you enable combined registration, users who register or confirm their phone number or mobile app through the new experience can use them for MFA and SSPR, if those methods are enabled in the MFA and SSPR policies. If you then disable this experience, users who go to the previous SSPR registration page at `https:/aka.ms/ssprsetup` will be required to perform multi-factor authentication before they can access the page.
43+
> After you enable combined registration, users who register or confirm their phone number or mobile app through the new experience can use them for Multi-Factor Authentication and SSPR, if those methods are enabled in the Multi-Factor Authentication and SSPR policies. If you then disable this experience, users who go to the previous SSPR registration page at `https:/aka.ms/ssprsetup` will be required to perform multi-factor authentication before they can access the page.
4444
45-
If you have configured the site to zone assignment list in Internet Explorer the following sites must be in the same zone:
45+
If you have configured the Site to Zone Assignment List in Internet Explorer, the following sites have to be in the same zone:
4646

4747
* [https://login.microsoftonline.com](https://login.microsoftonline.com)
4848
* [https://mysignins.microsoft.com](https://mysignins.microsoft.com)
4949
* [https://account.activedirectory.windowsazure.com](https://account.activedirectory.windowsazure.com)
5050

5151
## Next steps
5252

53-
[Available methods for MFA and SSPR](concept-authentication-methods.md)
53+
[Available methods for Multi-Factor Authentication and SSPR](concept-authentication-methods.md)
5454

5555
[Configure self-service password reset](howto-sspr-deployment.md)
5656

articles/active-directory/conditional-access/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
href: policy-migration.md
4747
- name: Require approved client apps
4848
href: app-based-conditional-access.md
49+
- name: Require app protection policy
50+
href: app-protection-based-conditional-access.md
4951
- name: Require managed devices
5052
href: require-managed-devices.md
5153
- name: Require MFA for access attempts from untrusted networks

0 commit comments

Comments
 (0)