Merge branch '2.0.x'

# Conflicts:
#	docs/src/docs/asciidoc/configuration.adoc
#	docs/src/docs/asciidoc/customizing-requests-and-responses.adoc
#	docs/src/docs/asciidoc/documenting-your-api.adoc
#	docs/src/docs/asciidoc/getting-started.adoc

Author: wilkinsona

docs/src/docs/asciidoc/configuration.adoc

@@ -3,11 +3,15 @@
 
 This section covers how to configure Spring REST Docs.
 
+
+
 [[configuration-uris]]
 === Documented URIs
 
 This section covers configuring documented URIs.
 
+
+
 [[configuration-uris-mockmvc]]
 ==== MockMvc URI Customization
 
@@ -30,12 +34,10 @@ This configuration is applied by `MockMvcRestDocumentationConfigurer`.
 You can use its API to change one or more of the defaults to suit your needs.
 The following example shows how to do so:
 
-====
 [source,java,indent=0]
 ----
 include::{examples-dir}/com/example/mockmvc/CustomUriConfiguration.java[tags=custom-uri-configuration]
 ----
-====
 
 NOTE: If the port is set to the default for the configured scheme (port 80 for HTTP or port 443 for HTTPS), it is omitted from any URIs in the generated snippets.
 
@@ -50,13 +52,11 @@ When using WebTestClient, the default base for URIs documented by Spring REST Do
 You can customize this base by using the {spring-framework-api}/org/springframework/test/web/reactive/server/WebTestClient.Builder.html#baseUrl-java.lang.String-[ `baseUrl(String)` method on `WebTestClient.Builder`].
 The following example shows how to do so:
 
-====
 [source,java,indent=0]
 ----
 include::{examples-dir}/com/example/webtestclient/CustomUriConfiguration.java[tags=custom-uri-configuration]
 ----
 <1> Configure the base of documented URIs to be `https://api.example.com`.
-====
 
 
 
@@ -67,7 +67,6 @@ The default snippet encoding is `UTF-8`.
 You can change the default snippet encoding by using the `RestDocumentationConfigurer` API.
 For example, the following examples use `ISO-8859-1`:
 
-====
 [source,java,indent=0,role="primary"]
 .MockMvc
 ----
@@ -94,7 +93,6 @@ Markdown is also supported out of the box.
 You can change the default format by using the `RestDocumentationConfigurer` API.
 The following examples show how to do so:
 
-====
 [source,java,indent=0,role="primary"]
 .MockMvc
 ----
@@ -124,7 +122,6 @@ Six snippets are produced by default:
 You can change the default snippet configuration during setup by using the `RestDocumentationConfigurer` API.
 The following examples produce only the `curl-request` snippet by default:
 
-====
 [source,java,indent=0,role="primary"]
 .MockMvc
 ----
@@ -145,7 +142,6 @@ include::{examples-dir}/com/example/webtestclient/CustomDefaultSnippets.java[tag
 You can configure default request and response preprocessors during setup by using the `RestDocumentationConfigurer` API.
 The following examples remove the `Foo` headers from all requests and pretty print all responses:
 
-====
 [source,java,indent=0,role="primary"]
 .MockMvc
 ----
@@ -161,3 +157,5 @@ include::{examples-dir}/com/example/webtestclient/CustomDefaultOperationPreproce
 ----
 <1> Apply a request preprocessor that removes the header named `Foo`.
 <2> Apply a response preprocessor that pretty prints its content.
+
+

docs/src/docs/asciidoc/contributing.adoc

@@ -29,3 +29,5 @@ If you would like an enhancement to be made to Spring REST Docs, pull requests a
 The source code is on {github}[GitHub].
 You may want to search the {github}/issues?q=is%3Aissue[existing issues] and {github}/pulls?q=is%3Apr[pull requests] to see if the enhancement has already been proposed.
 You may also want to {github}/issues/new[open a new issue] to discuss a possible enhancement before work on it begins.
+
+

docs/src/docs/asciidoc/customizing-requests-and-responses.adoc

@@ -8,7 +8,6 @@ Preprocessing is configured by calling `document` with an `OperationRequestPrepr
 You can obtain instances by using the static `preprocessRequest` and `preprocessResponse` methods on `Preprocessors`.
 The following examples show how to do so:
 
-====
 [source,java,indent=0,role="primary"]
 .MockMvc
 ----
@@ -29,7 +28,6 @@ Alternatively, you may want to apply the same preprocessors to every test.
 You can do so by using the `RestDocumentationConfigurer` API in your `@Before` method to configure the preprocessors.
 For example, to remove the `Foo` header from all requests and pretty print all responses, you could do one of the following (depending on your testing environment):
 
-====
 [source,java,indent=0,role="primary"]
 .MockMvc
 ----
@@ -49,7 +47,6 @@ include::{examples-dir}/com/example/webtestclient/EveryTestPreprocessing.java[ta
 Then, in each test, you can perform any configuration specific to that test.
 The following examples show how to do so:
 
-====
 [source,java,indent=0,role="primary"]
 .MockMvc
 ----
@@ -130,3 +127,5 @@ If one of the built-in preprocessors does not meet your needs, you can write you
 You can then use your custom preprocessor in exactly the same way as any of the built-in preprocessors.
 
 If you want to modify only the content (body) of a request or response, consider implementing the `ContentModifier` interface and using it with the built-in `ContentModifyingOperationPreprocessor`.
+
+