diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-11 18:08:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-11 18:08:21 +0300 |
commit | ed94a4dd903dc4d20cbc1bce330b9c1b7a5f7fbf (patch) | |
tree | e77f48da26680f6e949604cab506cf137515b05c /doc/user | |
parent | fc0afaf7da2156e91e615662272811eee56d034a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/namespace/index.md | 7 | ||||
-rw-r--r-- | doc/user/workspace/index.md | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/doc/user/namespace/index.md b/doc/user/namespace/index.md index bc7ec25b19c..7463b8f1099 100644 --- a/doc/user/namespace/index.md +++ b/doc/user/namespace/index.md @@ -35,3 +35,10 @@ To determine whether you're viewing a group or personal namespace, you can view | A user named `alex`. | `https://gitlab.example.com/alex` | `alex` | | A group named `alex-team`. | `https://gitlab.example.com/alex-team` | `alex-team` | | A group named `alex-team` with a subgroup named `marketing`. | `https://gitlab.example.com/alex-team/marketing` | `alex-team/marketing` | + +## Naming limitations for namespaces + +When choosing a name for your namespace, keep in mind the [character limitations](../reserved_names.md#limitations-on-project-and-group-names) and [reserved group names](../reserved_names.md#reserved-group-names). + +NOTE: +If your namespace contains a `.`, you will encounter issues with the validation of your SSL certificates and the source path when [publishing Terraform modules](../packages/terraform_module_registry/index.md#publish-a-terraform-module). diff --git a/doc/user/workspace/index.md b/doc/user/workspace/index.md index 3806c78589a..e4e1edd6346 100644 --- a/doc/user/workspace/index.md +++ b/doc/user/workspace/index.md @@ -4,7 +4,7 @@ group: Organization info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Workspace +# Organization DISCLAIMER: This page contains information related to upcoming products, features, and functionality. @@ -15,9 +15,9 @@ The development, release, and timing of any products, features, or functionality sole discretion of GitLab Inc. NOTE: -Workspace is in development. +Organization is in development. -Workspace will be above the [top-level namespaces](../namespace/index.md) for you to manage +Organization will be above the [top-level namespaces](../namespace/index.md) for you to manage everything you do as a GitLab administrator, including: - Defining and applying settings to all of your groups, subgroups, and projects. @@ -26,11 +26,11 @@ everything you do as a GitLab administrator, including: Our goal is to reach feature parity between SaaS and self-managed installations, with all [Admin Area settings](/ee/user/admin_area/settings/index.md) moving to either: -- Groups. Available in the Workspace, top-level groups, and subgroups. +- Groups. Available in the Organization, and subgroups. - Hardware Controls. For functionality that does not apply to groups, Hardware Controls are only applicable to self-managed installations. There is one Hardware Controls section per installation. -For more information about the state of workspace development, +For more information about the state of organization development, see [epic 9265](https://gitlab.com/groups/gitlab-org/-/epics/9265). <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> @@ -39,4 +39,4 @@ For a video introduction to the new hierarchy concept for groups and projects fo ## Related topics -- [Workspace developer documentation](../../development/workspace/index.md) +- [Organization developer documentation](../../development/workspace/index.md) |