Merge branch '1.4.x' into 1.5.x

3f883f18 · Stephane Nicoll · a132bd14 · 404bb2d1 · 3f883f18 · 3f883f18
Commit 3f883f18 authored Apr 11, 2017 by Stephane Nicoll
Showing with 2 additions and 2 deletions

appendix-application-properties.adoc ...cs/src/main/asciidoc/appendix-application-properties.adoc +1 -1

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

No files found.
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/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.
 ====