Ver código fonte

Make labels human readable

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ea365e4cb37d037046364773d01a744b1258ce4e)
Signed-off-by: Tibor Vass <tibor@docker.com>
Sebastiaan van Stijn 9 anos atrás
pai
commit
ca9805f78d

+ 2 - 2
api/client/info.go

@@ -74,11 +74,11 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
 		if info.Swarm.Error != "" {
 		if info.Swarm.Error != "" {
 			fmt.Fprintf(cli.out, " Error: %v\n", info.Swarm.Error)
 			fmt.Fprintf(cli.out, " Error: %v\n", info.Swarm.Error)
 		}
 		}
-		fmt.Fprintf(cli.out, " IsManager: %v\n", info.Swarm.ControlAvailable)
+		fmt.Fprintf(cli.out, " Is Manager: %v\n", info.Swarm.ControlAvailable)
 		if info.Swarm.ControlAvailable {
 		if info.Swarm.ControlAvailable {
 			fmt.Fprintf(cli.out, " Managers: %d\n", info.Swarm.Managers)
 			fmt.Fprintf(cli.out, " Managers: %d\n", info.Swarm.Managers)
 			fmt.Fprintf(cli.out, " Nodes: %d\n", info.Swarm.Nodes)
 			fmt.Fprintf(cli.out, " Nodes: %d\n", info.Swarm.Nodes)
-			ioutils.FprintfIfNotEmpty(cli.out, " CACertHash: %s\n", info.Swarm.CACertHash)
+			ioutils.FprintfIfNotEmpty(cli.out, " CA Certificate Hash: %s\n", info.Swarm.CACertHash)
 		}
 		}
 	}
 	}
 
 

+ 1 - 1
docs/reference/commandline/info.md

@@ -56,7 +56,7 @@ storage driver and a node that is part of a 2 node Swarm cluster:
      Network: bridge null host overlay
      Network: bridge null host overlay
     Swarm: 
     Swarm: 
      NodeID: 0gac67oclbxq7
      NodeID: 0gac67oclbxq7
-     IsManager: YES
+     Is Manager: true
      Managers: 2
      Managers: 2
      Nodes: 2
      Nodes: 2
     Runtimes: default
     Runtimes: default

+ 2 - 2
docs/swarm/swarm-tutorial/create-swarm.md

@@ -57,10 +57,10 @@ node. For example, the tutorial uses a machine named `manager1`.
      ...snip...
      ...snip...
      Swarm: active
      Swarm: active
       NodeID: dxn1zf6l61qsb1josjja83ngz
       NodeID: dxn1zf6l61qsb1josjja83ngz
-      IsManager: Yes
+      Is Manager: true
       Managers: 1
       Managers: 1
       Nodes: 1
       Nodes: 1
-      CACertHash: sha256:b7986d3baeff2f5664dfe350eec32e2383539ec1a802ba541c4eb829056b5f61
+      CA Certificate Hash: sha256:b7986d3baeff2f5664dfe350eec32e2383539ec1a802ba541c4eb829056b5f61
      ...snip...
      ...snip...
      ```
      ```