Merge branch 'sselhorn-master-patch-00401' into 'master'

Added subgroup to usage list

See merge request gitlab-org/gitlab!54367

doc/.vale/gitlab/SubstitutionSuggestions.yml

@@ -18,4 +18,6 @@ swap:
   once the: '"after the"'
   once you: '"after you"'
   since: '"because" or "after"'
+  sub-group: '"subgroup"'
+  sub-groups: '"subgroups"'
   within: '"in"'

doc/.vale/gitlab/spelling-exceptions.txt

@@ -561,6 +561,8 @@ subfolder
 subfolders
 subgraph
 subgraphs
+subgroup
+subgroups
 subkey
 subkeys
 sublicense

doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md

@@ -563,7 +563,7 @@ service = ::Groups::TransferService.new(group, user)
 service.execute(parent_group)
 ```
 
-### Count unique users in a group and sub-groups
+### Count unique users in a group and subgroups
 
 ```ruby
 group = Group.find_by_path_or_name("groupname")

doc/administration/troubleshooting/navigating_gitlab_via_rails_console.md

@@ -443,7 +443,7 @@ group = Group.find_by_full_path('group/subgroup')
 # Get group's immediate child projects
 group.projects
 
-# Get group's child projects, including those in sub-groups
+# Get group's child projects, including those in subgroups
 group.all_projects
 ```
 

doc/api/group_import_export.md

@@ -19,7 +19,7 @@ Group exports include the following:
 - Group labels
 - Group badges
 - Group members
-- Sub-groups. Each sub-group includes all data above
+- Subgroups. Each subgroup includes all data above
 - Group wikis **(PREMIUM SELF)**
 
 ## Schedule new export

doc/development/documentation/styleguide/index.md

@@ -526,6 +526,7 @@ You can use these fake tokens as examples:
 | scalability           | Do not use when talking about increasing GitLab performance for additional users. The words scale or scaling are sometimes acceptable, but references to increasing GitLab performance for additional users should direct readers to the GitLab [reference architectures](../../../administration/reference_architectures/index.md) page. |
 | simply                | Do not use. If the user doesn't find the process to be these things, we lose their trust. |
 | slashes               | Instead of **and/or**, use **or** or another sensible construction. This rule also applies to other slashes, like **follow/unfollow**. Some exceptions (like **CI/CD**) are allowed. |
+| subgroup              | Use instead of `sub-group`. |
 | that                  | Do not use. Example: `the file that you save` can be `the file you save`. |
 | useful                | Do not use. If the user doesn't find the process to be these things, we lose their trust. |
 | utilize               | Do not use. Use **use** instead. It's more succinct and easier for non-native English speakers to understand. |

doc/development/rake_tasks.md

@@ -64,9 +64,9 @@ By default, this seeds an average of 10 issues per week for the last 52 weeks
 per project. All issues are also randomly labeled with team, type, severity,
 and priority.
 
-#### Seeding groups with sub-groups
+#### Seeding groups with subgroups
 
-You can seed groups with sub-groups that contain milestones/projects/issues
+You can seed groups with subgroups that contain milestones/projects/issues
 with the `gitlab:seed:group_seed` task:
 
 ```shell

doc/integration/elasticsearch.md

@@ -239,7 +239,7 @@ If you select `Limit namespaces and projects that can be indexed`, more options
 ![limit namespaces and projects options](img/limit_namespaces_projects_options.png)
 
 You can select namespaces and projects to index exclusively. Note that if the namespace is a group it will include
-any sub-groups and projects belonging to those sub-groups to be indexed as well.
+any subgroups and projects belonging to those subgroups to be indexed as well.
 
 Advanced Search only provides cross-group code/commit search (global) if all name-spaces are indexed. In this particular scenario where only a subset of namespaces are indexed, a global search will not provide a code or commit scope. This will be possible only in the scope of an indexed namespace. Currently there is no way to code/commit search in multiple indexed namespaces (when only a subset of namespaces has been indexed). For example if two groups are indexed, there is no way to run a single code search on both. You can only run a code search on the first group and then on the second.
 

doc/user/group/clusters/index.md

@@ -38,7 +38,7 @@ in the project namespace.
 If the project's cluster is available and not disabled, GitLab uses the
 project's cluster before using any cluster belonging to the group containing
 the project.
-In the case of sub-groups, GitLab uses the cluster of the closest ancestor group
+In the case of subgroups, GitLab uses the cluster of the closest ancestor group
 to the project, provided the cluster is not disabled.
 
 ## Multiple Kubernetes clusters

doc/user/group/import/index.md

@@ -16,7 +16,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 WARNING:
 This feature is [under construction](https://gitlab.com/groups/gitlab-org/-/epics/2771) and currently migrates only some of the Group data. Please see below for the full list of what is included in the migration at this time.
 
-Using GitLab Group Migration, you can migrate existing top-level groups from GitLab.com or a self-managed instance. Groups can be migrated to a target instance, as a top-level group, or as a sub-group of any existing top-level group.
+Using GitLab Group Migration, you can migrate existing top-level groups from GitLab.com or a self-managed instance. Groups can be migrated to a target instance, as a top-level group, or as a subgroup of any existing top-level group.
 
 The following resources are migrated to the target instance:
 

doc/user/group/index.md

@@ -787,7 +787,7 @@ To enable delayed deletion of projects:
 1. Click **Save changes**.
 
 NOTE:
-The group setting for delayed deletion is not inherited by sub-groups and has to be individually defined for each group.
+The group setting for delayed deletion is not inherited by subgroups and has to be individually defined for each group.
 
 #### Prevent project forking outside group **(PREMIUM)**
 

doc/user/project/issues/confidential_issues.md

@@ -99,9 +99,9 @@ confidential information prematurely. To make a confidential commit public,
 open a merge request from the private fork to the public upstream project.
 
 Permissions are inherited from parent groups. Developers have the same permissions
-for private forks created in the same group or in a sub-group of the original
+for private forks created in the same group or in a subgroup of the original
 Permissions are inherited from parent groups. When private forks are created
-in the same group or sub-group as the original upstream repository, users
+in the same group or subgroup as the original upstream repository, users
 receive the same permissions in both projects. This inheritance ensures
 Developer users have the needed permissions to both view confidential issues and
 resolve them.

doc/user/project/settings/index.md

@@ -52,7 +52,7 @@ WARNING:
 This feature might not be available to you. Check the **version history** note above for details.
 
 GitLab 13.9 introduces custom compliance frameworks at the group-level. A group owner can create a compliance framework label
-and assign it to any number of projects within that group or sub-groups. When this feature is enabled, projects can only
+and assign it to any number of projects within that group or subgroups. When this feature is enabled, projects can only
 be assigned compliance framework labels that already exist within that group.
 
 If existing [Compliance frameworks](#compliance-framework) are not sufficient, project and group owners