Skip to content

Commit ebcbc21

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 222bf4f + 14d9c15 commit ebcbc21

File tree

192 files changed

+4316
-2528
lines changed

Some content is hidden

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

192 files changed

+4316
-2528
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,12 @@
955955
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
956956
"branch": "main",
957957
"branch_mapping": {}
958+
},
959+
{
960+
"path_to_root": "reusable-content",
961+
"url": "https://github.com/MicrosoftDocs/reusable-content",
962+
"branch": "main",
963+
"branch_mapping": {}
958964
}
959965
],
960966
"branch_target_mapping": {

.openpublishing.redirection.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6223,6 +6223,41 @@
62236223
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
62246224
"redirect_document_id": false
62256225
},
6226+
{
6227+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-attributes.md",
6228+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-attributes",
6229+
"redirect_document_id": false
6230+
},
6231+
{
6232+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-cli.md",
6233+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-cli",
6234+
"redirect_document_id": false
6235+
},
6236+
{
6237+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-examples.md",
6238+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-examples",
6239+
"redirect_document_id": false
6240+
},
6241+
{
6242+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-portal.md",
6243+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-portal",
6244+
"redirect_document_id": false
6245+
},
6246+
{
6247+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-powershell.md",
6248+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-powershell",
6249+
"redirect_document_id": false
6250+
},
6251+
{
6252+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-security.md",
6253+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-security",
6254+
"redirect_document_id": false
6255+
},
6256+
{
6257+
"source_path_from_root": "/articles/storage/common/storage-auth-abac.md",
6258+
"redirect_url": "/azure/storage/blobs/storage-auth-abac",
6259+
"redirect_document_id": false
6260+
},
62266261
{
62276262
"source_path_from_root": "/articles/storage/storage-client-side-encryption.md",
62286263
"redirect_url": "/azure/storage/common/storage-client-side-encryption",

articles/active-directory-b2c/configure-authentication-sample-ios-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Update the following class members:
148148

149149
## Step 6: Run and test the mobile app
150150

151-
1. Build and run the project with a [simulator of a connected iOS device](https://developer.apple.com/documentation/xcode/running-your-app-in-the-simulator-or-on-a-device).
151+
1. Build and run the project with a [simulator of a connected iOS device](https://developer.apple.com/documentation/xcode/running-your-app-in-simulator-or-on-a-device).
152152

153153
1. Select **Sign In**, and then sign up or sign in with your Azure AD B2C local or social account.
154154

articles/active-directory-b2c/enable-authentication-ios-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ To learn how to configure your iOS Swift app, see [Configure authentication in a
100100

101101
## Step 5: Run and test the mobile app
102102

103-
1. Build and run the project with a [simulator of a connected iOS device](https://developer.apple.com/documentation/xcode/running-your-app-in-the-simulator-or-on-a-device).
103+
1. Build and run the project with a [simulator of a connected iOS device](https://developer.apple.com/documentation/xcode/running-your-app-in-simulator-or-on-a-device).
104104
1. Select **Sign In**, and then sign up or sign in with your Azure AD B2C local or social account.
105105
1. After you've authenticated successfully, you'll see your display name in the navigation bar.
106106

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,16 @@ Combined registration supports the authentication methods and actions in the fol
5959
| Hardware token | No | No | Yes |
6060
| Phone | Yes | Yes | Yes |
6161
| Alternate phone | Yes | Yes | Yes |
62-
| Office phone | Yes | Yes | Yes |
62+
| Office phone* | Yes | Yes | Yes |
6363
| Email | Yes | Yes | Yes |
6464
| Security questions | Yes | No | Yes |
65-
| App passwords | Yes | No | Yes |
66-
| FIDO2 security keys<br />*Managed mode only from the [Security info](https://mysignins.microsoft.com/security-info) page*| Yes | Yes | Yes |
65+
| App passwords* | Yes | No | Yes |
66+
| FIDO2 security keys*| Yes | Yes | Yes |
6767

6868
> [!NOTE]
69-
> App passwords are available only to users who have been enforced for Azure AD Multi-Factor Authentication. App passwords are not available to users who are enabled for Azure AD Multi-Factor Authentication by a Conditional Access policy.
69+
> <b>Office phone</b> can only be registered in *Interrupt mode* if the users *Business phone* property has been set. Office phone can be added by users in *Managed mode from the [Security info](https://mysignins.microsoft.com/security-info)* without this requirement. <br />
70+
> <b>App passwords</b> are available only to users who have been enforced for Azure AD Multi-Factor Authentication. App passwords are not available to users who are enabled for Azure AD Multi-Factor Authentication by a Conditional Access policy. <br />
71+
> <b>FIDO2 security keys</b>, can only be added in *Managed mode only from the [Security info](https://mysignins.microsoft.com/security-info) page*
7072
7173
Users can set one of the following options as the default multifactor authentication method.
7274

@@ -140,7 +142,7 @@ A user who hasn't yet set up all required security info goes to [https://myaccou
140142

141143
### Set up other methods after partial registration
142144

143-
If a user has partially satisfied MFA or SSPR registration due to existing authentication method registrations performed by the user or admin, users will only be asked to register additional information allowed by the Authentication methods policy. If more than one other authentication method is available for the user to choose and register, an option on the registration experience titled **I want to set up another method** will be shown and allow the user to set up their desired authentication method.
145+
If a user has partially satisfied MFA or SSPR registration due to existing authentication method registrations performed by the user or admin, users will only be asked to register additional information allowed by the Authentication methods policy settings when registration is required. If more than one other authentication method is available for the user to choose and register, an option on the registration experience titled **I want to set up another method** will be shown and allow the user to set up their desired authentication method.
144146

145147
:::image type="content" border="true" source="./media/concept-registration-mfa-sspr-combined/other-method.png" alt-text="Screenshot of how to set up another method." :::
146148

articles/active-directory/authentication/tutorial-enable-cloud-sync-sspr-writeback.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: active-directory
55
ms.service: active-directory
66
ms.subservice: authentication
77
ms.topic: tutorial
8-
ms.date: 09/08/2022
8+
ms.date: 09/27/2022
99
ms.author: justinha
1010
author: justinha
1111
ms.reviewer: tilarso
@@ -24,7 +24,7 @@ Azure Active Directory Connect cloud sync can synchronize Azure AD password chan
2424
- An account with:
2525
- [Global Administrator](../roles/permissions-reference.md#global-administrator) role
2626
- Azure AD configured for self-service password reset. If needed, complete this tutorial to enable Azure AD SSPR.
27-
- An on-premises AD DS environment configured with [Azure AD Connect cloud sync version 1.1.972.0 or later](../app-provisioning/provisioning-agent-release-version-history.md). Learn how to [identify the agent's current version](../cloud-sync/how-to-automatic-upgrade.md). If needed, configure Azure AD Connect cloud sync using [this tutorial](tutorial-enable-sspr.md).
27+
- An on-premises AD DS environment configured with [Azure AD Connect cloud sync version 1.1.977.0 or later](../app-provisioning/provisioning-agent-release-version-history.md). Learn how to [identify the agent's current version](../cloud-sync/how-to-automatic-upgrade.md). If needed, configure Azure AD Connect cloud sync using [this tutorial](tutorial-enable-sspr.md).
2828

2929

3030
## Deployment steps
Loading
Loading
Loading

0 commit comments

Comments
 (0)