Merge branch '1.3.x'

2016-03-29 10:57:02 +02:00
parent f7ffb017ad 3363415712
commit 87b963b396
1 changed files with 3 additions and 0 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -852,6 +852,9 @@ The following properties names can all be used:
 |`person.first-name`
 |Dashed notation, recommended for use in `.properties` and `.yml` files.

+|`person.first_name`
+|Underscore notation, alternative format for use in `.properties` and `.yml` files.
+
 |`PERSON_FIRST_NAME`
 |Upper case format. Recommended when using a system environment variables.
 |===