Merge branch 'docs-update-documentation-guidelines' into 'master'

Docs update documentation guidelines See merge request gitlab-org/gitlab-ce!15811

Merge branch 'docs-update-documentation-guidelines' into 'master'
8c34a01d · 🚄 Job van der Voort 🚀 · 3b16c735 · a68656e6 · 8c34a01d · 8c34a01d
Commit 8c34a01d authored Dec 15, 2017 by 🚄 Job van der Voort 🚀
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

README.md doc/development/README.md +2 -3

writing_documentation.md doc/development/writing_documentation.md +0 -0

No files found.
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -81,10 +81,9 @@ comments: false

 ## Documentation guides

- [Documentation styleguide](doc_styleguide.md): Use this styleguide if you are
-  contributing to the documentation.
 - [Writing documentation](writing_documentation.md)
-  - [Distinction between general documentation and technical articles](writing_documentation.md#distinction-between-general-documentation-and-technical-articles)
+- [Documentation styleguide](doc_styleguide.md)
+- [Markdown](../user/markdown.md)

 ## Internationalization (i18n) guides


--- a/doc/development/writing_documentation.md
+++ b/doc/development/writing_documentation.md