Procházet zdrojové kódy

Fix docs for #14047

Signed-off-by: John Howard <jhoward@microsoft.com>
John Howard před 10 roky
rodič
revize
857e0ba32e
2 změnil soubory, kde provedl 45 přidání a 13 odebrání
  1. 17 12
      docs/reference/commandline/version.md
  2. 28 1
      man/docker-version.1.md

+ 17 - 12
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
+	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

+ 28 - 1
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 <SvenDowideit@home.org.au>
+June 2015, updated by John Howard <jhoward@microsoft.com>