diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
index 900d0b0b..652c0c63 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
@@ -823,10 +823,12 @@ public class RabbitTemplate extends RabbitAccessor // NOSONAR type line count
 	}
 
 	/**
-	 * To avoid deadlocked connections, it is generally recommended to use
-	 * a separate connection for publishers and consumers (except when a publisher
-	 * is participating in a consumer transaction). Default 'false'; will change
-	 * to 'true' in 2.1.
+	 * To avoid deadlocked connections, it is generally recommended to use a separate
+	 * connection for publishers and consumers (except when a publisher is participating
+	 * in a consumer transaction). Default 'false'. When setting this to true, be careful
+	 * in that a {@link RabbitAdmin} that uses this template will declare queues on the
+	 * publisher connection; this may not be what you expect, especially with exclusive
+	 * queues that might be consumed in this application.
 	 * @param usePublisherConnection true to use a publisher connection.
 	 * @since 2.0.2
 	 */