From 75186acbffa72768925beb67ae5fb79f3a2f75d6 Mon Sep 17 00:00:00 2001 From: Ma Shimiao Date: Tue, 9 Jun 2015 21:33:41 +0800 Subject: [PATCH] Unify docker commands' usage in man and help Signed-off-by: Ma Shimiao --- docs/reference/commandline/load.md | 2 +- man/docker-export.1.md | 2 +- man/docker-load.1.md | 2 +- man/docker-logout.1.md | 2 +- man/docker-top.1.md | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/reference/commandline/load.md b/docs/reference/commandline/load.md index 4ffd083822..2f52465ebf 100644 --- a/docs/reference/commandline/load.md +++ b/docs/reference/commandline/load.md @@ -13,7 +13,7 @@ weight=1 Usage: docker load [OPTIONS] - Load an image from a tar archive on STDIN + Load an image from a tar archive or STDIN -i, --input="" Read from a tar archive file, instead of STDIN diff --git a/man/docker-export.1.md b/man/docker-export.1.md index 0bc71ad89f..f3096eacfc 100644 --- a/man/docker-export.1.md +++ b/man/docker-export.1.md @@ -2,7 +2,7 @@ % Docker Community % JUNE 2014 # NAME -docker-export - Export the contents of a filesystem as a tar archive to STDOUT +docker-export - Export the contents of a container's filesystem as a tar archive # SYNOPSIS **docker export** diff --git a/man/docker-load.1.md b/man/docker-load.1.md index c045443689..1a43a5e0d9 100644 --- a/man/docker-load.1.md +++ b/man/docker-load.1.md @@ -2,7 +2,7 @@ % Docker Community % JUNE 2014 # NAME -docker-load - Load an image from a tar archive on STDIN +docker-load - Load an image from a tar archive or STDIN # SYNOPSIS **docker load** diff --git a/man/docker-logout.1.md b/man/docker-logout.1.md index 3726fd66ca..d116986798 100644 --- a/man/docker-logout.1.md +++ b/man/docker-logout.1.md @@ -2,7 +2,7 @@ % Docker Community % JUNE 2014 # NAME -docker-logout - Log out from a Docker Registry. +docker-logout - Log out from a Docker registry. # SYNOPSIS **docker logout** diff --git a/man/docker-top.1.md b/man/docker-top.1.md index c3bbf883f7..9828d98be5 100644 --- a/man/docker-top.1.md +++ b/man/docker-top.1.md @@ -11,7 +11,7 @@ CONTAINER [ps OPTIONS] # DESCRIPTION -Look up the running process of the container. ps-OPTION can be any of the +Display the running process of the container. ps-OPTION can be any of the options you would pass to a Linux ps command. # OPTIONS @@ -31,3 +31,4 @@ Run **docker top** with the ps option of -x: April 2014, Originally compiled by William Henry (whenry at redhat dot com) based on docker.com source material and internal work. June 2014, updated by Sven Dowideit +June 2015, updated by Ma Shimiao