Merge branch '1.5.x'

2017-05-04 10:42:25 +02:00 · 2017-05-04 10:42:25 +02:00 · 05cf41bd9e
parent f853576bec 81e3b392c3
commit 05cf41bd9e
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@ -4947,7 +4947,7 @@ to avoid having a thread blocked by an unresponsive mail server:

 [source,properties,indent=0]
 ----
-	spring.mail.properties.mail.smtp.connecttimeout=5000
+	spring.mail.properties.mail.smtp.connectiontimeout=5000
 	spring.mail.properties.mail.smtp.timeout=3000
 	spring.mail.properties.mail.smtp.writetimeout=5000
 ----