Commit ae1c0c4e authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs/mermaid-gl-version' into 'master'

Add version that the mermaid support was introduced

See merge request gitlab-org/gitlab-ce!15688
parents 07aaa59b 82da87f5
...@@ -41,7 +41,7 @@ Line-breaks, or softreturns, are rendered if you end a line with two or more spa ...@@ -41,7 +41,7 @@ Line-breaks, or softreturns, are rendered if you end a line with two or more spa
Sugar is sweet Sugar is sweet
Roses are red Roses are red
Violets are blue Violets are blue
Sugar is sweet Sugar is sweet
...@@ -370,14 +370,17 @@ This also works for the asciidoctor `:stem: latexmath`. For details see the [asc ...@@ -370,14 +370,17 @@ This also works for the asciidoctor `:stem: latexmath`. For details see the [asc
### Mermaid ### Mermaid
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15107) in
GitLab 10.3.
> If this is not rendered correctly, see > If this is not rendered correctly, see
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#mermaid https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#mermaid
It is possible to generate diagrams and flowcharts from text using [Mermaid][mermaid]. It is possible to generate diagrams and flowcharts from text using [Mermaid][mermaid].
In order to generate a diagram or flowchart, you should write your text inside the `mermaid` block. In order to generate a diagram or flowchart, you should write your text inside the `mermaid` block.
Example: Example:
```mermaid ```mermaid
graph TD; graph TD;
...@@ -385,7 +388,7 @@ Example: ...@@ -385,7 +388,7 @@ Example:
A-->C; A-->C;
B-->D; B-->D;
C-->D; C-->D;
``` ```
Becomes: Becomes:
...@@ -395,7 +398,7 @@ graph TD; ...@@ -395,7 +398,7 @@ graph TD;
A-->C; A-->C;
B-->D; B-->D;
C-->D; C-->D;
``` ```
For details see the [Mermaid official page][mermaid]. For details see the [Mermaid official page][mermaid].
...@@ -697,7 +700,7 @@ This line is separated from the one above by two newlines, so it will be a *sepa ...@@ -697,7 +700,7 @@ This line is separated from the one above by two newlines, so it will be a *sepa
This line is also a separate paragraph, but... This line is also a separate paragraph, but...
This line is only separated by a single newline, so it *does not break* and just follows the previous line in the *same paragraph*. This line is only separated by a single newline, so it *does not break* and just follows the previous line in the *same paragraph*.
This line is also a separate paragraph, and... This line is also a separate paragraph, and...
This line is *on its own line*, because the previous line ends with two spaces. (but still in the *same paragraph*) This line is *on its own line*, because the previous line ends with two spaces. (but still in the *same paragraph*)
spaces. spaces.
...@@ -710,7 +713,7 @@ This line is separated from the one above by two newlines, so it will be a *sepa ...@@ -710,7 +713,7 @@ This line is separated from the one above by two newlines, so it will be a *sepa
This line is also a separate paragraph, but... This line is also a separate paragraph, but...
This line is only separated by a single newline, so it *does not break* and just follows the previous line in the *same paragraph*. This line is only separated by a single newline, so it *does not break* and just follows the previous line in the *same paragraph*.
This line is also a separate paragraph, and... This line is also a separate paragraph, and...
This line is *on its own line*, because the previous line ends with two spaces. (but still in the *same paragraph*) This line is *on its own line*, because the previous line ends with two spaces. (but still in the *same paragraph*)
spaces. spaces.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment