Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules

* upstream/master: (1723 commits)
  Resolve "Editor icons"
  Refactor issuable destroy action
  Ignore routes matching legacy_*_redirect in route specs
  Gitlab::Git::RevList and LfsChanges use lazy popen
  Gitlab::Git::Popen can lazily hand output to a block
  Merge branch 'master-i18n' into 'master'
  Remove unique validation from external_url in Environment
  Expose `duration` in Job API entity
  Add TimeCop freeze for DST and Regular time
  Harcode project visibility
  update a changelog
  Put a condition to old migration that adds fast_forward column to MRs
  Expose project visibility as CI variable
  fix flaky tests by removing unneeded clicks and focus actions
  fix flaky test in gfm_autocomplete_spec.rb
  Use Gitlab::Git operations for repository mirroring
  Encapsulate git operations for mirroring in Gitlab::Git
  Create a Wiki Repository's raw_repository properly
  Add `Gitlab::Git::Repository#fetch` command
  Fix Gitlab::Metrics::System#real_time and #monotonic_time doc
  ...

1 files changed, 21 insertions, 16 deletions

diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md
index 652ca9cf454..93c3642a1f1 100644
--- a/doc/administration/integration/plantuml.md
+++ b/doc/administration/integration/plantuml.md
@@ -56,29 +56,34 @@ that, login with an Admin account and do following:
 With PlantUML integration enabled and configured, we can start adding diagrams to
 our AsciiDoc snippets, wikis and repos using delimited blocks:
 
-```
-[plantuml, format="png", id="myDiagram", width="200px"]
---
-Bob->Alice : hello
-Alice -> Bob : Go Away
---
-```
+- **Markdown**
+
+      ```plantuml
+      Bob -> Alice : hello
+      Alice -> Bob : Go Away
+      ```
 
-And in Markdown using fenced code blocks:
+- **AsciiDoc**
 
-    ```plantuml
-    Bob -> Alice : hello
+    ```
+    [plantuml, format="png", id="myDiagram", width="200px"]
+    --
+    Bob->Alice : hello
     Alice -> Bob : Go Away
+    --
     ```
 
-And in reStructuredText using a directive:
+- **reStructuredText**
 
-```
-.. plantuml::
+    ```
+    .. plantuml::
+       :caption: Caption with **bold** and *italic*
 
-   Bob -> Alice: hello
-   Alice -> Bob: Go Away
-```
+       Bob -> Alice: hello
+       Alice -> Bob: Go Away
+    ```
+
+    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.
 
 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