Skip to content

Commit e07f61a

Browse files
Banani-RathBanani-Rath
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 20768c4 + e6a0573 commit e07f61a

File tree

726 files changed

+1758
-6750
lines changed

Some content is hidden

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

726 files changed

+1758
-6750
lines changed

‎.openpublishing.redirection.json

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

‎.openpublishing.redirection.synapse-analytics.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
"source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-partner-system-integration.md",
3535
"redirect_url": "/azure/synapse-analytics/partner/system-integration",
3636
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/guidance-for-loading-data.md",
40+
"redirect_url": "/azure/synapse-analytics/sql/data-loading-best-practices",
41+
"redirect_document_id": false
3742
}
38-
3943
]
4044
}

‎articles/active-directory/authentication/active-directory-passwords-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ additionalContent: |
322322
## Next steps
323323
* [How do I complete a successful rollout of SSPR?](howto-sspr-deployment.md)
324324
* [Reset or change your password](../user-help/active-directory-passwords-update-your-own-password.md)
325-
* [Register for self-service password reset](../user-help/active-directory-passwords-reset-register.md)
325+
* [Register for self-service password reset](https://support.microsoft.com/account-billing/register-the-password-reset-verification-method-for-a-work-or-school-account-47a55d4a-05b0-4f67-9a63-f39a43dbe20a)
326326
* [Do you have a licensing question?](concept-sspr-licensing.md)
327327
* [What data is used by SSPR and what data should you populate for your users?](howto-sspr-authenticationdata.md)
328328
* [What authentication methods are available to users?](concept-sspr-howitworks.md#authentication-methods)

‎articles/active-directory/authentication/howto-sspr-reporting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ The following list explains this activity in detail:
172172
* [SSPR and MFA usage and insights reporting](./howto-authentication-methods-activity.md)
173173
* [How do I complete a successful rollout of SSPR?](howto-sspr-deployment.md)
174174
* [Reset or change your password](../user-help/active-directory-passwords-update-your-own-password.md).
175-
* [Register for self-service password reset](../user-help/active-directory-passwords-reset-register.md).
175+
* [Register for self-service password reset](https://support.microsoft.com/account-billing/register-the-password-reset-verification-method-for-a-work-or-school-account-47a55d4a-05b0-4f67-9a63-f39a43dbe20a).
176176
* [Do you have a licensing question?](concept-sspr-licensing.md)
177177
* [What data is used by SSPR and what data should you populate for your users?](howto-sspr-authenticationdata.md)
178178
* [What authentication methods are available to users?](concept-sspr-howitworks.md#authentication-methods)

‎articles/active-directory/authentication/troubleshoot-sspr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Use the following information to understand the problem and what needs to be cor
123123
| SsprNotEnabledInUserPolicy = 11 | We're sorry, you can't reset your password at this time because your administrator has not configured password reset for your organization. There is no further action you can take to resolve this situation. Contact your admin and ask them to configure password reset.<br /><br />To learn more about password reset configuration, see [Quickstart: Azure AD self-service password reset](./tutorial-enable-sspr.md). | SSPR_0011: Your organization has not defined a password reset policy. Please contact your admin and ask them to define a password reset policy. |
124124
| UserNotLicensed = 12 | We're sorry, you can't reset your password at this time because required licenses are missing from your organization. There is no further action you can take to resolve this situation. Please contact your admin and ask them to check your license assignment.<br /><br />To learn more about licensing, see [Licensing requirements for Azure AD self-service password reset](./concept-sspr-licensing.md). | SSPR_0012: Your organization does not have the required licenses necessary to perform password reset. Please contact your admin and ask them to review the license assignments. |
125125
| UserNotMemberOfScopedAccessGroup = 13 | We're sorry, you can't reset your password at this time because your administrator has not configured your account to use password reset. There is no further action you can take to resolve this situation. Please contact your admin and ask them to configure your account for password reset.<br /><br />To learn more about account configuration for password reset, see [Roll out password reset for users](./howto-sspr-deployment.md). | SSPR_0013: You are not a member of a group enabled for password reset. Contact your admin and request to be added to the group. |
126-
| UserNotProperlyConfigured = 14 | We're sorry, you can't reset your password at this time because necessary information is missing from your account. There is no further action you can take to resolve this situation. Please contact you admin and ask them to reset your password for you. After you have access to your account again, you need to register the necessary information.<br /><br />To register information, follow the steps in the [Register for self-service password reset](../user-help/active-directory-passwords-reset-register.md) article. | SSPR_0014: Additional security info is needed to reset your password. To proceed, contact your admin and ask them to reset your password. After you have access to your account, you can register additional security info at https://aka.ms/ssprsetup. Your admin can add additional security info to your account by following the steps in [Set and read authentication data for password reset](howto-sspr-authenticationdata.md). |
126+
| UserNotProperlyConfigured = 14 | We're sorry, you can't reset your password at this time because necessary information is missing from your account. There is no further action you can take to resolve this situation. Please contact you admin and ask them to reset your password for you. After you have access to your account again, you need to register the necessary information.<br /><br />To register information, follow the steps in the [Register for self-service password reset](https://support.microsoft.com/account-billing/register-the-password-reset-verification-method-for-a-work-or-school-account-47a55d4a-05b0-4f67-9a63-f39a43dbe20a) article. | SSPR_0014: Additional security info is needed to reset your password. To proceed, contact your admin and ask them to reset your password. After you have access to your account, you can register additional security info at https://aka.ms/ssprsetup. Your admin can add additional security info to your account by following the steps in [Set and read authentication data for password reset](howto-sspr-authenticationdata.md). |
127127
| OnPremisesAdminActionRequired = 29 | We're sorry, we can't reset your password at this time because of a problem with your organization's password reset configuration. There is no further action you can take to resolve this situation. Please contact your admin and ask them to investigate. <br /><br />Or<br /><br />We cannot reset your password at this time because of a problem with your organization's password reset configuration. There is no further action you can take to resolve this issue. Please contact your admin and ask them to investigate.<br /><br />To learn more about the potential problem, see [Troubleshoot password writeback](troubleshoot-sspr-writeback.md). | SSPR_0029: We are unable to reset your password due to an error in your on-premises configuration. Please contact your admin and ask them to investigate. |
128128
| OnPremisesConnectivityError = 30 | We're sorry, we can't reset your password at this time because of connectivity issues to your organization. There is no action to take right now, but the problem might be resolved if you try again later. If the problem persists, please contact your admin and ask them to investigate.<br /><br />To learn more about connectivity issues, see [Troubleshoot password writeback connectivity](troubleshoot-sspr-writeback.md). | SSPR_0030: We can't reset your password due to a poor connection with your on-premises environment. Contact your admin and ask them to investigate.|
129129

‎articles/active-directory/fundamentals/whats-new-archive.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3189,7 +3189,7 @@ User-assigned managed identities are now generally available for Virtual Machine
31893189

31903190
Users who have registered a mobile app with your organization can now reset their own password by approving a notification from the Microsoft Authenticator app or by entering a code from their mobile app or hardware token.
31913191

3192-
For more information, see [How it works: Azure AD self-service password reset](../authentication/concept-sspr-howitworks.md). For more information about the user experience, see [Reset your own work or school password overview](../user-help/active-directory-passwords-reset-register.md).
3192+
For more information, see [How it works: Azure AD self-service password reset](../authentication/concept-sspr-howitworks.md). For more information about the user experience, see [Reset your own work or school password overview](https://support.microsoft.com/account-billing/register-the-password-reset-verification-method-for-a-work-or-school-account-47a55d4a-05b0-4f67-9a63-f39a43dbe20a).
31933193

31943194
---
31953195

‎articles/active-directory/user-help/active-directory-passwords-reset-register.md

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)