Skip to content

Commit

Permalink
Polish doc
Browse files Browse the repository at this point in the history
  • Loading branch information
snicoll committed Apr 15, 2016
1 parent 5bc290e commit e4106e5
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2420,9 +2420,11 @@ If you use the `spring-boot-starter-jdbc` or `spring-boot-starter-data-jpa`
'`starter POMs`' you will automatically get a dependency to `tomcat-jdbc`.

NOTE: You can bypass that algorithm completely and specify the connection pool to use via
the `spring.datasource.type` property. Also, additional connection pools can always be
configured manually. If you define your own `DataSource` bean, auto-configuration will
not occur.
the `spring.datasource.type` property. This is especially important if you are running
your application in a Tomcat container as `tomcat-jdbc` is provided by default.

TIP: Additional connection pools can always be configured manually. If you define your
own `DataSource` bean, auto-configuration will not occur.

DataSource configuration is controlled by external configuration properties in
`+spring.datasource.*+`. For example, you might declare the following section in
Expand Down

0 comments on commit e4106e5

Please sign in to comment.