diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md index 1be8340f50..d8b96e1513 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md @@ -19,9 +19,7 @@ shortTitle: Invite collaborators --- Repositories owned by an organization can grant more granular access. For more information, see "[Access permissions on {% data variables.product.product_name %}](/articles/access-permissions-on-github)." -{% ifversion fpt or ghes or ghae %} {% data reusables.organizations.org-invite-expiration %} -{% endif %} {% ifversion fpt %} diff --git a/content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md b/content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md index 462a61d2dc..5ad6ec6eff 100644 --- a/content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md +++ b/content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md @@ -20,7 +20,7 @@ For more information on products with per-user pricing, see "[{% data variables. ## How many licenses do I need for my organization? -Organization owners and members each fill a license. If you've sent a pending invitation to a prospective organization member, the invitation will fill a license. {% data reusables.organizations.org-invite-expiration %} +Organization owners and members each fill a license. If you've sent a pending invitation to a prospective organization member, the invitation will fill a license. {% data reusables.organizations.org-invite-scim %} Outside collaborators and bot accounts will count toward your organization's total of paid licenses if they are given access to a private repository. diff --git a/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md index 47122b9cdc..617d183d11 100644 --- a/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md @@ -17,7 +17,7 @@ shortTitle: Invite users to join {% tip %} **Tips**: -- If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %} +- If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)." {% data reusables.organizations.org-invite-scim %} - If your organization requires members to use two-factor authentication, users that you invite must enable two-factor authentication before accepting the invitation. For more information, see "[Requiring two-factor authentication in your organization](/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization)" and "[Securing your account with two-factor authentication (2FA)](/github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa)." {% endtip %} diff --git a/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md b/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md index 79ca68b882..4d7118f76d 100644 --- a/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md +++ b/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md @@ -35,7 +35,7 @@ If an organization member was removed from the organization because they did not {% endif %} {% ifversion fpt %} -If your organization has a paid per-user subscription, an unused license must be available before you can reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %} +If your organization has a paid per-user subscription, an unused license must be available before you can reinstate a former organization member. For more information, see "[About per-user pricing](/articles/about-per-user-pricing)." {% data reusables.organizations.org-invite-scim %} {% endif %} ## Reinstating a former member of your organization diff --git a/data/reusables/organizations/org-invite-scim.md b/data/reusables/organizations/org-invite-scim.md new file mode 100644 index 0000000000..519dc8bb55 --- /dev/null +++ b/data/reusables/organizations/org-invite-scim.md @@ -0,0 +1 @@ +Pending invitations will expire after 7 days, restoring any unclaimed licenses. If an invitation is generated by System for Cross-domain Identity Management (SCIM), the invitation will not expire.