Merge pull request #5925 from izeye:polish-20160512

* pr/5925:
  Polish

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -4900,9 +4900,9 @@ database you can use the `@AutoConfigureTestDatabase` annotation:
 
 [[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
+`@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
-removes the need for Spring REST Docs' JUnit rule.
+remove the need for Spring REST Docs' JUnit rule.
 
 [source,java,indent=0]
 ----
@@ -4964,7 +4964,7 @@ automatically generate the default snippets:
 [source,java,indent=0]
 ----
 	@TestConfiguration
-	static class ResultHandlerConfiguration{
+	static class ResultHandlerConfiguration {
 
 		@Bean
 		public RestDocumentationResultHandler restDocumentation() {

spring-boot-starters/spring-boot-starter-redis/src/main/java/org/springframework/boot/starter/redis/RedisStarterDeprecationWarningAutoConfiguration.java

@@ -33,10 +33,10 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 @Deprecated
-public class RedisStarterDepricationWarningAutoConfiguration {
+public class RedisStarterDeprecationWarningAutoConfiguration {
 
 	private static final Log logger = LogFactory
-			.getLog(RedisStarterDepricationWarningAutoConfiguration.class);
+			.getLog(RedisStarterDeprecationWarningAutoConfiguration.class);
 
 	@PostConstruct
 	public void logWarning() {

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/ContentContainingCondition.java

@@ -45,8 +45,7 @@ class ContentContainingCondition extends Condition<File> {
 		Reader reader = null;
 		try {
 			reader = new FileReader(value);
-			String content = FileCopyUtils.copyToString(new FileReader(value));
-			System.out.println(content);
+			String content = FileCopyUtils.copyToString(reader);
 			return content.contains(this.toContain);
 		}
 		catch (IOException ex) {