Merge branch '4.0.x-stable' into 4.1.x-stable

michaelklishin · michaelklishin · commit 9fbd7045aaf9 · 2017-06-10T09:05:11.000+03:00
diff --git a/src/main/java/com/rabbitmq/client/ConnectionFactory.java b/src/main/java/com/rabbitmq/client/ConnectionFactory.java
@@ -986,7 +986,8 @@ public Connection newConnection() throws IOException, TimeoutException {
      * is enabled, the connection returned by this method will be {@link Recoverable}. Reconnection
      * attempts will always use the address configured on {@link ConnectionFactory}.
      *
-     * @param connectionName arbitrary sring for connection name client property
+     * @param connectionName client-provided connection name (an arbitrary string). Will
+     *                       be displayed in management UI if the server supports it.
      * @return an interface to the connection
      * @throws IOException if it encounters a problem
      */
@@ -1017,7 +1018,8 @@ public Connection newConnection(ExecutorService executor) throws IOException, Ti
      * attempts will always use the address configured on {@link ConnectionFactory}.
      *
      * @param executor thread execution service for consumers on the connection
-     * @param connectionName arbitrary sring for connection name client property
+     * @param connectionName client-provided connection name (an arbitrary string). Will
+     *                       be displayed in management UI if the server supports it.
      * @return an interface to the connection
      * @throws IOException if it encounters a problem
      */
