Add latest changes from gitlab-org/gitlab@14-0-stable-ee

6 files changed, 32 insertions, 24 deletions

diff --git a/doc/user/admin_area/geo_nodes.md b/doc/user/admin_area/geo_nodes.md
index 32b1555c33d..19a76d0938b 100644
--- a/doc/user/admin_area/geo_nodes.md
+++ b/doc/user/admin_area/geo_nodes.md
@@ -10,7 +10,10 @@ type: howto
 You can configure various settings for GitLab Geo nodes. For more information, see
 [Geo documentation](../../administration/geo/index.md).
 
-On the primary node, go to **Admin Area > Geo**. On secondary nodes, go to **Admin Area > Geo > Nodes**.
+On either the primary or secondary node:
+
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **Geo > Nodes**.
 
 ## Common settings
 
@@ -61,8 +64,13 @@ The **primary** node's Internal URL is used by **secondary** nodes to contact it
 [External URL](https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab)
 which is used by users. Internal URL does not need to be a private address.
 
-Internal URL defaults to External URL, but you can customize it under
-**Admin Area > Geo > Nodes**.
+Internal URL defaults to external URL, but you can also customize it:
+
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **Geo > Nodes**.
+1. Select **Edit** on the node you want to customize.
+1. Edit the internal URL.
+1. Select **Save changes**.
 
 WARNING:
 We recommend using an HTTPS connection while configuring the Geo nodes. To avoid
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index 104ea57db4a..15fbb442752 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -79,7 +79,7 @@ You can give a user access to all projects in a group.
 1. On the top bar, select **Menu > Groups**.
 1. Select **Your Groups**.
 1. Find your group and select it.
-1. From the left sidebar, select **Members**.
+1. From the left sidebar, select **Group information > Members**.
 1. Fill in the fields.
    - The role applies to all projects in the group. [Learn more about permissions](../permissions.md).
    - On the **Access expiration date**, the user can no longer access projects in the group.
