summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-06-26 06:50:50 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-06-26 06:50:50 +0000
commit701adc21d6d5e523684ffc8078a4abb6e068e5a3 (patch)
tree72113ad234cb99b8f3750920b6a7c5449628c7b7
parent73e8435110a941357e5cad223302bb0e34db8103 (diff)
parenta1cc0c6f8d5951eeb66e61a3f3887cce30c53011 (diff)
downloadgitlab-ce-701adc21d6d5e523684ffc8078a4abb6e068e5a3.tar.gz
Merge branch 'docs-contributing-links' into 'master'
Update CONTRIBUTING.md to fix links See merge request gitlab-org/gitlab-ce!19814
-rw-r--r--CONTRIBUTING.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f7b12e17c70..fd4e769ecee 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -650,7 +650,7 @@ the feature you contribute through all of these steps.
1. Working and clean code that is commented where needed
1. [Unit, integration, and system tests][testing] that pass on the CI server
1. Performance/scalability implications have been considered, addressed, and tested
-1. [Documented][doc-styleguide] in the `/doc` directory
+1. [Documented][doc-guidelines] in the `/doc` directory
1. [Changelog entry added][changelog], if necessary
1. Reviewed and any concerns are addressed
1. Merged by a project maintainer
@@ -687,7 +687,7 @@ merge request:
contributors to enhance security
1. [Database Migrations](doc/development/migration_style_guide.md)
1. [Markdown](http://www.cirosantilli.com/markdown-styleguide)
-1. [Documentation styleguide][doc-styleguide]
+1. [Documentation styleguide](https://docs.gitlab.com/ee/development/documentation/styleguide.html)
1. Interface text should be written subjectively instead of objectively. It
should be the GitLab core team addressing a person. It should be written in
present time and never use past tense (has been/was). For example instead