Merge branch '5.2' into 5.x

* 5.2:
  [Messenger] Remove duplicated AMQP transport option

Author: javiereguiluz

messenger.rst

@@ -993,15 +993,12 @@ The transport has a number of options:
 ``cert``                                      Path to the client certificate in PEM format.
 ``channel_max``                               Specifies highest channel number that the server
                                               permits. 0 means standard extension limit
-``confirm_timeout``                           Timeout in seconds for confirmation, if none
-                                              specified transport will not wait for message
+``confirm_timeout``                           Timeout in seconds for confirmation; if none
+                                              specified, transport will not wait for message
                                               confirmation. Note: 0 or greater seconds. May be
                                               fractional.
 ``connect_timeout``                           Connection timeout. Note: 0 or greater seconds.
                                               May be fractional.
-``confirm_timeout``                           Number of seconds to wait for message sending
-                                              confirmation. If not specified, transport won't
-                                              wait for confirmation. May be fractional.
 ``frame_max``                                 The largest frame size that the server proposes
                                               for the connection, including frame header and
                                               end-byte. 0 means standard extension limit