Merge branch '2.0.x'

2018-04-26 13:46:06 -07:00
parent 6bebb931e5 24ce3ecb43
commit dafe8823cc
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -1204,7 +1204,7 @@ Consider the following configuration:
 	acme:
 	  map:
 	    key1:
-	      name: my name 1
+	      name: dev name 1
 	    key2:
 	      name: dev name 2
 	      description: dev description 2