@@ -118,11 +118,11 @@ You can change the owner of a group. Each group must always have at least one
 member with the [Owner role](../permissions.md#group-members-permissions).
 
 - As an administrator:
-  1. Go to the group and from the left menu, select **Members**.
+  1. Go to the group and from the left menu, select **Group information > Members**.
   1. Give a different member the **Owner** role.
   1. Refresh the page. You can now remove the **Owner** role from the original owner.
 - As the current group's owner:
-  1. Go to the group and from the left menu, select **Members**.
+  1. Go to the group and from the left menu, select **Group information > Members**.
   1. Give a different member the **Owner** role.
   1. Have the new owner sign in and remove the **Owner** role from you.
 
@@ -138,7 +138,7 @@ Prerequisites:
 To remove a member from a group:
 
 1. Go to the group.
-1. From the left menu, select **Members**.
+1. From the left menu, select **Group information > Members**.
 1. Next to the member you want to remove, select **Delete**.
 1. Optional. On the **Remove member** confirmation box, select the
   **Also unassign this user from linked issues and merge requests** checkbox.
@@ -156,7 +156,7 @@ To find members in a group, you can sort, filter, or search.
 
 Filter a group to find members. By default, all members in the group and subgroups are displayed.
 
-1. Go to the group and select **Members**.
+1. Go to the group and select **Group information > Members**.
 1. Above the list of members, in the **Filter members** box, enter filter criteria.
    - To view members in the group only, select **Membership = Direct**.
    - To view members of the group and its subgroups, select **Membership = Inherited**.
@@ -166,7 +166,7 @@ Filter a group to find members. By default, all members in the group and subgrou
 
 You can search for members by name, username, or email.
 
-1. Go to the group and select **Members**.
+1. Go to the group and select **Group information > Members**.
 1. Above the list of members, in the **Filter members** box, enter search criteria.
 1. To the right of the **Filter members** box, select the magnifying glass (**{search}**).
 
@@ -174,7 +174,7 @@ You can search for members by name, username, or email.
 
 You can sort members by **Account**, **Access granted**, **Max role**, or **Last sign-in**.
 
-1. Go to the group and select **Members**.
+1. Go to the group and select **Group information > Members**.
 1. Above the list of members, on the top right, from the **Account** list, select
    the criteria to filter by.
 1. To switch the sort between ascending and descending, to the right of the **Account** list, select the
@@ -273,7 +273,7 @@ To share a given group, for example, `Frontend` with another group, for example,
 `Engineering`:
 
 1. Go to the `Frontend` group.
-1. From the left menu, select **Members**.
+1. From the left menu, select **Group information > Members**.
 1. Select the **Invite group** tab.
 1. In the **Select a group to invite** list, select `Engineering`.
 1. For the **Max role**, select a [role](../permissions.md).
@@ -297,7 +297,7 @@ In GitLab 13.11, you can optionally replace the sharing form with a modal window
 To share a group after enabling this feature:
 
 1. Go to your group's page.
-1. In the left sidebar, go to **Members**, and then select **Invite a group**.
+1. In the left sidebar, go to **Group information > Members**, and then select **Invite a group**.
 1. Select a group, and select a **Max role**.
 1. (Optional) Select an **Access expiration date**.
 1. Select **Invite**.
@@ -341,7 +341,7 @@ To create group links via filter:
 
 LDAP user permissions can be manually overridden by an administrator. To override a user's permissions:
 
-1. Go to your group's **Members** page.
+1. Go to your group's **Group information > Members** page.
 1. In the row for the user you are editing, select the pencil (**{pencil}**) icon.
 1. Select the brown **Edit permissions** button in the modal.
 
diff --git a/doc/user/project/members/index.md b/doc/user/project/members/index.md
index ab33ff0f6d8..11d6bfb5d0c 100644
--- a/doc/user/project/members/index.md
+++ b/doc/user/project/members/index.md
@@ -21,7 +21,7 @@ Prerequisite:
 
 To add a user to a project:
 
-1. Go to your project and select **Members**.
+1. Go to your project and select **Project information > Members**.
 1. On the **Invite member** tab, under **GitLab member or Email address**, type the username or email address.
    In GitLab 13.11 and later, you can [replace this form with a modal window](#add-a-member-modal-window).
 1. Select a [role](../../permissions.md). 
@@ -52,7 +52,7 @@ Prerequisite:
 
 To add groups to a project:
 
-1. Go to your project and select **Members**.
+1. Go to your project and select **Project information > Members**.
 1. On the **Invite group** tab, under **Select a group to invite**, choose a group.
 1. Select the highest max [role](../../permissions.md) for users in the group. 
 1. Optional. Choose an expiration date. On that date, the user can no longer access the project.
@@ -75,7 +75,7 @@ Prerequisite:
 
 To import users:
 
-1. Go to your project and select **Members**.
+1. Go to your project and select **Project information > Members**.
 1. On the **Invite member** tab, at the bottom of the panel, select **Import**.
 1. Select the project. You can view only the projects for which you're a maintainer.
 1. Select **Import project members**.
@@ -113,7 +113,7 @@ Prerequisite:
 
 To remove a member from a project:
 
-1. Go to your project and select **Members**.
+1. Go to your project and select **Project information > Members**.
 1. Next to the project member you want to remove, select **Remove member** **{remove}**.
 1. Optional. In the confirmation box, select the **Also unassign this user from related issues and merge requests** checkbox.
 1. Select **Remove member**.
@@ -128,7 +128,7 @@ You can filter and sort members in a project.
 
 ### Display inherited members
 
-1. Go to your project and select **Members**.
+1. Go to your project and select **Project information > Members**.
 1. In the **Filter members** box, select `Membership` `=` `Inherited`.
 1. Press Enter.
 
@@ -136,7 +136,7 @@ You can filter and sort members in a project.
 
 ### Display direct members
 
-1. Go to your project and select **Members**.
+1. Go to your project and select **Project information > Members**.
 1. In the **Filter members** box, select `Membership` `=` `Direct`.
 1. Press Enter.
 
@@ -205,7 +205,7 @@ This feature might not be available to you. Check the **version history** note a
 In GitLab 13.11, you can optionally replace the form to add a member with a modal window.
 To add a member after enabling this feature:
 
-1. Go to your project and select **Members**.
+1. Go to your project and select **Project information > Members**.
 1. Select **Invite members**.
 1. Enter an email address and select a role.
 1. Optional. Select an **Access expiration date**.
diff --git a/doc/user/project/members/share_project_with_groups.md b/doc/user/project/members/share_project_with_groups.md
index caef5ef60b7..353ce73329e 100644
--- a/doc/user/project/members/share_project_with_groups.md
+++ b/doc/user/project/members/share_project_with_groups.md
@@ -27,7 +27,7 @@ This is where the group sharing feature can be of use.
 
 To share 'Project Acme' with the 'Engineering' group:
 
-1. For 'Project Acme' use the left navigation menu to go to **Members**.
+1. For 'Project Acme' use the left navigation menu to go to **Project information > Members**.
 1. Select the **Invite group** tab.
 1. Add the 'Engineering' group with the maximum access level of your choice.
 1. Optionally, select an expiring date.
@@ -59,7 +59,7 @@ In GitLab 13.11, you can optionally replace the sharing form with a modal window
 To share a project after enabling this feature:
 
 1. Go to your project's page.
-1. In the left sidebar, go to **Members**, and then select **Invite a group**.
+1. In the left sidebar, go to **Project information > Members**, and then select **Invite a group**.
 1. Select a group, and select a **Max role**.
 1. (Optional) Select an **Access expiration date**.
 1. Select **Invite**.
diff --git a/doc/user/project/merge_requests/allow_collaboration.md b/doc/user/project/merge_requests/allow_collaboration.md
index 63d5119c1b4..5d1a04e1fe0 100644
--- a/doc/user/project/merge_requests/allow_collaboration.md
+++ b/doc/user/project/merge_requests/allow_collaboration.md
@@ -87,7 +87,7 @@ To see the pipeline status from the merge request page of a forked project
 going back to the original project:
 
 1. Create a group containing all the upstream members.
-1. Go to the **Members** tab in the forked project and invite the newly-created
+1. Go to the **Project information > Members** page in the forked project and invite the newly-created
    group to the forked project.
 
 <!-- ## Troubleshooting
diff --git a/doc/user/project/settings/project_access_tokens.md b/doc/user/project/settings/project_access_tokens.md
index be8a961d6c0..d7121239610 100644
--- a/doc/user/project/settings/project_access_tokens.md
+++ b/doc/user/project/settings/project_access_tokens.md
@@ -49,7 +49,7 @@ For the bot:
 
 API calls made with a project access token are associated with the corresponding bot user.
 
-These bot users are included in a project's **Members** list but cannot be modified. Also, a bot
+These bot users are included in a project's **Project information > Members** list but cannot be modified. Also, a bot
 user cannot be added to any other project.
 
 - The username is set to `project_{project_id}_bot` for the first access token, such as `project_123_bot`.