Merge remote-tracking branch '1.3.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

@@ -275,8 +275,8 @@ public class RabbitProperties {
 		private String trustStorePassword;
 
 		/**
-		 * The SSL algorithm to use (e.g. TLSv1.1). Default is set automatically by the
-		 * rabbit client library.
+		 * SSL algorithm to use (e.g. TLSv1.1). Default is set automatically by the rabbit
+		 * client library.
 		 */
 		private String algorithm;
 

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -871,6 +871,7 @@ content into your application; rather pick only the properties that you need.
 	spring.rabbitmq.ssl.key-store-password= # Password used to access the key store.
 	spring.rabbitmq.ssl.trust-store= # Trust store that holds SSL certificates.
 	spring.rabbitmq.ssl.trust-store-password= # Password used to access the trust store.
+	spring.rabbitmq.ssl.algorithm= # SSL algorithm to use. By default configure by the rabbit client library.
 	spring.rabbitmq.template.mandatory=false # Enable mandatory messages.
 	spring.rabbitmq.template.receive-timeout=0 # Timeout for `receive()` methods.
 	spring.rabbitmq.template.reply-timeout=5000 # Timeout for `sendAndReceive()` methods.