diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc
index 0b77e899f6d..2872d2a096d 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc
@@ -352,6 +352,7 @@ and the default excludes are
 See the output of `spring help jar` for more information.
 
 
+
 [[cli-init]]
 === Initialize a new project
 The `init` command allows you to create a new project using https://start.spring.io
@@ -361,36 +362,36 @@ without leaving the shell.  For example:
 ----
 	$ spring init --dependencies=web,data-jpa my-project/
 	Using service at https://start.spring.io
-    Project extracted to '/Users/developer/example/my-project'
+	Project extracted to '/Users/developer/example/my-project'
 ----
 
-This creates a `my-project` directory with a Maven-based project using `spring-boot-starter-web`
-and `spring-boot-starter-data-jpa`. You can list the capabilities of the service
-using the `--list` flag
+This creates a `my-project` directory with a Maven-based project using
+`spring-boot-starter-web` and `spring-boot-starter-data-jpa`. You can list the
+capabilities of the service using the `--list` flag
 
 [indent=0]
 ----
 	$ spring init --list
-    =======================================
-    Capabilities of https://start.spring.io
-    =======================================
+	=======================================
+	Capabilities of https://start.spring.io
+	=======================================
 
-    Available dependencies:
-    -----------------------
-    actuator - Actuator: Production ready features to help you monitor and manage your application
-    ...
-    web - Web: Support for full-stack web development, including Tomcat and spring-webmvc
-    websocket - Websocket: Support for websocket development with Tomcat
-    ws - WS: Support for Spring Web Services
+	Available dependencies:
+	-----------------------
+	actuator - Actuator: Production ready features to help you monitor and manage your application
+	...
+	web - Web: Support for full-stack web development, including Tomcat and spring-webmvc
+	websocket - Websocket: Support for websocket development with Tomcat
+	ws - WS: Support for Spring Web Services
 
-    Available project types:
-    ------------------------
-    gradle-build -  Gradle Config [format:build, build:gradle]
-    gradle-project -  Gradle Project [format:project, build:gradle]
-    maven-build -  Maven POM [format:build, build:maven]
-    maven-project -  Maven Project [format:project, build:maven] (default)
+	Available project types:
+	------------------------
+	gradle-build -  Gradle Config [format:build, build:gradle]
+	gradle-project -  Gradle Project [format:project, build:gradle]
+	maven-build -  Maven POM [format:build, build:maven]
+	maven-project -  Maven Project [format:project, build:maven] (default)
 
-    ...
+	...
 ----
 
 The `init` command supports many options, check the `help` output for more details. For
@@ -403,6 +404,8 @@ instance, the following command creates a gradle project using Java 8 and `war`
 	Content saved to 'sample-app.zip'
 ----
 
+
+
 [[cli-shell]]
 === Using the embedded shell
 Spring Boot includes command-line completion scripts for BASH and zsh shells. If you
@@ -428,6 +431,8 @@ The embedded shell supports ANSI color output as well as `tab` completion. If yo
 to run a native command you can use the `$` prefix. Hitting `ctrl-c` will exit the
 embedded shell.
 
+
+
 [[cli-groovy-beans-dsl]]
 == Developing application with the Groovy beans DSL
 Spring Framework 4.0 has native support for a `beans{}` "`DSL`" (borrowed from
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index fe3a49645ad..dc873c8e437 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -2025,18 +2025,24 @@ The following component creates a listener endpoint on the `someQueue` destinati
 Check {spring-javadoc}/jms/annotation/EnableJms.{dc-ext}[the javadoc of `@EnableJms`]
 for more details.
 
-[[boot-features-mail]]
-== Mail integration
-The Spring Framework provides an easy abstraction for sending email using the `JavaMailSender`
-interface and Spring Boot provides auto-configuration for it as well as a starter module.
 
-TIP: Check the {spring-reference}/#mail[reference documentation] for a detailed explanation
-of how you can use `JavaMailSender`.
+
+[[boot-features-email]]
+== Sending email
+The Spring Framework provides an easy abstraction for sending email using the
+`JavaMailSender` interface and Spring Boot provides auto-configuration for it as well as
+a starter module.
+
+TIP: Check the {spring-reference}/#mail[reference documentation] for a detailed
+explanation of how you can use `JavaMailSender`.
 
 If `spring.mail.host` and the relevant libraries (as defined by `spring-boot-starter-mail`)
 are available, a default `JavaMailSender` is created if none exists. The sender can be
 further customized by configuration items from the `spring.mail` namespace, see the
-{sc-spring-boot-autoconfigure}/mail/MailProperties.{sc-ext}[`MailProperties`] for more details.
+{sc-spring-boot-autoconfigure}/mail/MailProperties.{sc-ext}[`MailProperties`] for more
+details.
+
+
 
 [[boot-features-jta]]
 == Distributed Transactions with JTA