Skip to content

Commit d659f30

Browse files
flang-msftflang-msft
committed
Merge branch 'main' into fxl---Error-in-High-availability-and-disaster-recovery-doc-
2 parents eb9cb1b + 9445ba3 commit d659f30

File tree

999 files changed

+13156
-7064
lines changed

Some content is hidden

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

999 files changed

+13156
-7064
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.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10895,6 +10895,11 @@
1089510895
"source_path_from_root": "/articles/active-directory/fundamentals/support-help-options.md",
1089610896
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
1089710897
"redirect_document_id": false
10898+
},
10899+
{
10900+
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-playbook.md",
10901+
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-user-guide",
10902+
"redirect_document_id": false
1089810903
}
1089910904
]
1090010905
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5441,5 +5441,11 @@
54415441
"redirect_url": "/azure/azure-sql/database/sql-insights-troubleshoot",
54425442
"redirect_document_id": false
54435443
}
5444+
,
5445+
{
5446+
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-virtual-machine-scale-sets.md",
5447+
"redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",
5448+
"redirect_document_id": false
5449+
}
54445450
]
54455451
}

‎.openpublishing.redirection.json

Lines changed: 92 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-dotnet-legacy.md",
5+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-java-legacy.md",
10+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-java",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-python-legacy.md",
15+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-python",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-xamarin.md",
20+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/site-recovery/deploy-vmware-azure-replication-appliance-preview.md",
25+
"redirect_url": "/azure/site-recovery/deploy-vmware-azure-replication-appliance-modernized",
26+
"redirect_document_id": false
27+
},
328
{
429
"source_path": "articles/iot-hub/iot-hub-rm-template.md",
530
"redirect_url": "/azure/iot-hub/iot-hub-rm-template-powershell",
@@ -11,14 +36,39 @@
1136
"redirect_document_id": false
1237
},
1338
{
14-
"source_path": "articles/visual-studio/vs-storage-cloud-services-getting-started-queues.md",
15-
"redirect_url": "/previous-versions/azure/visual-studio/vs-storage-cloud-services-getting-started-queues",
16-
"redirect_document_id": false
39+
"source_path": "articles/site-recovery/failover-failback-overview-preview.md",
40+
"redirect_url": "/azure/site-recovery/failover-failback-overview-modernized",
41+
"redirect_document_id": false
1742
},
1843
{
19-
"source_path": "articles/visual-studio/vs-storage-cloud-services-getting-started-tables.md",
20-
"redirect_url": "/previous-versions/azure/visual-studio/vs-storage-cloud-services-getting-started-tables",
21-
"redirect_document_id": false
44+
"source_path": "articles/site-recovery/switch-replication-appliance-preview.md",
45+
"redirect_url": "/azure/site-recovery/switch-replication-appliance-modernized",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/site-recovery/upgrade-mobility-service-preview.md",
50+
"redirect_url": "/azure/site-recovery/upgrade-mobility-service-modernized",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/site-recovery/vmware-azure-set-up-replication-tutorial-preview.md",
55+
"redirect_url": "/azure/site-recovery/vmware-azure-set-up-replication-tutorial-modernized",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/site-recovery/vmware-azure-architecture-preview.md",
60+
"redirect_url": "/azure/site-recovery/vmware-azure-architecture-modernized",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/physical-server-azure-architecture-preview.md",
65+
"redirect_url": "/azure/physical-server-azure-architecture-modernized",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/vmware-azure-tutorial-failover-failback-preview.md",
70+
"redirect_url": "/azure/vmware-azure-tutorial-failover-failback-modernized",
71+
"redirect_document_id": false
2272
},
2373
{
2474
"source_path": "articles/automanage/automanage-virtual-machines.md",
@@ -6223,6 +6273,41 @@
62236273
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
62246274
"redirect_document_id": false
62256275
},
6276+
{
6277+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-attributes.md",
6278+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-attributes",
6279+
"redirect_document_id": false
6280+
},
6281+
{
6282+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-cli.md",
6283+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-cli",
6284+
"redirect_document_id": false
6285+
},
6286+
{
6287+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-examples.md",
6288+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-examples",
6289+
"redirect_document_id": false
6290+
},
6291+
{
6292+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-portal.md",
6293+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-portal",
6294+
"redirect_document_id": false
6295+
},
6296+
{
6297+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-powershell.md",
6298+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-powershell",
6299+
"redirect_document_id": false
6300+
},
6301+
{
6302+
"source_path_from_root": "/articles/storage/common/storage-auth-abac-security.md",
6303+
"redirect_url": "/azure/storage/blobs/storage-auth-abac-security",
6304+
"redirect_document_id": false
6305+
},
6306+
{
6307+
"source_path_from_root": "/articles/storage/common/storage-auth-abac.md",
6308+
"redirect_url": "/azure/storage/blobs/storage-auth-abac",
6309+
"redirect_document_id": false
6310+
},
62266311
{
62276312
"source_path_from_root": "/articles/storage/storage-client-side-encryption.md",
62286313
"redirect_url": "/azure/storage/common/storage-client-side-encryption",
@@ -28806,3 +28891,4 @@
2880628891
}
2880728892
]
2880828893
}
28894+

‎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/concept-sspr-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ The two-gate policy requires two pieces of authentication data, such as an email
8787
* Power BI service administrator
8888
* Privileged Authentication administrator
8989
* Privileged role administrator
90-
* SharePoint administrator
9190
* Security administrator
9291
* Service support administrator
92+
* SharePoint administrator
9393
* Skype for Business administrator
9494
* User administrator
9595

‎articles/active-directory/authentication/howto-password-smart-lockout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Smart lockout tracks the last three bad password hashes to avoid incrementing th
2828
> [!NOTE]
2929
> Hash tracking functionality isn't available for customers with pass-through authentication enabled as authentication happens on-premises not in the cloud.
3030
31-
Federated deployments that use AD FS 2016 and AF FS 2019 can enable similar benefits using [AD FS Extranet Lockout and Extranet Smart Lockout](/windows-server/identity/ad-fs/operations/configure-ad-fs-extranet-smart-lockout-protection).
31+
Federated deployments that use AD FS 2016 and AD FS 2019 can enable similar benefits using [AD FS Extranet Lockout and Extranet Smart Lockout](/windows-server/identity/ad-fs/operations/configure-ad-fs-extranet-smart-lockout-protection).
3232

3333
Smart lockout is always on, for all Azure AD customers, with these default settings that offer the right mix of security and usability. Customization of the smart lockout settings, with values specific to your organization, requires Azure AD Premium P1 or higher licenses for your users.
3434

‎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

0 commit comments

Comments
 (0)