Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-07-21 11:40:26 +01:00
commit 2ca5e8e5d6
2 changed files with 2 additions and 2 deletions

View File

@ -43,7 +43,7 @@ content into your application; rather pick only the properties that you need.
# LOGGING
logging.path=/var/logs
logging.file=myapp.log
logging.config= # location of config file (default classpath:/logback.xml for logback)
logging.config= # location of config file (default classpath:logback.xml for logback)
logging.level.*= # levels for loggers, e.g. "logging.level.org.springframework=DEBUG" (TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF)
# IDENTITY ({sc-spring-boot}/context/ContextIdApplicationContextInitializer.{sc-ext}[ContextIdApplicationContextInitializer])

View File

@ -868,7 +868,7 @@ You can also set the location of a file to log to (in addition to the console) u
To configure the more fine grained settings of a logging system you need to use the native
configuration format supported by the `LoggingSystem` in question. By default Spring Boot
picks up the native configuration from its default location for the system (e.g.
`classpath:/logback.xml` for Logback), but you can set the location of the config file
`classpath:logback.xml` for Logback), but you can set the location of the config file
using the "logging.config" property.