diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 28123ae731..faff614fb9 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -320,7 +320,7 @@ __docker_signals() { _docker_docker() { local boolean_options=" $global_boolean_options - --help -h + --help --version -v " @@ -460,7 +460,7 @@ _docker_create() { _docker_daemon() { local boolean_options=" $global_boolean_options - --help -h + --help --icc=false --ip-forward=false --ip-masq=false diff --git a/docker/docker.go b/docker/docker.go index 236742debf..8ad0d13c05 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -27,7 +27,7 @@ func main() { flag.Merge(flag.CommandLine, clientFlags.FlagSet, commonFlags.FlagSet) flag.Usage = func() { - fmt.Fprint(os.Stdout, "Usage: docker [OPTIONS] COMMAND [arg...]\n"+daemonUsage+" docker [ -h | --help | -v | --version ]\n\n") + fmt.Fprint(os.Stdout, "Usage: docker [OPTIONS] COMMAND [arg...]\n"+daemonUsage+" docker [ --help | -v | --version ]\n\n") fmt.Fprint(os.Stdout, "A self-sufficient runtime for containers.\n\nOptions:\n") flag.CommandLine.SetOutput(os.Stdout) diff --git a/docs/reference/commandline/cli.md b/docs/reference/commandline/cli.md index 2766bb4dac..a07fc8b333 100644 --- a/docs/reference/commandline/cli.md +++ b/docs/reference/commandline/cli.md @@ -16,7 +16,7 @@ or execute `docker help`: $ docker Usage: docker [OPTIONS] COMMAND [arg...] docker daemon [ --help | ... ] - docker [ -h | --help | -v | --version ] + docker [ --help | -v | --version ] -H, --host=[]: The socket(s) to bind to in daemon mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd. diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md index 2f2010941e..cea4cc68d6 100644 --- a/docs/reference/commandline/daemon.md +++ b/docs/reference/commandline/daemon.md @@ -32,7 +32,7 @@ parent = "smn_cli" -G, --group="docker" Group for the unix socket -g, --graph="/var/lib/docker" Root of the Docker runtime -H, --host=[] Daemon socket(s) to connect to - -h, --help=false Print usage + --help=false Print usage --icc=true Enable inter-container communication --insecure-registry=[] Enable insecure registry communication --ip=0.0.0.0 Default IP when binding container ports diff --git a/man/docker.1.md b/man/docker.1.md index 898ff08a56..40b7bd65ee 100644 --- a/man/docker.1.md +++ b/man/docker.1.md @@ -23,7 +23,7 @@ its own man page which explain usage and arguments. To see the man page for a command run **man docker **. # OPTIONS -**-h**, **--help** +**--help** Print usage statement **--api-cors-header**=""