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
This commit is contained in:
commit
73eb40d32b
|
@ -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.
|
||||
|
||||
|
|
Loading…
Reference in New Issue