Merge branch '5.2' into 5.x

* 5.2:
  improve documentation for mailer failover and round-robin transports

Author: javiereguiluz

mailer.rst

@@ -210,9 +210,9 @@ A failover transport is configured with two or more transports and the
 
     MAILER_DSN="failover(postmark+api://ID@default sendgrid+smtp://KEY@default)"
 
-The mailer will start using the first transport. If the sending fails, the
-mailer won't retry it with the other transports, but it will switch to the next
-transport automatically for the following deliveries.
+The failover-transport starts using the first transport and if it fails, it
+will retry the same delivery with the next transports until one of them succeeds
+(or until all of them fail).
 
 Load Balancing
 ~~~~~~~~~~~~~~
@@ -227,9 +227,12 @@ A round-robin transport is configured with two or more transports and the
 
     MAILER_DSN="roundrobin(postmark+api://ID@default sendgrid+smtp://KEY@default)"
 
-The mailer will start using a randomly selected transport and if it fails, it
-will retry the same delivery with the next transports until one of them succeeds
-(or until all of them fail).
+The round-robin transport starts with a *randomly* selected transport and
+then switches to the next available transport for each subsequent email.
+
+As with the failover transport, round-robin retries deliveries until
+a transport succeeds (or all fail). In contrast to the failover transport,
+it *spreads* the load across all its transports.
 
 .. versionadded:: 5.1