Unify docker commands' usage in man and help

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
This commit is contained in:
Ma Shimiao 2015-06-09 21:33:41 +08:00 committed by Tibor Vass
parent 24e7d40f42
commit 75186acbff
5 changed files with 6 additions and 5 deletions

View File

@ -13,7 +13,7 @@ weight=1
Usage: docker load [OPTIONS] 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 -i, --input="" Read from a tar archive file, instead of STDIN

View File

@ -2,7 +2,7 @@
% Docker Community % Docker Community
% JUNE 2014 % JUNE 2014
# NAME # 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 # SYNOPSIS
**docker export** **docker export**

View File

@ -2,7 +2,7 @@
% Docker Community % Docker Community
% JUNE 2014 % JUNE 2014
# NAME # NAME
docker-load - Load an image from a tar archive on STDIN docker-load - Load an image from a tar archive or STDIN
# SYNOPSIS # SYNOPSIS
**docker load** **docker load**

View File

@ -2,7 +2,7 @@
% Docker Community % Docker Community
% JUNE 2014 % JUNE 2014
# NAME # NAME
docker-logout - Log out from a Docker Registry. docker-logout - Log out from a Docker registry.
# SYNOPSIS # SYNOPSIS
**docker logout** **docker logout**

View File

@ -11,7 +11,7 @@ CONTAINER [ps OPTIONS]
# DESCRIPTION # 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 you would pass to a Linux ps command.
# OPTIONS # 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) April 2014, Originally compiled by William Henry (whenry at redhat dot com)
based on docker.com source material and internal work. based on docker.com source material and internal work.
June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au> June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
June 2015, updated by Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>