Merge branch '1.4.x' into 1.5.x

Author: snicoll

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

@@ -1149,7 +1149,7 @@ content into your application; rather pick only the properties that you need.
 	management.shell.ssh.idle-timeout = # Number of milliseconds after which unused connections are closed.
 	management.shell.ssh.key-path= # Path to the SSH server key.
 	management.shell.ssh.port=2000 # SSH port.
-	management.shell.telnet.enabled=false # Enable CRaSH telnet support. Enabled by default if the TelnetPlugin is  available.
+	management.shell.telnet.enabled=false # Enable CRaSH telnet support. Enabled by default if the TelnetPlugin is available.
 	management.shell.telnet.port=5000 # Telnet port.
 
 	# TRACING ({sc-spring-boot-actuator}/trace/TraceProperties.{sc-ext}[TraceProperties])

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

@@ -6161,7 +6161,7 @@ might not actually appear on the running application classpath. You can also use
 
 [TIP]
 ====
-If you are using `@ConditionalOnClass` or `@ConditionalOnMissingClass` as apart of a
+If you are using `@ConditionalOnClass` or `@ConditionalOnMissingClass` as a part of a
 meta-annotation to compose your own composed annotations you must use `name` as referring
 to the class in such a case is not handled.
 ====