Skip to content

Commit 48c4644

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into azure-docs-pr-20220126-validation-6
2 parents cc41485 + 0b912ea commit 48c4644

File tree

256 files changed

+2850
-1195
lines changed

Some content is hidden

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

256 files changed

+2850
-1195
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2518,6 +2518,11 @@
25182518
"redirect_url": "/azure/machine-learning/migrate-execute-r-script",
25192519
"redirect_document_id": true
25202520
},
2521+
{
2522+
"source_path": "articles/machine-learning/how-to-search-cross-workspace.md",
2523+
"redirect_url": "/azure/machine-learning/how-to-manage-workspace",
2524+
"redirect_document_id": false
2525+
},
25212526
{
25222527
"source_path": "articles/machine-learning/resource-known-issues.md",
25232528
"redirect_url": "/azure/machine-learning/how-to-configure-auto-train#troubleshooting",

articles/active-directory-b2c/partner-bindid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ You should now see BindID as a new OIDC Identity provider listed within your B2C
120120

121121
2. Select **New user flow**
122122

123-
3. Select **Sign up and sign in** > **Version** **Reccomended** > **Create**.
123+
3. Select **Sign up and sign in** > **Version Recommended** > **Create**.
124124

125125
4. Enter a **Name** for your policy.
126126

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 02/16/2022
9+
ms.date: 03/1/2022
1010

1111
ms.author: justinha
1212
author: justinha
1313
manager: karenhoran
14-
ms.reviewer: rhicock
14+
ms.reviewer: tilarso
1515

1616
ms.collection: M365-identity-device-management
1717
---
@@ -21,6 +21,7 @@ Before combined registration, users registered authentication methods for Azure
2121

2222
> [!NOTE]
2323
> Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration.
24+
> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to utilize the sepperate legacy registration workflows for MFA and SSPR.
2425
2526
This article outlines what combined security registration is. To get started with combined security registration, see the following article:
2627

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ A major step in every multifactor authentication deployment is getting users reg
156156

157157
### Combined registration for SSPR and Azure AD MFA
158158

159+
> [!NOTE]
160+
> Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration. Tenants created after this date will be unable to utilize the legacy registration workflows.
161+
> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to disable the combined registration experience.
162+
159163
We recommend that organizations use the [combined registration experience for Azure AD Multi-Factor Authentication and self-service password reset (SSPR)](howto-registration-mfa-sspr-combined.md). SSPR allows users to reset their password in a secure way using the same methods they use for Azure AD Multi-Factor Authentication. Combined registration is a single step for end users. To make sure you understand the functionality and end-user experience, see the [Combined security information registration concepts](concept-registration-mfa-sspr-combined.md).
160164

161165
It's critical to inform users about upcoming changes, registration requirements, and any necessary user actions. We provide [communication templates](https://aka.ms/mfatemplates) and [user documentation](https://support.microsoft.com/account-billing/set-up-security-info-from-a-sign-in-page-28180870-c256-4ebf-8bd7-5335571bf9a8) to prepare your users for the new experience and help to ensure a successful rollout. Send users to https://myprofile.microsoft.com to register by selecting the **Security Info** link on that page.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: how-to
9-
ms.date: 06/28/2021
9+
ms.date: 03/1/2022
1010

1111
ms.author: justinha
1212
author: justinha
1313
manager: karenhoran
14-
ms.reviewer: rhicock
14+
ms.reviewer: tilarso
1515

1616
ms.collection: M365-identity-device-management
1717
---
@@ -21,6 +21,7 @@ Before combined registration, users registered authentication methods for Azure
2121

2222
> [!NOTE]
2323
> Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration. Tenants created after this date will be unable to utilize the legacy registration workflows.
24+
> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to utilize the sepperate legacy registration workflows for MFA and SSPR.
2425
2526
To make sure you understand the functionality and effects before you enable the new experience, see the [Combined security information registration concepts](concept-registration-mfa-sspr-combined.md).
2627

articles/active-directory/authentication/howto-sspr-deployment.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ Before deploying SSPR, you may opt to determine the number and the average cost
110110

111111
### Combined registration for SSPR and Azure AD Multi-Factor Authentication
112112

113+
> [!NOTE]
114+
> Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration. Tenants created after this date will be unable to utilize the legacy registration workflows.
115+
> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to disable the combined registration experience.
116+
113117
We recommend that organizations use the [combined registration experience for Azure AD Multi-Factor Authentication and self-service password reset (SSPR)](howto-registration-mfa-sspr-combined.md). SSPR allows users to reset their password in a secure way using the same methods they use for Azure AD Multi-Factor Authentication. Combined registration is a single step for end users. To make sure you understand the functionality and end-user experience, see the [Combined security information registration concepts](concept-registration-mfa-sspr-combined.md).
114118

115119
It's critical to inform users about upcoming changes, registration requirements, and any necessary user actions. We provide [communication templates](https://aka.ms/mfatemplates) and [user documentation](https://support.microsoft.com/account-billing/set-up-security-info-from-a-sign-in-page-28180870-c256-4ebf-8bd7-5335571bf9a8) to prepare your users for the new experience and help to ensure a successful rollout. Send users to https://myprofile.microsoft.com to register by selecting the **Security Info** link on that page.

articles/active-directory/cloud-infrastructure-entitlement-management/cloudknox-howto-add-remove-role-task.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,79 +27,79 @@ This article describes how you can add and remove roles and tasks for Microsoft
2727
## View permissions
2828

2929
1. On the CloudKnox home page, select the **Remediation** tab, and then select the **Permissions** subtab.
30-
1. From the **Select an authorization system type** dropdown, select **Azure** or **GCP**.
31-
1. From the **Select an authorization system** dropdown, select the accounts you want to access.
32-
1. From the **Search for** dropdown, select **Group**, **User**, or **APP**.
33-
1. To search for more parameters, you can make a selection from the **User States**, **Privilege Creep Index**, and **Task usage** dropdowns.
30+
1. From the **Authorization System Type** dropdown, select **Azure** or **GCP**.
31+
1. From the **Authorization System** dropdown, select the accounts you want to access.
32+
1. From the **Search For** dropdown, select **Group**, **User**, or **APP**.
33+
1. To search for more parameters, you can make a selection from the **User States**, **Permission Creep Index**, and **Task Usage** dropdowns.
3434
1. Select **Apply**.
3535
CloudKnox displays a list of groups, users, and service accounts that match your criteria.
3636
1. In **Enter a username**, enter or select a user.
37-
1. In **Enter a group name**, enter or select a group, then select **Apply**.
37+
1. In **Enter a Group Name**, enter or select a group, then select **Apply**.
3838
1. Make a selection from the results list.
3939

40-
The table displays the **Username** **Domain/Account**, **Source**, **Resource** and **Current role**.
40+
The table displays the **Username** **Domain/Account**, **Source**, **Resource** and **Current Role**.
4141

4242

4343
## Add a role
4444

4545
1. On the CloudKnox home page, select the **Remediation** tab, and then select the **Permissions** subtab.
46-
1. From the **Select an authorization system type** dropdown, select **Azure** or **GCP**.
47-
1. From the **Select an authorization system** dropdown, select the accounts you want to access.
48-
1. From the **Search for** dropdown, select **Group**, **User**, or **APP**, and then select **Apply**.
46+
1. From the **Authorization System Type** dropdown, select **Azure** or **GCP**.
47+
1. From the **Authorization System** dropdown, select the accounts you want to access.
48+
1. From the **Search For** dropdown, select **Group**, **User**, or **APP/Service Account**, and then select **Apply**.
4949
1. Make a selection from the results list.
5050

5151
1. To attach a role, select **Add role**.
52-
1. In the **Add role** page, from the **Available roles** list, select the plus sign **(+)** to move the role to the **Selected roles** list.
52+
1. In the **Add Role** page, from the **Available Roles** list, select the plus sign **(+)** to move the role to the **Selected Roles** list.
5353
1. When you have finished adding roles, select **Submit**.
54-
1. When the following message displays: **Are you sure you want to change permissions?**, select:
54+
1. When the following message displays: **Are you sure you want to change permission?**, select:
5555
- **Generate Script** to generate a script where you can manually add/remove the permissions you selected.
5656
- **Execute** to change the permission.
5757
- **Close** to cancel the action.
5858

5959
## Remove a role
6060

6161
1. On the CloudKnox home page, select the **Remediation** tab, and then select the **Permissions** subtab.
62-
1. From the **Select an authorization system type** dropdown, select **Azure** or **GCP**.
63-
1. From the **Select an authorization system** dropdown, select the accounts you want to access.
64-
1. From the **Search for** dropdown, select **Group**, **User**, or **APP**, and then select **Apply**.
62+
1. From the **Authorization System Type** dropdown, select **Azure** or **GCP**.
63+
1. From the **Authorization System** dropdown, select the accounts you want to access.
64+
1. From the **Search For** dropdown, select **Group**, **User**, or **APP/Service Account**, and then select **Apply**.
6565
1. Make a selection from the results list.
6666

67-
1. To remove a role, select **Remove role**.
68-
1. In the **Remove role** page, from the **Available roles** list, select the plus sign **(+)** to move the role to the **Selected roles** list.
67+
1. To remove a role, select **Remove Role**.
68+
1. In the **Remove Role** page, from the **Available Roles** list, select the plus sign **(+)** to move the role to the **Selected Roles** list.
6969
1. When you have finished selecting roles, select **Submit**.
70-
1. When the following message displays: **Are you sure you want to change permissions?**, select:
70+
1. When the following message displays: **Are you sure you want to change permission?**, select:
7171
- **Generate Script** to generate a script where you can manually add/remove the permissions you selected.
7272
- **Execute** to change the permission.
7373
- **Close** to cancel the action.
7474

7575
## Add a task
7676

7777
1. On the CloudKnox home page, select the **Remediation** tab, and then select the **Permissions** subtab.
78-
1. From the **Select an authorization system type** dropdown, select **Azure** or **GCP**.
79-
1. From the **Select an authorization system** dropdown, select the accounts you want to access.
80-
1. From the **Search for** dropdown, select **Group**, **User**, or **APP**, and then select **Apply**.
78+
1. From the **Authorization System Type** dropdown, select **Azure** or **GCP**.
79+
1. From the **Authorization System** dropdown, select the accounts you want to access.
80+
1. From the **Search For** dropdown, select **Group**, **User**, or **APP/Service Account**, and then select **Apply**.
8181
1. Make a selection from the results list.
8282

83-
1. To attach a role, select **Add tasks**.
84-
1. In the **Add tasks** page, from the **Available tasks** list, select the plus sign **(+)** to move the task to the **Selected tasks** list.
83+
1. To attach a role, select **Add Tasks**.
84+
1. In the **Add Tasks** page, from the **Available Tasks** list, select the plus sign **(+)** to move the task to the **Selected Tasks** list.
8585
1. When you have finished adding tasks, select **Submit**.
86-
1. When the following message displays: **Are you sure you want to change permissions?**, select:
86+
1. When the following message displays: **Are you sure you want to change permission?**, select:
8787
- **Generate Script** to generate a script where you can manually add/remove the permissions you selected.
8888
- **Execute** to change the permission.
8989
- **Close** to cancel the action.
9090

9191
## Remove a task
9292

9393
1. On the CloudKnox home page, select the **Remediation** tab, and then select the **Permissions** subtab.
94-
1. From the **Select an authorization system type** dropdown, select **Azure** or **GCP**.
95-
1. From the **Select an authorization system** dropdown, select the accounts you want to access.
96-
1. From the **Search for** dropdown, select **Group**, **User**, or **APP**, and then select **Apply**.
94+
1. From the **Authorization System Type** dropdown, select **Azure** or **GCP**.
95+
1. From the **Authorization System** dropdown, select the accounts you want to access.
96+
1. From the **Search For** dropdown, select **Group**, **User**, or **APP/Service Account**, and then select **Apply**.
9797
1. Make a selection from the results list.
9898

99-
1. To remove a task, select **Remove tasks**.
100-
1. In the **Remove tasks** page, from the **Available tasks** list, select the plus sign **(+)** to move the task to the **Selected tasks** list.
99+
1. To remove a task, select **Remove Tasks**.
100+
1. In the **Remove Tasks** page, from the **Available Tasks** list, select the plus sign **(+)** to move the task to the **Selected Tasks** list.
101101
1. When you have finished selecting tasks, select **Submit**.
102-
1. When the following message displays: **Are you sure you want to change permissions?**, select:
102+
1. When the following message displays: **Are you sure you want to change permission?**, select:
103103
- **Generate Script** to generate a script where you can manually add/remove the permissions you selected.
104104
- **Execute** to change the permission.
105105
- **Close** to cancel the action.

articles/active-directory/cloud-infrastructure-entitlement-management/cloudknox-howto-attach-detach-permissions.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,45 +27,45 @@ This article describes how you can attach and detach permissions for users, role
2727
## View permissions
2828

2929
1. On the CloudKnox home page, select the **Remediation** tab, and then select the **Permissions** subtab.
30-
1. From the **Select an authorization system type** dropdown, select **AWS**.
31-
1. From the **Select an authorization system** dropdown, select the accounts you want to access.
30+
1. From the **Authorization System Type** dropdown, select **AWS**.
31+
1. From the **Authorization System** dropdown, select the accounts you want to access.
3232
1. From the **Search For** dropdown, select **Group**, **User**, or **Role**.
33-
1. To search for more parameters, you can make a selection from the **User States**, **Privilege Creep Index**, and **Task usage** dropdowns.
33+
1. To search for more parameters, you can make a selection from the **User States**, **Permission Creep Index**, and **Task Usage** dropdowns.
3434
1. Select **Apply**.
3535
CloudKnox displays a list of users, roles, or groups that match your criteria.
3636
1. In **Enter a username**, enter or select a user.
3737
1. In **Enter a group name**, enter or select a group, then select **Apply**.
3838
1. Make a selection from the results list.
3939

40-
The table displays the related **Username** **Domain/Account**, **Source** and **Policy name**.
40+
The table displays the related **Username** **Domain/Account**, **Source** and **Policy Name**.
4141

4242

4343
## Attach policies
4444

4545
1. On the CloudKnox home page, select the **Remediation** tab, and then select the **Permissions** subtab.
46-
1. From the **Select an authorization system type** dropdown, select **AWS**.
46+
1. From the **Authorization System Type** dropdown, select **AWS**.
4747
1. In **Enter a username**, enter or select a user.
48-
1. In **Enter a group name**, enter or select a group, then select **Apply**.
48+
1. In **Enter a Group Name**, enter or select a group, then select **Apply**.
4949
1. Make a selection from the results list.
50-
1. To attach a policy, select **Attach policies**.
51-
1. In the **Attach policies** page, from the **Available policies** list, select the plus sign **(+)** to move the policy to the **Selected policies** list.
50+
1. To attach a policy, select **Attach Policies**.
51+
1. In the **Attach Policies** page, from the **Available policies** list, select the plus sign **(+)** to move the policy to the **Selected policies** list.
5252
1. When you have finished adding policies, select **Submit**.
53-
1. When the following message displays: **Are you sure you want to change permissions?**, select:
53+
1. When the following message displays: **Are you sure you want to change permission?**, select:
5454
- **Generate Script** to generate a script where you can manually add/remove the permissions you selected.
5555
- **Execute** to change the permission.
5656
- **Close** to cancel the action.
5757

5858
## Detach policies
5959

6060
1. On the CloudKnox home page, select the **Remediation** tab, and then select the **Permissions** subtab.
61-
1. From the **Select an authorization system type** dropdown, select **AWS**.
61+
1. From the **Authorization System Type** dropdown, select **AWS**.
6262
1. In **Enter a username**, enter or select a user.
63-
1. In **Enter a group name**, enter or select a group, then select **Apply**.
63+
1. In **Enter a Group Name**, enter or select a group, then select **Apply**.
6464
1. Make a selection from the results list.
65-
1. To remove a policy, select **Detach policies**.
66-
1. In the **Detach policies** page, from the **Available policies** list, select the plus sign **(+)** to move the policy to the **Selected policies** list.
65+
1. To remove a policy, select **Detach Policies**.
66+
1. In the **Detach Policies** page, from the **Available policies** list, select the plus sign **(+)** to move the policy to the **Selected policies** list.
6767
1. When you have finished selecting policies, select **Submit**.
68-
1. When the following message displays: **Are you sure you want to change permissions?**, select:
68+
1. When the following message displays: **Are you sure you want to change permission?**, select:
6969
- **Generate Script** to generate a script where you can manually add/remove the permissions you selected.
7070
- **Execute** to change the permission.
7171
- **Close** to cancel the action.

0 commit comments

Comments
 (0)