summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-09-02 06:58:33 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-09-02 06:58:33 +0000
commitfd1741b47970fc52d994367ba38b5d1353d94725 (patch)
tree13635ad407a0b58cd943369c4cec043fe1d7b230
parent33a367e828c95ba7321d33361be67c68b1603bdd (diff)
parent3ef2c38b63031984c2a284a983bce805c5a0181a (diff)
downloadgitlab-ce-fd1741b47970fc52d994367ba38b5d1353d94725.tar.gz
Merge branch 'doc/guidelines-new-features-codeblock' into 'master'
Change the inline code to codeblocks for the new features doc guideline Change the inline code to codeblocks for the new features doc guideline for better clarity. See merge request !6168
-rw-r--r--doc/development/doc_styleguide.md29
1 files changed, 22 insertions, 7 deletions
diff --git a/doc/development/doc_styleguide.md b/doc/development/doc_styleguide.md
index 37bb59e112c..39b801f761d 100644
--- a/doc/development/doc_styleguide.md
+++ b/doc/development/doc_styleguide.md
@@ -155,15 +155,30 @@ Inside the document:
- Every piece of documentation that comes with a new feature should declare the
GitLab version that feature got introduced. Right below the heading add a
- note: `> Introduced in GitLab 8.3.`.
+ note:
+
+ ```
+ > Introduced in GitLab 8.3.
+ ```
+
- If possible every feature should have a link to the MR that introduced it.
The above note would be then transformed to:
- `> [Introduced][ce-1242] in GitLab 8.3.`, where
- the [link identifier](#links) is named after the repository (CE) and the MR
- number.
-- If the feature is only in GitLab EE, don't forget to mention it, like:
- `> Introduced in GitLab EE 8.3.`. Otherwise, leave
- this mention out.
+
+ ```
+ > [Introduced][ce-1242] in GitLab 8.3.
+ ```
+
+ , where the [link identifier](#links) is named after the repository (CE) and
+ the MR number.
+
+- If the feature is only in GitLab Enterprise Edition, don't forget to mention
+ it, like:
+
+ ```
+ > Introduced in GitLab Enterprise Edition 8.3.
+ ```
+
+ Otherwise, leave this mention out.
## References