Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source 
Closes gh-6487
This commit is contained in:
Johnny Lim
2016-07-27 19:51:30 +09:00
committed by Andy Wilkinson
parent eb444f547f
commit 9627d0ed66
15 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@@ -551,7 +551,7 @@ content into your application; rather pick only the properties that you need.
spring.data.cassandra.reconnection-policy= # Reconnection policy class.
spring.data.cassandra.retry-policy= # Class name of the retry policy.
spring.data.cassandra.serial-consistency-level= # Queries serial consistency level.
spring.data.cassandra.schema-action= # Schema action to take at startup.
spring.data.cassandra.schema-action=none # Schema action to take at startup.
spring.data.cassandra.ssl=false # Enable SSL support.
spring.data.cassandra.username= # Login user of the server.

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

@@ -746,7 +746,7 @@ only contain one entry (with name "`my another name`" and description `null`). T
configuration _will not_ add a second `MyPojo` instance to the list, and it won't merge
the items.
When a collection is specified in multiples profiles, the one with highest priority is
When a collection is specified in multiple profiles, the one with highest priority is
used (and only that one):
[source,yaml,indent=0]