diff options
author | Fabio Papa <fabtheman@gmail.com> | 2019-07-12 17:10:20 +0000 |
---|---|---|
committer | Fabio Papa <fabtheman@gmail.com> | 2019-07-12 17:10:20 +0000 |
commit | 6457d5edb7d66df5dd3d5ba1f1ea0c56a59287a8 (patch) | |
tree | c683e3d7ebcf3e188f1dd85b8701ff972e7f8a3d /doc/user/asciidoc.md | |
parent | 9b176c65159e4186f79eae2107af80e69132ba09 (diff) | |
parent | 740288f80d85210ada3eccc0f98e0843b2917d65 (diff) | |
download | gitlab-ce-6457d5edb7d66df5dd3d5ba1f1ea0c56a59287a8.tar.gz |
Merge branch 'master' into 'maintainers-can-create-subgroup'
# Conflicts:
# doc/user/permissions.md
Diffstat (limited to 'doc/user/asciidoc.md')
-rw-r--r-- | doc/user/asciidoc.md | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/user/asciidoc.md b/doc/user/asciidoc.md index 0ed9bf3f518..df86b2a1cbe 100644 --- a/doc/user/asciidoc.md +++ b/doc/user/asciidoc.md @@ -1,7 +1,7 @@ # AsciiDoc GitLab uses the [Asciidoctor](https://asciidoctor.org) gem to convert AsciiDoc content to HTML5. -Consult the [Asciidoctor User Manual](https://asciidoctor.org/docs/user-manual) for a complete Asciidoctor reference. +Consult the [Asciidoctor User Manual](https://asciidoctor.org/docs/user-manual/) for a complete Asciidoctor reference. ## Syntax @@ -170,6 +170,7 @@ Attach a block or paragraph to a list item using a list continuation (which you * [x] checked * [ ] not checked ``` + #### Callout ```asciidoc @@ -188,6 +189,7 @@ first term:: description of first term second term:: description of second term ``` + ### Document Structure #### Header @@ -197,6 +199,7 @@ description of second term Author Name <author@example.org> v1.0, 2019-01-01 ``` + #### Sections ```asciidoc @@ -217,6 +220,7 @@ include::basics.adoc[] // define -a allow-uri-read to allow content to be read from URI include::https://example.org/installation.adoc[] ``` + ### Blocks ```asciidoc @@ -273,11 +277,11 @@ source - a listing that is embellished with (colorized) syntax highlighting ---- ``` -```asciidoc +````asciidoc \```language fenced code - a shorthand syntax for the source block \``` -``` +```` ```asciidoc [,attribution,citetitle] @@ -369,4 +373,3 @@ video::300817511[vimeo] // page break <<< ``` - |