From c2049a170300910fd9234ec12cb37dd2962bf95f Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 25 Jun 2015 09:55:46 -0700 Subject: [PATCH] Fix docs for #14047 Signed-off-by: John Howard --- docs/reference/commandline/version.md | 29 ++++++++++++++++----------- man/docker-version.1.md | 29 ++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/docs/reference/commandline/version.md b/docs/reference/commandline/version.md index 21944c93e0..a0ae2406af 100644 --- a/docs/reference/commandline/version.md +++ b/docs/reference/commandline/version.md @@ -15,17 +15,22 @@ weight=1 Show the Docker version information. -Show the Docker version, API version, Git commit, Go version and -OS/architecture of both Docker client and daemon. Example use: +Show the Docker version, API version, Go version, Git commit, Build date/time, +and OS/architecture of both Docker client and daemon. Example use: $ docker version - Client version: 1.5.0 - Client API version: 1.17 - Go version (client): go1.4.1 - Git commit (client): a8a31ef - OS/Arch (client): darwin/amd64 - Server version: 1.5.0 - Server API version: 1.17 - Go version (server): go1.4.1 - Git commit (server): a8a31ef - OS/Arch (server): linux/amd64 \ No newline at end of file + Client: + Version: 1.8.0 + API version: 1.20 + Go version: go1.4.2 + Git commit: f5bae0a + Built: Tue Jun 23 17:56:00 UTC 2015 + OS/Arch: linux/amd64 + + Server: + Version: 1.8.0 + API version: 1.20 + Go version: go1.4.2 + Git commit: f5bae0a + Built: Tue Jun 23 17:56:00 UTC 2015 + OS/Arch: linux/amd64 \ No newline at end of file diff --git a/man/docker-version.1.md b/man/docker-version.1.md index 9c029b239d..ffdd48e70b 100644 --- a/man/docker-version.1.md +++ b/man/docker-version.1.md @@ -1,15 +1,42 @@ % DOCKER(1) Docker User Manuals % Docker Community -% JUNE 2014 +% JUNE 2015 # NAME docker-version - Show the Docker version information. # SYNOPSIS **docker version** +# DESCRIPTION +This command displays version information for both the Docker client and +daemon. # OPTIONS There are no available options. +# EXAMPLES + +## Display Docker version information + +Here is a sample output: + + $ docker version + Client: + Version: 1.8.0 + API version: 1.20 + Go version: go1.4.2 + Git commit: f5bae0a + Built: Tue Jun 23 17:56:00 UTC 2015 + OS/Arch: linux/amd64 + + Server: + Version: 1.8.0 + API version: 1.20 + Go version: go1.4.2 + Git commit: f5bae0a + Built: Tue Jun 23 17:56:00 UTC 2015 + OS/Arch: linux/amd64 + # HISTORY June 2014, updated by Sven Dowideit +June 2015, updated by John Howard