Merge branch '2.1.x'

Closes gh-18007

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix/application-properties.adoc

@@ -5,17 +5,13 @@
 
 include::{asciidoc-sources-root}/attributes.adoc[]
 
-Various properties can be specified inside your `application.properties` file, inside
-your `application.yml` file, or as command line switches. This appendix provides a list
-of common Spring Boot properties and references to the underlying classes that consume
-them.
+Various properties can be specified inside your `application.properties` file, inside your `application.yml` file, or as command line switches.
+This appendix provides a list of common Spring Boot properties and references to the underlying classes that consume them.
 
-TIP: Spring Boot provides various conversion mechanism with advanced value formatting,
-make sure to review <<spring-boot-features.adoc#boot-features-external-config-conversion,
-the properties conversion section>>.
+TIP: Spring Boot provides various conversion mechanism with advanced value formatting, make sure to review <<spring-boot-features.adoc#boot-features-external-config-conversion, the properties conversion section>>.
 
-NOTE: Property contributions can come from additional jar files on your classpath, so you
-should not consider this an exhaustive list. Also, you can define your own properties.
+NOTE: Property contributions can come from additional jar files on your classpath, so you should not consider this an exhaustive list.
+Also, you can define your own properties.
 
 
 === Core properties

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix/auto-configuration-classes.adoc

@@ -4,11 +4,9 @@
 
 include::{asciidoc-sources-root}/attributes.adoc[]
 
-Here is a list of all auto-configuration classes provided by Spring Boot, with links to
-documentation and source code. Remember to also look at the conditions report in your
-application for more details of which features are switched on.
-(To do so, start the app with `--debug` or `-Ddebug` or, in an Actuator application, use
-the `conditions` endpoint).
+Here is a list of all auto-configuration classes provided by Spring Boot, with links to documentation and source code.
+Remember to also look at the conditions report in your application for more details of which features are switched on.
+(To do so, start the app with `--debug` or `-Ddebug` or, in an Actuator application, use the `conditions` endpoint).
 
 
 

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix/dependency-versions.adoc

@@ -4,9 +4,7 @@
 
 include::{asciidoc-sources-root}/attributes.adoc[]
 
-The following table provides details of all of the dependency versions that are provided
-by Spring Boot in its CLI (Command Line Interface), Maven dependency management, and
-Gradle plugin. When you declare a dependency on one of these artifacts without declaring
-a version, the version listed in the table is used.
+The following table provides details of all of the dependency versions that are provided by Spring Boot in its CLI (Command Line Interface), Maven dependency management, and Gradle plugin.
+When you declare a dependency on one of these artifacts without declaring a version, the version listed in the table is used.
 
 include::{generated-resources-root}/effective-pom.adoc[]

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix/test-auto-configuration.adoc

@@ -4,7 +4,6 @@
 
 include::{asciidoc-sources-root}/attributes.adoc[]
 
-The following table lists the various `@…Test` annotations that can be used to test
-slices of your application and the auto-configuration that they import by default:
+The following table lists the various `@…Test` annotations that can be used to test slices of your application and the auto-configuration that they import by default:
 
 include::{generated-resources-root}/test-slice-auto-configuration.adoc[]

spring-boot-project/spring-boot-docs/src/main/asciidoc/index-docinfo.xml

+<productname>Spring Boot</productname>
+<releaseinfo>{spring-boot-version}</releaseinfo>
+<copyright>
+	<year>2012-2019</year>
+</copyright>
+<legalnotice>
+	<para>
+		Copies of this document may be made for your own use and for distribution to
+		others, provided that you do not charge any fee for such copies and further
+		provided that each copy contains this Copyright Notice, whether distributed in
+		print or electronically.
+	</para>
+</legalnotice>