diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-28 16:34:21 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-28 16:34:21 +0000 |
| commit | 73eb40d32b2d5db373519d4888d269416011bf8a (patch) | |
| tree | f5068bd222da8eb32e267e0bf9ce717c6080796c | |
| parent | 17b878dae5a9edad3465f4345b48418d21f37ad8 (diff) | |
| parent | e5b5d27deaf4855bd9cab67aed521c2dd0db00e4 (diff) | |
| download | gitlab-ce-73eb40d32b2d5db373519d4888d269416011bf8a.tar.gz | |
Merge branch 'patch-11' into 'master'
doc/plantuml.md: use html tags so code fence example would work
[ci skip]
See merge request gitlab-org/gitlab-ce!16026
| -rw-r--r-- | doc/administration/integration/plantuml.md | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md index 93c3642a1f1..65f59b72690 100644 --- a/doc/administration/integration/plantuml.md +++ b/doc/administration/integration/plantuml.md @@ -58,30 +58,32 @@ our AsciiDoc snippets, wikis and repos using delimited blocks: - **Markdown** - ```plantuml - Bob -> Alice : hello - Alice -> Bob : Go Away - ``` + <pre> + ```plantuml + Bob -> Alice : hello + Alice -> Bob : Go Away + ``` + </pre> - **AsciiDoc** - ``` + <pre> [plantuml, format="png", id="myDiagram", width="200px"] -- Bob->Alice : hello Alice -> Bob : Go Away -- - ``` + </pre> - **reStructuredText** - ``` + <pre> .. plantuml:: :caption: Caption with **bold** and *italic* Bob -> Alice: hello Alice -> Bob: Go Away - ``` + </pre> You can also use the `uml::` directive for compatibility with [sphinxcontrib-plantuml](https://pypi.python.org/pypi/sphinxcontrib-plantuml), but please note that we currently only support the `caption` option. |