diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-07-03 08:57:56 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-07-03 08:57:56 +0000 |
| commit | 122e764f9b9d0deb331d21284172c2e7bef34431 (patch) | |
| tree | e5a05f6e586b8b9d89aa66686c1b3fb32f966581 /doc/development | |
| parent | c83c0e93619055a5aa3ebf87807c62964c5ef7c2 (diff) | |
| parent | 12851359262aaa2c2b91304b0ffcb8cc4f474790 (diff) | |
| download | gitlab-ce-122e764f9b9d0deb331d21284172c2e7bef34431.tar.gz | |
Merge branch 'docs-products-links' into 'master'
Updated /products links to /pricing
See merge request gitlab-org/gitlab-ce!20321
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/architecture.md | 2 | ||||
| -rw-r--r-- | doc/development/ux_guide/copy.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index 31117b5e723..6ca3e9e5a0a 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -2,7 +2,7 @@ ## Software delivery -There are two software distributions of GitLab: the open source [Community Edition](https://gitlab.com/gitlab-org/gitlab-ce/) (CE), and the open core [Enterprise Edition](https://gitlab.com/gitlab-org/gitlab-ee/) (EE). GitLab is available under [different subscriptions](https://about.gitlab.com/products/). +There are two software distributions of GitLab: the open source [Community Edition](https://gitlab.com/gitlab-org/gitlab-ce/) (CE), and the open core [Enterprise Edition](https://gitlab.com/gitlab-org/gitlab-ee/) (EE). GitLab is available under [different subscriptions](https://about.gitlab.com/pricing/). New versions of GitLab are released in stable branches and the master branch is for bleeding edge development. diff --git a/doc/development/ux_guide/copy.md b/doc/development/ux_guide/copy.md index 070efdc15b5..d5afa544372 100644 --- a/doc/development/ux_guide/copy.md +++ b/doc/development/ux_guide/copy.md @@ -192,7 +192,7 @@ Portions of this page are modifications based on work created and shared by the [material design]: https://material.io/guidelines/
[features]: https://about.gitlab.com/features/ "GitLab features page"
-[products]: https://about.gitlab.com/products/ "GitLab products page"
+[products]: https://about.gitlab.com/pricing/ "GitLab products page"
[serial comma]: https://en.wikipedia.org/wiki/Serial_comma "“Serial comma” in Wikipedia"
[android project]: http://source.android.com/
[creative commons]: http://creativecommons.org/licenses/by/2.5/
|