diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
index d264f43b88b..0af5f3d146c 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
@@ -89,7 +89,7 @@ public class RabbitProperties {
 	private boolean publisherReturns;
 
 	/**
-	 * The connection timeout, in milliseconds; zero for infinite.
+	 * Connection timeout, in milliseconds; zero for infinite.
 	 */
 	private Integer connectionTimeout;
 
diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 2c3d1337907..18e0c013def 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -845,7 +845,7 @@ content into your application; rather pick only the properties that you need.
 	spring.rabbitmq.cache.channel.size= # Number of channels to retain in the cache.
 	spring.rabbitmq.cache.connection.mode=CHANNEL # Connection factory cache mode.
 	spring.rabbitmq.cache.connection.size= # Number of connections to cache.
-	spring.rabbitmq.connection-timeout= # Connection Timeout, in milliseconds.
+	spring.rabbitmq.connection-timeout=0 # Connection timeout, in milliseconds; zero for infinite.
 	spring.rabbitmq.dynamic=true # Create an AmqpAdmin bean.
 	spring.rabbitmq.host=localhost # RabbitMQ host.
 	spring.rabbitmq.listener.acknowledge-mode= # Acknowledge mode of container.