Browse code

Merge pull request #29309 from ohmk/fix-description-of-docker-swarm-command

Fix description of docker swarm command

Vincent Demeester authored on 2016/12/12 18:34:35
Showing 2 changed files
... ...
@@ -21,10 +21,10 @@ Usage:  docker swarm join [OPTIONS] HOST:PORT
21 21
 Join a swarm as a node and/or manager
22 22
 
23 23
 Options:
24
-      --advertise-addr value   Advertised address (format: <ip|interface>[:port])
25
-      --help                   Print usage
26
-      --listen-addr value      Listen address (format: <ip|interface>[:port)
27
-      --token string           Token for entry into the swarm
24
+      --advertise-addr string   Advertised address (format: <ip|interface>[:port])
25
+      --help                    Print usage
26
+      --listen-addr node-addr   Listen address (format: <ip|interface>[:port]) (default 0.0.0.0:2377)
27
+      --token string            Token for entry into the swarm
28 28
 ```
29 29
 
30 30
 Join a node to a swarm. The node joins as a manager node or worker node based upon the token you
... ...
@@ -24,10 +24,10 @@ Options:
24 24
       --autolock                        Change manager autolocking setting (true|false)
25 25
       --cert-expiry duration            Validity period for node certificates (ns|us|ms|s|m|h) (default 2160h0m0s)
26 26
       --dispatcher-heartbeat duration   Dispatcher heartbeat period (ns|us|ms|s|m|h) (default 5s)
27
-      --external-ca value               Specifications of one or more certificate signing endpoints
27
+      --external-ca external-ca         Specifications of one or more certificate signing endpoints
28 28
       --help                            Print usage
29
-      --max-snapshots int               Number of additional Raft snapshots to retain
30
-      --snapshot-interval int           Number of log entries between Raft snapshots
29
+      --max-snapshots uint              Number of additional Raft snapshots to retain
30
+      --snapshot-interval uint          Number of log entries between Raft snapshots (default 10000)
31 31
       --task-history-limit int          Task history retention limit (default 5)
32 32
 ```
33 33