BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
4bb1a3c1
Commit
4bb1a3c1
authored
Sep 07, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/plantuml-restructured-text' into 'master'
Add documentation for PlantUML in reStructuredText See merge request !13900
parents
ba2b3121
21cf3d2c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
feature-plantuml-restructured-text.yml
changelogs/unreleased/feature-plantuml-restructured-text.yml
+5
-0
plantuml.md
doc/administration/integration/plantuml.md
+10
-2
No files found.
changelogs/unreleased/feature-plantuml-restructured-text.yml
0 → 100644
View file @
4bb1a3c1
---
title
:
Add documentation for PlantUML in reStructuredText
merge_request
:
13900
author
:
Markus Koller
type
:
other
doc/administration/integration/plantuml.md
View file @
4bb1a3c1
...
@@ -71,6 +71,15 @@ And in Markdown using fenced code blocks:
...
@@ -71,6 +71,15 @@ And in Markdown using fenced code blocks:
Alice -> Bob : Go Away
Alice -> Bob : Go Away
```
```
And in reStructuredText using a directive:
```
.. plantuml::
Bob -> Alice: hello
Alice -> Bob: Go Away
```
The above blocks will be converted to an HTML img tag with source pointing to the
The above blocks will be converted to an HTML img tag with source pointing to the
PlantUML instance. If the PlantUML server is correctly configured, this should
PlantUML instance. If the PlantUML server is correctly configured, this should
render a nice diagram instead of the block:
render a nice diagram instead of the block:
...
@@ -94,4 +103,4 @@ Some parameters can be added to the AsciiDoc block definition:
...
@@ -94,4 +103,4 @@ Some parameters can be added to the AsciiDoc block definition:
Markdown does not support any parameters and will always use PNG format.
Markdown does not support any parameters and will always use PNG format.
[
ce-8537
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8537
[
ce-8537
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8537
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment