summaryrefslogtreecommitdiff
path: root/doc/user/group
diff options
context:
space:
mode:
authorFabio Papa <fabtheman@gmail.com>2019-07-01 15:29:54 -0700
committerFabio Papa <fabtheman@gmail.com>2019-07-19 11:55:49 -0700
commit23d66e0b854a229e4535175f8a12acbe0330ac0f (patch)
treed0356767efb4773d981d00a1d3f4d7e2029409b6 /doc/user/group
parentaa6c7811e9a9e7c1f2023ddc623b12b0351a94be (diff)
downloadgitlab-ce-23d66e0b854a229e4535175f8a12acbe0330ac0f.tar.gz
Adjust the documentation on subgroups
Diffstat (limited to 'doc/user/group')
-rw-r--r--doc/user/group/subgroups/index.md15
1 files changed, 9 insertions, 6 deletions
diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md
index 1c6cca049c5..e3f7539a9b6 100644
--- a/doc/user/group/subgroups/index.md
+++ b/doc/user/group/subgroups/index.md
@@ -75,13 +75,16 @@ structure.
## Creating a subgroup
NOTE: **Note:**
-You must be an Owner of a group to create a subgroup. For
-more information check the [permissions table](../../permissions.md#group-members-permissions).
+In order to create a subgroup you must either be an Owner or a Maintainer of the
+group, depending on the group's setting. By default groups allow both Owners and
+Maintainers to create subgroups, but this can be changed by an Owner or
+Administrator to only allow Owners to create subgroups. For more information
+check the [permissions table](../../permissions.md#group-members-permissions).
For a list of words that are not allowed to be used as group names see the
-[reserved names](../../reserved_names.md).
-Users can always create subgroups if they are explicitly added as an Owner to
-a parent group, even if group creation is disabled by an administrator in their
-settings.
+[reserved names](../../reserved_names.md). Users can always create subgroups if
+they are explicitly added as an Owner (or Maintainer, if that setting is
+enabled) to a parent group, even if group creation is disabled by an
+administrator in their settings.
To create a subgroup: