diff --git a/cli/flags.go b/cli/flags.go
index bec32bfe1d..345e3f7aae 100644
--- a/cli/flags.go
+++ b/cli/flags.go
@@ -34,12 +34,12 @@ var (
 	}
 	flJoinAdvertise = cli.StringFlag{
 		Name:   "advertise, addr",
-		Usage:  "Address of the Docker Engine joining the cluster. Swarm managers MUST be able to reach Docker at this address.",
+		Usage:  "Address of the Docker Engine joining the cluster. Swarm manager(s) MUST be able to reach the Docker Engine at this address.",
 		EnvVar: "SWARM_ADVERTISE",
 	}
 	flManageAdvertise = cli.StringFlag{
 		Name:   "advertise, addr",
-		Usage:  "Address of the Swarm manager joining the cluster. Other swarm managers MUST be able to reach Swarm at this address.",
+		Usage:  "Address of the swarm manager joining the cluster. Other swarm manager(s) MUST be able to reach the swarm manager at this address.",
 		EnvVar: "SWARM_ADVERTISE",
 	}
 	// hack for go vet
diff --git a/cli/help.go b/cli/help.go
index 822242aeb3..4ee4f95820 100644
--- a/cli/help.go
+++ b/cli/help.go
@@ -33,13 +33,13 @@ Run '{{.Name}} COMMAND --help' for more information on a command.
 {{.Usage}}{{if $DISCOVERY}}
 
 Arguments: 
-   <discovery>                                  discovery service to use [$SWARM_DISCOVERY]
-                                                 * token://<token>
-                                                 * consul://<ip>/<path>
-                                                 * etcd://<ip1>,<ip2>/<path>
-                                                 * file://path/to/file
-                                                 * zk://<ip1>,<ip2>/<path>
-                                                 * <ip1>,<ip2>{{end}}{{if .Flags}}
+   <discovery>    discovery service to use [$SWARM_DISCOVERY]
+                   * token://<token>
+                   * consul://<ip>/<path>
+                   * etcd://<ip1>,<ip2>/<path>
+                   * file://path/to/file
+                   * zk://<ip1>,<ip2>/<path>
+                   * <ip1>,<ip2>{{end}}{{if .Flags}}
 
 Options:
    {{range .Flags}}{{.}}