Merge branch '1.1.x'

2014-09-07 15:45:53 -05:00 · 2014-09-07 15:45:53 -05:00 · dde7ebf30f
parent 3a1e631ac8 a4e08beebc
commit dde7ebf30f
1 changed files with 7 additions and 6 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@ -368,6 +368,7 @@ For example, the following YAML document:

 [source,yaml,indent=0]
 ----
+	environments:
 		dev:
 			url: http://dev.bar.com
 			name: Developer Setup