diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-03-28 21:04:19 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-03-28 21:04:19 +0000 |
| commit | f315562c20326212fd64bb43075a08966c227c98 (patch) | |
| tree | ad623303e3a7ed7672ad3a2631fb5f2190579194 /doc | |
| parent | 11f8940b6f5fe177caf7fcd11054f889f613be88 (diff) | |
| parent | fe399402df39a3ee0ab6132b1d7ab5ace6ef50fa (diff) | |
| download | gitlab-ce-f315562c20326212fd64bb43075a08966c227c98.tar.gz | |
Merge branch 'docs-replace-libre-w-core' into 'master'
Docs: replaces "Libre" => "Core"
See merge request gitlab-org/gitlab-ce!18060
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README.md | 6 | ||||
| -rw-r--r-- | doc/administration/index.md | 4 | ||||
| -rw-r--r-- | doc/user/project/issue_board.md | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/README.md b/doc/README.md index be805a2ccc4..604f7244a34 100644 --- a/doc/README.md +++ b/doc/README.md @@ -211,9 +211,9 @@ straight away. ### GitLab self-hosted -With GitLab self-hosted, you deploy your own GitLab instance on-premises or on a private cloud of your choice. GitLab self-hosted is available for [free and with paid subscriptions](https://about.gitlab.com/products/): Libre, Starter, Premium, and Ultimate. +With GitLab self-hosted, you deploy your own GitLab instance on-premises or on a private cloud of your choice. GitLab self-hosted is available for [free and with paid subscriptions](https://about.gitlab.com/products/): Core, Starter, Premium, and Ultimate. -Every feature available in Libre is also available in Starter, Premium, and Ultimate. +Every feature available in Core is also available in Starter, Premium, and Ultimate. Starter features are also available in Premium and Ultimate, and Premium features are also available in Ultimate. @@ -227,7 +227,7 @@ GitLab.com subscriptions grants access to the same features available in GitLab self-hosted, **expect [administration](administration/index.md) tools and settings**: -- GitLab.com Free includes the same features available in GitLab Libre +- GitLab.com Free includes the same features available in Core - GitLab.com Bronze includes the same features available in GitLab Starter - GitLab.com Silver includes the same features available in GitLab Premium - GitLab.com Gold includes the same features available in GitLab Ultimate diff --git a/doc/administration/index.md b/doc/administration/index.md index 4366590578a..60a45426636 100644 --- a/doc/administration/index.md +++ b/doc/administration/index.md @@ -11,8 +11,8 @@ available through [different subscriptions](https://about.gitlab.com/products/). You can [install GitLab CE or GitLab EE](https://about.gitlab.com/installation/ce-or-ee/), but the features you'll have access to depend on the subscription you choose -(Libre, Starter, Premium, or Ultimate). GitLab Community Edition installations -only have access to Libre features. +(Core, Starter, Premium, or Ultimate). GitLab Community Edition installations +only have access to Core features. GitLab.com is administered by GitLab, Inc., therefore, only GitLab team members have access to its admin configurations. If you're a GitLab.com user, please check the diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md index d403d5698a9..b4a842f33d6 100644 --- a/doc/user/project/issue_board.md +++ b/doc/user/project/issue_board.md @@ -251,7 +251,7 @@ Different issue board features are available in different [GitLab tiers](https:/ | Tier | Number of project issue boards | Board with configuration in project issue boards | Number of group issue boards | Board with configuration in group issue boards | | --- | --- | --- | --- | --- | -| Libre | 1 | No | 1 | No | +| Core | 1 | No | 1 | No | | Starter | Multiple | Yes | 1 | No | | Premium | Multiple | Yes | Multiple | Yes | | Ultimate | Multiple | Yes | Multiple | Yes | |