From fec81690ccaf4c4b81342f632bc1a3ec3ad6b86c Mon Sep 17 00:00:00 2001 From: Ben Firshman Date: Tue, 9 Sep 2014 10:12:03 -0700 Subject: [PATCH] Consolidate documentation for -H option Signed-off-by: Ben Firshman --- docker/flags.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/flags.go b/docker/flags.go index 5d731954c..bb5b427d6 100644 --- a/docker/flags.go +++ b/docker/flags.go @@ -5,7 +5,6 @@ import ( "os" "path/filepath" - "github.com/docker/docker/api" "github.com/docker/docker/opts" flag "github.com/docker/docker/pkg/mflag" ) @@ -40,10 +39,10 @@ func init() { flCa = flag.String([]string{"-tlscacert"}, filepath.Join(dockerCertPath, defaultCaFile), "Trust only remotes providing a certificate signed by the CA given here") flCert = flag.String([]string{"-tlscert"}, filepath.Join(dockerCertPath, defaultCertFile), "Path to TLS certificate file") flKey = flag.String([]string{"-tlskey"}, filepath.Join(dockerCertPath, defaultKeyFile), "Path to TLS key file") - opts.HostListVar(&flHosts, []string{"H", "-host"}, "The socket(s) to bind to in daemon mode\nspecified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.") + opts.HostListVar(&flHosts, []string{"H", "-host"}, "The socket(s) to bind to in daemon mode or connect to in client mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.") flag.Usage = func() { - fmt.Fprintf(os.Stderr, "Usage: docker [OPTIONS] COMMAND [arg...]\n -H=[unix://%s]: tcp://host:port to bind/connect to or unix://path/to/socket to use\n\nA self-sufficient runtime for linux containers.\n\nOptions:\n", api.DEFAULTUNIXSOCKET) + fmt.Fprint(os.Stderr, "Usage: docker [OPTIONS] COMMAND [arg...]\n\nA self-sufficient runtime for linux containers.\n\nOptions:\n") flag.PrintDefaults()