1. docker
  2. Commit 6de8fcb2f2baf335fc24e10909078199af528e8d
Browse code

Use spaces, not tabs, to format sample "swarm join" command

Using tabs here seems to cause copy/paste problems in some terminals.
Using spaces is safer.

Fixes #24609

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>

Aaron Lehmann authored on 2016/07/14 10:26:54
Showing 3 changed files
api/client/swarm/init.go
History View file @ 6de8fcb
... ... 
@@ -56,7 +56,7 @@ func runInit(dockerCli *client.DockerCli, flags *pflag.FlagSet, opts initOptions
56 56 
 	// If no secret was specified, we create a random one
57 57 
 	if !flags.Changed("secret") {
58 58 
 		opts.secret = generateRandomSecret()
59 
-		fmt.Fprintf(dockerCli.Out(), "No --secret provided. Generated random secret:\n\t%s\n\n", opts.secret)
59 
+		fmt.Fprintf(dockerCli.Out(), "No --secret provided. Generated random secret:\n    %s\n\n", opts.secret)
60 60 
 	}
61 61
62 62 
 	req := swarm.InitRequest{
... ... 
@@ -88,7 +88,7 @@ func runInit(dockerCli *client.DockerCli, flags *pflag.FlagSet, opts initOptions
88 88 
 		if opts.secret != "" {
89 89 
 			secretArgs = "--secret " + opts.secret
90 90 
 		}
91 
-		fmt.Fprintf(dockerCli.Out(), "To add a worker to this swarm, run the following command:\n\tdocker swarm join %s \\\n\t--ca-hash %s \\\n\t%s\n", secretArgs, info.Swarm.CACertHash, node.ManagerStatus.Addr)
91 
+		fmt.Fprintf(dockerCli.Out(), "To add a worker to this swarm, run the following command:\n    docker swarm join %s \\\n    --ca-hash %s \\\n    %s\n", secretArgs, info.Swarm.CACertHash, node.ManagerStatus.Addr)
92 92 
 	}
93 93
94 94 
 	return nil
docs/reference/commandline/swarm_init.md
History View file @ 6de8fcb
... ... 
@@ -35,14 +35,14 @@ in the newly created one node Swarm cluster.
35 35 
 ```bash
36 36 
 $ docker swarm init --listen-addr 192.168.99.121:2377
37 37 
 No --secret provided. Generated random secret:
38 
-	4ao565v9jsuogtq5t8s379ulb
38 
+    4ao565v9jsuogtq5t8s379ulb
39 39
40 40 
 Swarm initialized: current node (1ujecd0j9n3ro9i6628smdmth) is now a manager.
41 41
42 42 
 To add a worker to this swarm, run the following command:
43 
-	docker swarm join --secret 4ao565v9jsuogtq5t8s379ulb \
44 
-	--ca-hash sha256:07ce22bd1a7619f2adc0d63bd110479a170e7c4e69df05b67a1aa2705c88ef09 \
45 
-	192.168.99.121:2377
43 
+    docker swarm join --secret 4ao565v9jsuogtq5t8s379ulb \
44 
+    --ca-hash sha256:07ce22bd1a7619f2adc0d63bd110479a170e7c4e69df05b67a1aa2705c88ef09 \
45 
+    192.168.99.121:2377
46 46 
 $ docker node ls
47 47 
 ID                           HOSTNAME  MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS          LEADER
48 48 
 1ujecd0j9n3ro9i6628smdmth *  manager1  Accepted    Ready   Active        Reachable               Yes
docs/swarm/swarm-tutorial/create-swarm.md
History View file @ 6de8fcb
... ... 
@@ -31,14 +31,14 @@ node. For example, the tutorial uses a machine named `manager1`.
31 31 
     ```
32 32 
     $ docker swarm init --listen-addr 192.168.99.100:2377
33 33 
     No --secret provided. Generated random secret:
34 
-	4ao565v9jsuogtq5t8s379ulb
34 
+        4ao565v9jsuogtq5t8s379ulb
35 35
36 36 
     Swarm initialized: current node (dxn1zf6l61qsb1josjja83ngz) is now a manager.
37 37
38 38 
     To add a worker to this swarm, run the following command:
39 
-	docker swarm join --secret 4ao565v9jsuogtq5t8s379ulb \
40 
-	--ca-hash sha256:07ce22bd1a7619f2adc0d63bd110479a170e7c4e69df05b67a1aa2705c88ef09 \
41 
-	192.168.99.100:2377
39 
+        docker swarm join --secret 4ao565v9jsuogtq5t8s379ulb \
40 
+        --ca-hash sha256:07ce22bd1a7619f2adc0d63bd110479a170e7c4e69df05b67a1aa2705c88ef09 \
41 
+        192.168.99.100:2377
42 42 
     ```
43 43
44 44 
     The `--listen-addr` flag configures the manager node to listen on port