root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

This commit is contained in:
Stephane Nicoll 2016-03-29 10:57:02 +02:00
parent f7ffb017ad 3363415712
commit 87b963b396
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -852,6 +852,9 @@ The following properties names can all be used:
|`person.first-name` |`person.first-name`
|Dashed notation, recommended for use in `.properties` and `.yml` files. |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` |`PERSON_FIRST_NAME`
|Upper case format. Recommended when using a system environment variables. |Upper case format. Recommended when using a system environment variables.
|=== |===