From fbe671eb09ef1e2d4c1ce02cab171af172c7b9c9 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 14 Oct 2015 17:24:13 -0700 Subject: [PATCH] use Server Version Signed-off-by: Victor Vieux Upstream-commit: 17b0017cd0949f0772a849e6e5d0ee6084ff5340 Component: engine --- components/engine/api/client/info.go | 2 +- components/engine/docs/reference/commandline/info.md | 2 +- components/engine/docs/userguide/labels-custom-metadata.md | 2 +- components/engine/man/docker-info.1.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/engine/api/client/info.go b/components/engine/api/client/info.go index 5cef4b0d78..06171826a6 100644 --- a/components/engine/api/client/info.go +++ b/components/engine/api/client/info.go @@ -35,7 +35,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error { fmt.Fprintf(cli.out, "Containers: %d\n", info.Containers) fmt.Fprintf(cli.out, "Images: %d\n", info.Images) - ioutils.FprintfIfNotEmpty(cli.out, "Engine Version: %s\n", info.ServerVersion) + ioutils.FprintfIfNotEmpty(cli.out, "Server Version: %s\n", info.ServerVersion) ioutils.FprintfIfNotEmpty(cli.out, "Storage Driver: %s\n", info.Driver) if info.DriverStatus != nil { for _, pair := range info.DriverStatus { diff --git a/components/engine/docs/reference/commandline/info.md b/components/engine/docs/reference/commandline/info.md index 446b686971..1794df40b5 100644 --- a/components/engine/docs/reference/commandline/info.md +++ b/components/engine/docs/reference/commandline/info.md @@ -22,7 +22,7 @@ For example: $ docker -D info Containers: 14 Images: 52 - Engine Version: 1.9.0 + Server Version: 1.9.0 Storage Driver: aufs Root Dir: /var/lib/docker/aufs Backing Filesystem: extfs diff --git a/components/engine/docs/userguide/labels-custom-metadata.md b/components/engine/docs/userguide/labels-custom-metadata.md index 3bab148354..e4ac7c4cdf 100644 --- a/components/engine/docs/userguide/labels-custom-metadata.md +++ b/components/engine/docs/userguide/labels-custom-metadata.md @@ -188,7 +188,7 @@ These labels appear as part of the `docker info` output for the daemon: $ docker -D info Containers: 12 Images: 672 - Engine Version: 1.9.0 + Server Version: 1.9.0 Storage Driver: aufs Root Dir: /var/lib/docker/aufs Backing Filesystem: extfs diff --git a/components/engine/man/docker-info.1.md b/components/engine/man/docker-info.1.md index 1aca0b5b20..f67a4fb00c 100644 --- a/components/engine/man/docker-info.1.md +++ b/components/engine/man/docker-info.1.md @@ -33,7 +33,7 @@ Here is a sample output: # docker info Containers: 14 Images: 52 - Engine Version: 1.9.0 + Server Version: 1.9.0 Storage Driver: aufs Root Dir: /var/lib/docker/aufs Dirs: 80