From 77dd8474a7b4447d7c5b1d257afe1bb2f6443172 Mon Sep 17 00:00:00 2001 From: Kei Ohmura Date: Sun, 11 Dec 2016 21:21:31 +0900 Subject: [PATCH 1/2] docs: fix description of `docker swarm join --help` Signed-off-by: Kei Ohmura --- docs/reference/commandline/swarm_join.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/reference/commandline/swarm_join.md b/docs/reference/commandline/swarm_join.md index 7753a48731..0cde0d7bcd 100644 --- a/docs/reference/commandline/swarm_join.md +++ b/docs/reference/commandline/swarm_join.md @@ -21,10 +21,10 @@ Usage: docker swarm join [OPTIONS] HOST:PORT Join a swarm as a node and/or manager Options: - --advertise-addr value Advertised address (format: [:port]) - --help Print usage - --listen-addr value Listen address (format: [:port) - --token string Token for entry into the swarm + --advertise-addr string Advertised address (format: [:port]) + --help Print usage + --listen-addr node-addr Listen address (format: [:port]) (default 0.0.0.0:2377) + --token string Token for entry into the swarm ``` Join a node to a swarm. The node joins as a manager node or worker node based upon the token you From 2f0e00f58723cb3e063b49f564173b3768476c99 Mon Sep 17 00:00:00 2001 From: Kei Ohmura Date: Sun, 11 Dec 2016 21:25:40 +0900 Subject: [PATCH 2/2] docs: fix description of `docker swarm update --help` Signed-off-by: Kei Ohmura --- docs/reference/commandline/swarm_update.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/commandline/swarm_update.md b/docs/reference/commandline/swarm_update.md index 84b79135a3..0af63fe3e0 100644 --- a/docs/reference/commandline/swarm_update.md +++ b/docs/reference/commandline/swarm_update.md @@ -24,10 +24,10 @@ Options: --autolock Change manager autolocking setting (true|false) --cert-expiry duration Validity period for node certificates (ns|us|ms|s|m|h) (default 2160h0m0s) --dispatcher-heartbeat duration Dispatcher heartbeat period (ns|us|ms|s|m|h) (default 5s) - --external-ca value Specifications of one or more certificate signing endpoints + --external-ca external-ca Specifications of one or more certificate signing endpoints --help Print usage - --max-snapshots int Number of additional Raft snapshots to retain - --snapshot-interval int Number of log entries between Raft snapshots + --max-snapshots uint Number of additional Raft snapshots to retain + --snapshot-interval uint Number of log entries between Raft snapshots (default 10000) --task-history-limit int Task history retention limit (default 5) ```