mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Remove -h flag from completion and daemon reference
All docker subcommands support `-h` as an alias for `--help` unless they have `-h` aliased to something else like `docker run`, which uses `-h` for `--hostname`. `-h` is not included in the help messages of the commands, though. It ist visible in * reference: only in `docker daemon` reference, see output of `grep -Rse --help=false docs` * man pages: only in `docker` man page see output of `grep -RF '**-h**' man` For consistency reasons, this commit removes `-h` as an alias for `--help` from the reference page, man page and the bash completion. Signed-off-by: Harald Albers <github@albersweb.de>
This commit is contained in:
		
							parent
							
								
									2231c5161e
								
							
						
					
					
						commit
						ceb11d9660
					
				
					 5 changed files with 6 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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.
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,7 @@ its own man page which explain usage and arguments.
 | 
			
		|||
To see the man page for a command run **man docker <command>**.
 | 
			
		||||
 | 
			
		||||
# OPTIONS
 | 
			
		||||
**-h**, **--help**
 | 
			
		||||
**--help**
 | 
			
		||||
  Print usage statement
 | 
			
		||||
 | 
			
		||||
**--api-cors-header**=""
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue