repo sync

content/admin/user-management/managing-users-in-your-enterprise/index.md

@@ -21,6 +21,8 @@ children:
   - /roles-in-an-enterprise
   - /best-practices-for-user-security
   - /inviting-people-to-manage-your-enterprise
+  - /managing-invitations-to-organizations-within-your-enterprise
+  - /managing-organization-members-in-your-enterprise
   - /promoting-or-demoting-a-site-administrator
   - /managing-support-entitlements-for-your-enterprise
   - /viewing-people-in-your-enterprise
@@ -37,4 +39,3 @@ children:
   - /rebuilding-contributions-data
 shortTitle: Manage users
 ---
-

content/admin/user-management/managing-users-in-your-enterprise/managing-invitations-to-organizations-within-your-enterprise.md

@@ -0,0 +1,39 @@
+---
+title: Managing invitations to organizations within your enterprise
+intro: 'You can retry or cancel invitations to organizations within your enterprise, either one by one or multiple at a time.'
+versions:
+  feature: enterprise-manage-organization-members
+type: how_to
+topics:
+  - Administrator
+  - Enterprise
+  - Organizations
+shortTitle: Manage organization invitations
+permissions: Enterprise owners can manage invitations to organizations within their enterprise.
+---
+
+## Retrying or canceling expired invitations
+
+Invitations expire after 7 days. You can retry or cancel expired invitations, either one by one or multiple at a time. Failed invitations to outside collaborators can also be found in this view.
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.people-tab %}
+1. Under "{% octicon "person" aria-label="The People icon" %} People", click **Failed invitations**.
+
+   ![Screenshot of the Failed invitations tab](/assets/images/help/business-accounts/enterprise-failed-invitations.png)
+
+1. To retry or cancel a single invitation, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} to the right of the invitation, and select **Retry invitation** or **Cancel invitation**.
+
+   ![Screenshot of the failed invitations page with the dropdown to retry or cancel the invitation emphasized](/assets/images/help/business-accounts/enterprise-invitation-retry-or-cancel.png)
+
+2. To confirm, click **Yes, retry** or **Yes, remove** in the pop-up.
+
+   ![Screenshot of the retry invitation pop-up](/assets/images/help/business-accounts/retry-invitation-pop-up-enterprise.png)
+
+3. Optionally, to retry or cancel multiple invitations at the same time, select the checkboxes next to the invitations. Click the dropdown at the top of the list and select **Retry invitations** or **Cancel invitations**.
+
+   ![Screenshot of the dropdown to edit multiple invitations](/assets/images/help/enterprises/enterprise-invitations-multiple-selection.png)
+
+4. Optionally, to retry or cancel all invitations on the page, check the box at the top of the list, and click **Retry invitations** or **Cancel invitations**.
+
+   ![Screenshot of the dropdown to bulk edit all invitations on the page](/assets/images/help/enterprises/enterprise-invitations-bulk-select.png)

content/admin/user-management/managing-users-in-your-enterprise/managing-organization-members-in-your-enterprise.md

@@ -0,0 +1,44 @@
+---
+title: Managing organization members in your enterprise
+intro: 'You can add or remove members from an organization in bulk.'
+permissions: Enterprise owners can add or remove organization members in bulk.
+versions:
+  feature: enterprise-manage-organization-members
+type: how_to
+topics:
+  - Enterprise
+  - Organizations
+shortTitle: Managing organization members
+---
+
+Enterprise members that are added to an organization via the bulk method will not receive an email inviting them to the organization. They are added immediately as a member to the selected organizations.
+
+Members can also be added or removed from an organization at the organization level. For more information, see {% ifversion ghec %}"[Inviting users to join your organization](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)"{% else %}"[Adding people to your organization](/organizations/managing-membership-in-your-organization/adding-people-to-your-organization)"{% endif %} and "[Removing a member from your organization](/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization)."
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.people-tab %}
+1. To add or remove a user from an organization, select the checkbox next to the user's name, and use the dropdown to select **Add to organizations** or **Remove from organizations**.
+
+   {% note %}
+
+   **Note:**
+   - Users will be added as organization members. If the user is already an organization member or organization admin, the privileges will not be modified.
+   - Organization admins cannot be removed from the organization via the bulk method.
+
+   {% endnote %}
+
+   ![Screenshot of the dropdown to add or remove a user from organizations](/assets/images/help/business-accounts/enterprise-add-or-remove-from-org.png)
+
+2. In the popup, select the organizations you want to add or remove the user from.
+
+    {% note %}
+
+    **Note:** Only organizations that you're an owner of can be selected.
+
+    {% endnote %}
+
+3. To confirm, click **Add user** or **Remove user**.
+
+   ![Screenshot of the "Add user" button in the "Add users to organizations" modal](/assets/images/help/business-accounts/add-user-to-org.png)
+
+4. Optionally, to add or remove multiple users at the same time, select multiple checkboxes. Use the dropdown to select **Add to organizations** or **Remove from organizations**.

