moby/docs/reference/commandline
Sebastiaan van Stijn ebebd41769
Improve swarm join-token instructions
this change improves the instructions for
swarm join-token and swarm init;

- only print the join-token command for workers
  instead of for both managers and workers, to
  prevent users from copying the wrong command.
  An extra line is added to explain how to obtain
  the manager token.
- print a message that a token was rotated
  sucesfully if '--rotate' is used.
- add some extra white-space before / after
  the join commands, to make copy/pasting
  easier.

this change also does some refactoring of join-token;

- move flagname-constants together with other constants
- use variables for selected role ("worker" / "manager")
  to prevent checking for them multiple times, and to
  keep the "worker" / "manager" sting centralized
- add an extra blank line after "join-token" instructions
  this makes it easier to copy, and cleans up the
  code a tiny bit

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-02 16:44:02 +02:00
..
attach.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
build.md docs: add code-hints to builder page 2016-07-20 16:18:44 +02:00
cli.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
commit.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
cp.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
create.md Improve flag help consistency, and update docs 2016-07-16 01:58:01 +02:00
deploy.md Append --registry-auth with with 2016-07-22 10:38:56 +02:00
diff.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
docker_images.gif retooling for hugo 2015-06-15 13:19:38 -07:00
dockerd.md Merge pull request #24970 from sfsmithcha/daemonless_containers 2016-07-27 11:00:15 +02:00
events.md Make daemon events listen for plugin lifecycle events. 2016-07-26 10:51:47 -07:00
exec.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
export.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
history.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
images.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
import.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
index.md update command description in CLI 2016-07-31 00:06:18 +08:00
info.md Update usage of "Swarm" for consistency 2016-07-27 23:31:55 +02:00
inspect.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
kill.md update command description in CLI 2016-07-31 00:06:18 +08:00
load.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
login.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
logout.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
logs.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
menu.md add menu.md, make index.md command line reference, update typos/minor errors in cli docs 2016-06-30 14:30:11 -07:00
network_connect.md Rename --net to --network 2016-07-12 13:01:35 -07:00
network_create.md better command docker network create -h output 2016-07-16 15:32:17 +08:00
network_disconnect.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
network_inspect.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
network_ls.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
network_rm.md update command description in CLI 2016-07-31 00:06:18 +08:00
node_demote.md update command description in CLI 2016-07-31 00:06:18 +08:00
node_inspect.md cli: docker service|node|stack ps instead of tasks 2016-07-27 11:06:42 -07:00
node_ls.md cli: docker service|node|stack ps instead of tasks 2016-07-27 11:06:42 -07:00
node_promote.md update command description in CLI 2016-07-31 00:06:18 +08:00
node_ps.md cli: docker service|node|stack ps instead of tasks 2016-07-27 11:06:42 -07:00
node_rm.md update command description in CLI 2016-07-31 00:06:18 +08:00
node_update.md cli: docker service|node|stack ps instead of tasks 2016-07-27 11:06:42 -07:00
pause.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
plugin_disable.md docs: update reference docs for plugins 2016-07-20 23:37:55 +02:00
plugin_enable.md docs: update reference docs for plugins 2016-07-20 23:37:55 +02:00
plugin_inspect.md docs: update reference docs for plugins 2016-07-20 23:37:55 +02:00
plugin_install.md docs: update reference docs for plugins 2016-07-20 23:37:55 +02:00
plugin_ls.md docs: update reference docs for plugins 2016-07-20 23:37:55 +02:00
plugin_rm.md docs: fix copy/pasta error 2016-07-20 23:59:38 +02:00
port.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
ps.md docs: improve formatting and highlighting of docker ps reference 2016-07-21 12:27:39 +02:00
pull.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
push.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
rename.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
restart.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
rm.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
rmi.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
run.md Improve flag help consistency, and update docs 2016-07-16 01:58:01 +02:00
save.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
search.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
service_create.md cli: docker service|node|stack ps instead of tasks 2016-07-27 11:06:42 -07:00
service_inspect.md cli: docker service|node|stack ps instead of tasks 2016-07-27 11:06:42 -07:00
service_ls.md cli: docker service|node|stack ps instead of tasks 2016-07-27 11:06:42 -07:00
service_ps.md cli: docker service|node|stack ps instead of tasks 2016-07-27 11:06:42 -07:00
service_rm.md update command description in CLI 2016-07-31 00:06:18 +08:00
service_scale.md cli: docker service|node|stack ps instead of tasks 2016-07-27 11:06:42 -07:00
service_update.md cli: docker service|node|stack ps instead of tasks 2016-07-27 11:06:42 -07:00
stack_config.md docs: add initial reference for "stack services" 2016-07-20 18:56:49 +02:00
stack_deploy.md docs: add initial reference for "stack services" 2016-07-20 18:56:49 +02:00
stack_rm.md docs: add initial reference for "stack services" 2016-07-20 18:56:49 +02:00
stack_services.md docs: add initial reference for "stack services" 2016-07-20 18:56:49 +02:00
stack_tasks.md docs: add initial reference for "stack services" 2016-07-20 18:56:49 +02:00
start.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
stats.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
stop.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
swarm_init.md Improve swarm join-token instructions 2016-08-02 16:44:02 +02:00
swarm_join.md Remove release-candidate advisories 2016-07-27 11:24:16 +02:00
swarm_join_token.md Improve swarm join-token instructions 2016-08-02 16:44:02 +02:00
swarm_leave.md Remove release-candidate advisories 2016-07-27 11:24:16 +02:00
swarm_update.md Update usage of "Swarm" for consistency 2016-07-27 23:31:55 +02:00
tag.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
top.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
unpause.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
update.md docs: cleanup docker update docs 2016-07-14 13:05:57 +02:00
version.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
volume_create.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
volume_inspect.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
volume_ls.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00
volume_rm.md update command description in CLI 2016-07-31 00:06:18 +08:00
wait.md Updates on cli reference documentation 2016-07-07 20:43:18 +02:00