Skip to content

Commit 622e786

Browse files
authored
Merge pull request #252296 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 093269f + bc6817b commit 622e786

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ When using [pass-through authentication](../hybrid/connect/how-to-connect-pta.md
4747
For example, if you want your Microsoft Entra smart lockout duration to be higher than AD DS, then Microsoft Entra ID would be 120 seconds (2 minutes) while your on-premises AD is set to 1 minute (60 seconds). If you want your Microsoft Entra lockout threshold to be 5, then you want your on-premises AD lockout threshold to be 10. This configuration would ensure smart lockout prevents your on-premises AD accounts from being locked out by brute force attacks on your Microsoft Entra accounts.
4848

4949
> [!IMPORTANT]
50-
> Currently, an administrator can't unlock the users' cloud accounts if they have been locked out by the Smart Lockout capability. The administrator must wait for the lockout duration to expire. However, the user can unlock by using self-service password reset (SSPR) from a trusted device or location.
50+
> An administrator can unlock the users' cloud account if they have been locked out by the Smart Lockout capability, without the need of waiting for the lockout duration to expire. For more information, see [Reset a user's password using Azure Active Directory](../fundamentals/users-reset-password-azure-portal.md).
5151
5252
## Verify on-premises account lockout policy
5353

articles/azure-monitor/agents/azure-monitor-agent-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Before you begin migrating from the Log Analytics agent to Azure Monitor Agent,
9090
9191
Azure Monitor Agent is generally available for data collection. Most services that used Log Analytics agent for data collection have migrated to Azure Monitor Agent.
9292
93-
The following features and services now have and Azure Monitor Agent versoion (some are still in Public Preview). This means you can already choose to use Azure Monitor Agent to collect data when you enable the feature or service.
93+
The following features and services now have and Azure Monitor Agent version (some are still in Public Preview). This means you can already choose to use Azure Monitor Agent to collect data when you enable the feature or service.
9494
9595
| Service or feature | Migration recommendation | Other extensions installed | More information |
9696
| :--- | :--- | :--- | :--- |

0 commit comments

Comments
 (0)