Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson
2016-10-21 23:10:47 +01:00
parent 3162241d4a
commit a2f1391fc8
2 changed files with 5 additions and 5 deletions

View File

@@ -145,7 +145,7 @@ the configuration are described below.
will automatically configure the `snippets` attribute for use in your `.adoc` files to
point to `target/generated-snippets`.
[source,groovy,indent=0,subs="verbatim,attributes",role="secondary"]
[source,indent=0,subs="verbatim,attributes",role="secondary"]
.Gradle
----
plugins { <1>
@@ -236,7 +236,7 @@ Asciidoctor plugin to ensure that the documentation is generated before it's cop
<3> Copy the generated documentation into the build output's `static/docs` directory,
from where it will be included in the jar file.
[source,groovy,indent=0,role="secondary"]
[source,indent=0,role="secondary"]
.Gradle
----
jar {

View File

@@ -23,7 +23,7 @@ attribute that is automatically set by `spring-restdocs-asciidoctor` configured
<<getting-started-build-configuration, build configuration>> can be used to reference the
snippets output directory. For example:
[source,adoc,indent=0]
[source,indent=0]
----
\include::{snippets}/index/curl-request.adoc[]
----
@@ -46,7 +46,7 @@ Asciidoctor has rich support for
http://asciidoctor.org/docs/user-manual/#cols-format[formatting a table's columns]. For
example, the widths of a table's columns can be specified using the `cols` attribute:
[source,adoc,indent=0]
[source,indent=0]
----
[cols=1,3] <1>
\include::{snippets}/index/links.adoc[]
@@ -61,7 +61,7 @@ three times as wide as the first.
The title of a table can be specified using a line prefixed by a `.`:
[source,adoc,indent=0]
[source,indent=0]
----
.Links <1>
\include::{snippets}/index/links.adoc[]