diff --git a/data/reusables/enterprise-accounts/dormant-user-activity-threshold.md b/data/reusables/enterprise-accounts/dormant-user-activity-threshold.md index 6110208758..534d9c25e0 100644 --- a/data/reusables/enterprise-accounts/dormant-user-activity-threshold.md +++ b/data/reusables/enterprise-accounts/dormant-user-activity-threshold.md @@ -1 +1 @@ -{% ifversion not ghec%}By default, a{% else %}A{% endif %} personal account is considered to be dormant if it has not been active for 90 days. {% ifversion not ghec %}You can configure the length of time a user must be inactive to be considered dormant{% ifversion ghes%} and choose to suspend dormant users to release user licenses{% endif %}.{% endif %} +{% ifversion not ghec%}By default, a{% else %}A{% endif %} user account is considered to be dormant if it has not been active for 90 days. {% ifversion not ghec %}You can configure the length of time a user must be inactive to be considered dormant{% ifversion ghes%} and choose to suspend dormant users to release user licenses{% endif %}.{% endif %} diff --git a/data/reusables/enterprise_management_console/username_normalization.md b/data/reusables/enterprise_management_console/username_normalization.md index 08151beba6..33b717ca48 100644 --- a/data/reusables/enterprise_management_console/username_normalization.md +++ b/data/reusables/enterprise_management_console/username_normalization.md @@ -2,4 +2,4 @@ Usernames created from email addresses are created from the normalized characters that precede the `@` character. -If multiple accounts are normalized into the same {% data variables.product.prodname_ghe_server %} username, only the first personal account is created. Subsequent people with the same username won't be able to sign in. +If multiple accounts are normalized into the same {% data variables.product.prodname_ghe_server %} username, only the first user account is created. Subsequent users with the same username won't be able to sign in. diff --git a/data/reusables/enterprise_site_admin_settings/invite-user-reset-link.md b/data/reusables/enterprise_site_admin_settings/invite-user-reset-link.md index 7354e863d1..500abda5ab 100644 --- a/data/reusables/enterprise_site_admin_settings/invite-user-reset-link.md +++ b/data/reusables/enterprise_site_admin_settings/invite-user-reset-link.md @@ -1,2 +1,2 @@ -1. Type the username and email address for each of the personal accounts that you'd like to create, then click **Generate a password reset link**. +1. Type the username and email address for each of the user accounts that you'd like to create, then click **Generate a password reset link**. ![Generate a password reset link button](/assets/images/enterprise/site-admin-settings/generate-password-reset-link-button.png) diff --git a/data/reusables/saml/assert-the-administrator-attribute.md b/data/reusables/saml/assert-the-administrator-attribute.md index be6d7b8a66..e94ebc5b94 100644 --- a/data/reusables/saml/assert-the-administrator-attribute.md +++ b/data/reusables/saml/assert-the-administrator-attribute.md @@ -1 +1 @@ -To make a person an enterprise owner, you must delegate ownership permission in your IdP. Include the `administrator` attribute in the SAML assertion for the personal account on the IdP, with the value of `true`. For more information about enterprise owners, see "[Roles in an enterprise](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)." +To make a person an enterprise owner, you must delegate ownership permission in your IdP. Include the `administrator` attribute in the SAML assertion for the user account on the IdP, with the value of `true`. For more information about enterprise owners, see "[Roles in an enterprise](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)." diff --git a/data/reusables/saml/saml-accounts.md b/data/reusables/saml/saml-accounts.md index cfb5746ae3..b49d8a07cf 100644 --- a/data/reusables/saml/saml-accounts.md +++ b/data/reusables/saml/saml-accounts.md @@ -1,4 +1,4 @@ -If you configure SAML SSO, members of your organization will continue to log into their personal accounts on {% data variables.product.prodname_dotcom_the_website %}. When a member accesses non-public resources within your organization that uses SAML SSO, {% data variables.product.prodname_dotcom %} redirects the member to your IdP to authenticate. After successful authentication, your IdP redirects the member back to {% data variables.product.prodname_dotcom %}, where the member can access your organization's resources. +If you configure SAML SSO, members of your organization will continue to log into their user accounts on {% data variables.product.prodname_dotcom_the_website %}. When a member accesses non-public resources within your organization that uses SAML SSO, {% data variables.product.prodname_dotcom %} redirects the member to your IdP to authenticate. After successful authentication, your IdP redirects the member back to {% data variables.product.prodname_dotcom %}, where the member can access your organization's resources. {% note %} diff --git a/data/reusables/scim/after-you-configure-saml.md b/data/reusables/scim/after-you-configure-saml.md index 71431198b1..5380291f38 100644 --- a/data/reusables/scim/after-you-configure-saml.md +++ b/data/reusables/scim/after-you-configure-saml.md @@ -1 +1 @@ -By default, your IdP does not communicate with {% data variables.product.product_name %} automatically when you assign or unassign the application. {% data variables.product.product_name %} {% ifversion fpt or ghec %}provisions access to your resources on {% else %}creates a personal account {% endif %}using SAML Just-in-Time (JIT) provisioning the first time someone navigates to {% ifversion fpt or ghec %}your resources on {% endif %} {% data variables.product.product_name %} and signs in by authenticating through your IdP. You may need to manually notify users when you grant access to {% data variables.product.product_name %}, and you must manually {% ifversion fpt or ghec %}deprovision access {% else %}deactivate the personal account on {% endif %}{% data variables.product.product_name %} during offboarding. You can use SCIM to provision and deprovision {% ifversion fpt or ghec %}access to organizations owned by your enterprise on {% data variables.product.prodname_dotcom_the_website %} {% else %}personal accounts and access for {% data variables.product.product_name %} {% endif %}automatically when you assign or unassign the application on your IdP. +By default, your IdP does not communicate with {% data variables.product.product_name %} automatically when you assign or unassign the application. {% data variables.product.product_name %} {% ifversion fpt or ghec %}provisions access to your resources on {% else %}creates a user account {% endif %}using SAML Just-in-Time (JIT) provisioning the first time someone navigates to {% ifversion fpt or ghec %}your resources on {% endif %} {% data variables.product.product_name %} and signs in by authenticating through your IdP. You may need to manually notify users when you grant access to {% data variables.product.product_name %}, and you must manually {% ifversion fpt or ghec %}deprovision access {% else %}deactivate the user account on {% endif %}{% data variables.product.product_name %} during offboarding. You can use SCIM to provision and deprovision {% ifversion fpt or ghec %}access to organizations owned by your enterprise on {% data variables.product.prodname_dotcom_the_website %} {% else %}user accounts and access for {% data variables.product.product_name %} {% endif %}automatically when you assign or unassign the application on your IdP. diff --git a/data/reusables/scim/changes-should-come-from-idp.md b/data/reusables/scim/changes-should-come-from-idp.md index 43cf7622b1..d6b8dee0d9 100644 --- a/data/reusables/scim/changes-should-come-from-idp.md +++ b/data/reusables/scim/changes-should-come-from-idp.md @@ -1 +1 @@ -If SCIM provisioning is implemented for your organization, any changes to a user's organization membership should be triggered from the identity provider. If a user is invited to an organization manually instead of by an existing SCIM integration, their personal account may not get properly linked to their SCIM identity. This can prevent the personal account from being deprovisioned via SCIM in the future. If a user is removed manually instead of by an existing SCIM integration, a stale linked identity will remain, which can lead to issues if the user needs to re-join the organization. +If SCIM provisioning is implemented for your organization, any changes to a user's organization membership should be triggered from the identity provider. If a user is invited to an organization manually instead of by an existing SCIM integration, their user account may not get properly linked to their SCIM identity. This can prevent the user account from being deprovisioned via SCIM in the future. If a user is removed manually instead of by an existing SCIM integration, a stale linked identity will remain, which can lead to issues if the user needs to re-join the organization. diff --git a/data/reusables/scim/supported-idps.md b/data/reusables/scim/supported-idps.md index bc93aab2e5..8ac2514209 100644 --- a/data/reusables/scim/supported-idps.md +++ b/data/reusables/scim/supported-idps.md @@ -1,4 +1,4 @@ -The following IdPs can provision or deprovision personal accounts on {% data variables.product.product_location %} using SCIM. +The following IdPs can provision or deprovision user accounts on {% data variables.product.product_location %} using SCIM. {% ifversion ghae %} - Azure AD