From e4106e592a42aa9e460c30a50ba043ebe88b0cf5 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 15 Apr 2016 08:58:18 +0200 Subject: [PATCH] Polish doc Closes gh-5675 --- .../src/main/asciidoc/spring-boot-features.adoc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 823f3c4676..72f7d00615 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -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