diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/test/package-info.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/test/package-info.java
index 0bc67cf9d8..ca9b6767c6 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/test/package-info.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/test/package-info.java
@@ -16,6 +16,6 @@
 
 /**
  * Test utilities related to auto-configuration.
- * @deprecated in 1.4.0 in favor of the {@code spring-test-autoconfigure} module
+ * @deprecated in 1.4.0 in favor of the {@code spring-boot-test-autoconfigure} module
  */
 package org.springframework.boot.autoconfigure.test;
diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 6773259416..91564175fa 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -793,7 +793,7 @@ content into your application; rather pick only the properties that you need.
 	spring.rabbitmq.addresses= # Comma-separated list of addresses to which the client should connect.
 	spring.rabbitmq.cache.channel.checkout-timeout= # Number of milliseconds to wait to obtain a channel if the cache size has been reached.
 	spring.rabbitmq.cache.channel.size= # Number of channels to retain in the cache.
-	spring.rabbitmq.cache.connection.mode= # Connection factory cache mode.
+	spring.rabbitmq.cache.connection.mode=CHANNEL # Connection factory cache mode.
 	spring.rabbitmq.cache.connection.size= # Number of connections to cache.
 	spring.rabbitmq.dynamic=true # Create an AmqpAdmin bean.
 	spring.rabbitmq.host=localhost # RabbitMQ host.
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 bb3af00c98..39634610ee 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -4757,7 +4757,7 @@ database you can use the `@AutoConfigureTestDatabase` annotation:
 
 
 
-[[boot-features-testing-spring-boot-applications-testing-autoconfigurd-rest-docs]]
+[[boot-features-testing-spring-boot-applications-testing-autoconfigured-rest-docs]]
 ==== Auto-configured Spring REST Docs tests
 Test `@AutoConfigureRestDocs` annotation can be used if you want to use Spring REST Docs
 in your tests. It will automatically configure `MockMvc` to use Spring REST Docs and
diff --git a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
index 9949c308de..50ccbc4d84 100644
--- a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
@@ -9,7 +9,7 @@
 	<artifactId>spring-boot-starter-tomcat</artifactId>
 	<name>Spring Boot Tomcat Starter</name>
 	<description>Starter for using Tomcat as the embedded servlet container. Default
-		servlet container starter using by spring-boot-starter-web</description>
+		servlet container starter used by spring-boot-starter-web</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
index baf6d24d66..2be54590af 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
@@ -87,13 +87,13 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr
 		Class<?>[] classes = getClasses(testClass);
 		if (!ObjectUtils.isEmpty(classes)) {
 			for (ContextConfigurationAttributes configAttributes : configAttributesList) {
-				addConfigAttriubtesClasses(configAttributes, classes);
+				addConfigAttributesClasses(configAttributes, classes);
 			}
 		}
 		return super.resolveContextLoader(testClass, configAttributesList);
 	}
 
-	private void addConfigAttriubtesClasses(
+	private void addConfigAttributesClasses(
 			ContextConfigurationAttributes configAttributes, Class<?>[] classes) {
 		List<Class<?>> combined = new ArrayList<Class<?>>();
 		combined.addAll(Arrays.asList(classes));