diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-03 15:46:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-03 15:46:23 +0000 |
| commit | f3e95aae7abb68f86fc614d70d0ec4b9683b7bfb (patch) | |
| tree | 8df1a102872fda5e4d9f651e5482f397ab92ca50 /doc/development | |
| parent | f30089075fabfbac45c6382c0a2717bbb682734e (diff) | |
| parent | acc6e3a0fdb8f710d77b8faa2a39823f7e1c7e5d (diff) | |
| download | gitlab-ce-f3e95aae7abb68f86fc614d70d0ec4b9683b7bfb.tar.gz | |
Merge branch 'master' into 'web-hooks-log-pagination'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/architecture.md | 2 | ||||
| -rw-r--r-- | doc/development/i18n/externalization.md | 2 | ||||
| -rw-r--r-- | doc/development/ux_guide/copy.md | 2 |
3 files changed, 4 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/i18n/externalization.md b/doc/development/i18n/externalization.md index 4ba9958e2c6..f7d703b8f0b 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -174,6 +174,8 @@ For example use `%{created_at}` in Ruby but `%{createdAt}` in JavaScript. # => When size == 2: 'There are 2 mice.' ``` + Avoid using `%d` or count variables in sigular strings. This allows more natural translation in some languages. + - In JavaScript: ```js 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/
|