content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md

@@ -10,6 +10,9 @@ versions:
 permissions: Organization owners can add people to an organization.
 shortTitle: Add people to organization
 ---
+{% ifversion organization-invitation-enhancements %}
+## Adding people to your organization
+{% endif %}
 
 {% ifversion not ghae %}
 If your organization [requires members to use two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization), users must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before you can add them to the organization.
@@ -26,5 +29,17 @@ If your organization [requires members to use two-factor authentication](/articl
 {% data reusables.organizations.add-user-to-teams %}
 {% data reusables.organizations.send-invitation %}
 
+{% ifversion organization-invitation-enhancements %}
+## Retrying or canceling expired invitations
+
+Invitations expire after 7 days. You can retry or cancel expired invitations, either one by one or in bulk. Failed invitations to outside collaborators can also be found in this view.
+
+{% data reusables.profile.access_org %}
+{% data reusables.user-settings.access_org %}
+{% data reusables.organizations.people %}
+{% data reusables.organizations.retrying-or-deleting-expired-invitations %}
+
+{% endif %}
+
 ## Further reading
 - "[Adding organization members to a team](/articles/adding-organization-members-to-a-team)"

content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md

@@ -16,14 +16,19 @@ shortTitle: Cancel or edit invitation
 {% data reusables.profile.access_org %}
 {% data reusables.user-settings.access_org %}
 {% data reusables.organizations.people %}
-4. On the People tab, click **Pending invitation**.
- ![Pending invitation link](/assets/images/help/organizations/pending-invitation-link.png)
-5. Next to the username or email address of the person whose invitation you'd like to edit or cancel, click **Edit invitation**.
-![Edit invitation button](/assets/images/help/organizations/edit-invitation-button.png)
+1. On the People tab, click **Pending invitation**.
+
+   ![Screenshot of pending invitation link](/assets/images/help/organizations/pending-invitation-link.png)
+
+1. Next to the username or email address of the person whose invitation you'd like to edit or cancel, click **Edit invitation**.
+
+   ![Screenshot of edit invitation button](/assets/images/help/organizations/edit-invitation-button.png)
 
  You may need to click **View all invitations** at the bottom of the window to find the person you're looking for.
-6. Decide whether to edit or cancel the user's invitation to join your organization.
-  ![Update invitation and cancel invitation buttons](/assets/images/help/organizations/update-cancel-invitation-buttons-for-dotcom-and-2.8.png)
+1. Decide whether to edit or cancel the user's invitation to join your organization.
+
+   ![Screenshot of update invitation and cancel invitation buttons](/assets/images/help/organizations/update-cancel-invitation-buttons-for-dotcom-and-2.8.png)
+
     - To edit the user's invitation, select a different role or team, then click **Update invitation**.
     - To cancel the user's invitation to join your organization, click **Cancel invitation**.
 

content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md

@@ -17,7 +17,7 @@ shortTitle: Invite users to join
 
 ## About organization invitations
 
-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)." 
+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 %}
 
@@ -38,5 +38,16 @@ If your organization requires members to use two-factor authentication, users th
 {% data reusables.organizations.send-invitation %}
 {% data reusables.organizations.user_must_accept_invite_email %} {% data reusables.organizations.cancel_org_invite %}
 
+{% ifversion organization-invitation-enhancements %}
+## Retrying or canceling expired invitations
+
+Invitations expire after 7 days. You can retry or cancel expired invitations, either one by one or in bulk. Failed invitations to outside collaborators can also be found in this view.
+
+{% data reusables.profile.access_org %}
+{% data reusables.user-settings.access_org %}
+{% data reusables.organizations.people %}
+{% data reusables.organizations.retrying-or-deleting-expired-invitations %}
+{% endif %}
+
 ## Further reading
 - "[Adding organization members to a team](/articles/adding-organization-members-to-a-team)"

data/features/enterprise-manage-organization-members.yml

@@ -0,0 +1,6 @@
+# Issue #8727
+# Documentation for organization invitation enhancements
+versions:
+  ghec: '*'
+  ghes: '>=3.9'
+  ghae: '>=3.9'

data/features/organization-invitation-enhancements.yml

@@ -0,0 +1,7 @@
+# Issue #8727
+# Documentation for organization invitation enhancements
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.9'
+  ghae: '>=3.9'

data/reusables/organizations/invite_member_from_people_tab.md

@@ -1,4 +1,5 @@
-{% ifversion fpt or ghec %}1. On the People tab, click **Invite member**.
+{% ifversion fpt or ghec %}
+1. On the People tab, click **Invite member**.
   ![Invite member button](/assets/images/help/organizations/people-tab-invite-member.png){% else %}
 1. On the People tab, click **Add member**.
   ![Add member button](/assets/images/help/organizations/people-tab-invite-member-ghe.png){% endif %}

data/reusables/organizations/people.md

@@ -1,6 +1,4 @@
 1. Under your organization name, click {% octicon "person" aria-label="The Person icon" %} **People**.
-  {% ifversion fpt or ghes or ghec %}
-  ![The People tab](/assets/images/help/organizations/organization-people-tab-with-overview-tab.png)
-  {% else %}
-  ![The People tab](/assets/images/help/organizations/organization-people-tab.png)
-  {% endif %}
+   {% ifversion fpt or ghes or ghec %}
+   ![The People tab](/assets/images/help/organizations/organization-people-tab-with-overview-tab.png){% else %}
+   ![The People tab](/assets/images/help/organizations/organization-people-tab.png){% endif %}

data/reusables/organizations/retrying-or-deleting-expired-invitations.md

@@ -0,0 +1,19 @@
+1. To view all expired and failed invitations, click **Failed invitations**, under "Organization permissions" on the left.
+
+   ![Screenshot of the people tab with the failed invitations option emphasized](/assets/images/help/organizations/organization-failed-invitations.png)
+
+2. To retry or cancel a single invitation, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %} next to the expiration warning, and select **Retry invitation** or **Cancel invitation**.
+
+   ![Screenshot of the failed invitations view with the retry and cancel invitation options highlighted](/assets/images/help/organizations/retry-or-cancel-invitation.png)
+
+3. To confirm, click **Retry invitation** or **Cancel invitation** in the pop-up.
+
+   ![Screenshot of the retry invitation pop-up](/assets/images/help/organizations/retry-invitation-pop-up.png)
+
+4. Optionally, to retry or cancel multiple invitations at the same time, select the checkboxes next to the invitations. Click the dropdown at the top of the list and select **Retry invitations** or **Cancel invitations**.
+
+   ![Screenshot of the dropdown to edit multiple invitations](/assets/images/help/organizations/organization-invitations-multiple-selection.png)
+
+5. Optionally, to retry or cancel all invitations on the page, check the box at the top of the list, and click **Retry invitations** or **Cancel invitations**.
+
+   ![Screenshot of the dropdown to bulk edit all invitations on the page](/assets/images/help/organizations/organization-invitations-bulk-select.png)