@@ -17,7 +17,7 @@ import (

 // Usage: docker attach [OPTIONS] CONTAINER

 func (cli *DockerCli) CmdAttach(args ...string) error {

 	var (

-		cmd     = cli.Subcmd("attach", "CONTAINER", "Attach to a running container", true)

+		cmd     = cli.Subcmd("attach", []string{"CONTAINER"}, "Attach to a running container", true)

 		noStdin = cmd.Bool([]string{"#nostdin", "-no-stdin"}, false, "Do not attach STDIN")

 		proxy   = cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxy all received signals to the process")

 	)

@@ -43,7 +43,7 @@ const (

 //

 // Usage: docker build [OPTIONS] PATH | URL | -

 func (cli *DockerCli) CmdBuild(args ...string) error {

-	cmd := cli.Subcmd("build", "PATH | URL | -", "Build a new image from the source code at PATH", true)

+	cmd := cli.Subcmd("build", []string{"PATH | URL | -"}, "Build a new image from the source code at PATH", true)

 	tag := cmd.String([]string{"t", "-tag"}, "", "Repository name (and optionally a tag) for the image")

 	suppressOutput := cmd.Bool([]string{"q", "-quiet"}, false, "Suppress the verbose output generated by the containers")

 	noCache := cmd.Bool([]string{"#no-cache", "-no-cache"}, false, "Do not use cache when building the image")

@@ -107,29 +107,62 @@ func (cli *DockerCli) Cmd(args ...string) error {

 // A subcommand represents an action that can be performed

 // from the Docker command line client.

 //

+// Multiple subcommand synopses may be provided with one 'Usage' line being

+// printed for each in the following way:

+//

+//	Usage:	docker <subcmd-name> [OPTIONS] <synopsis 0>

+// 		docker <subcmd-name> [OPTIONS] <synopsis 1>

+// 		...

+//

+// If no undeprecated flags are added to the returned FlagSet, "[OPTIONS]" will

+// not be included on the usage synopsis lines. If no synopses are given, only

+// one usage synopsis line will be printed with nothing following the

+// "[OPTIONS]" section

+//

 // To see all available subcommands, run "docker --help".

-func (cli *DockerCli) Subcmd(name, signature, description string, exitOnError bool) *flag.FlagSet {

+func (cli *DockerCli) Subcmd(name string, synopses []string, description string, exitOnError bool) *flag.FlagSet {

 	var errorHandling flag.ErrorHandling

 	if exitOnError {

 		errorHandling = flag.ExitOnError

 	} else {

 		errorHandling = flag.ContinueOnError

 	}

+

 	flags := flag.NewFlagSet(name, errorHandling)

-	if signature != "" {

-		signature = " " + signature

-	}

+

 	flags.Usage = func() {

 		flags.ShortUsage()

 		flags.PrintDefaults()

 	}

+

 	flags.ShortUsage = func() {

 		options := ""

 		if flags.FlagCountUndeprecated() > 0 {

 			options = " [OPTIONS]"

 		}

-		fmt.Fprintf(flags.Out(), "\nUsage: docker %s%s%s\n\n%s\n", name, options, signature, description)

+

+		if len(synopses) == 0 {

+			synopses = []string{""}

+		}

+

+		// Allow for multiple command usage synopses.

+		for i, synopsis := range synopses {

+			lead := "\t"

+			if i == 0 {

+				// First line needs the word 'Usage'.

+				lead = "Usage:\t"

+			}

+

+			if synopsis != "" {

+				synopsis = " " + synopsis

+			}

+

+			fmt.Fprintf(flags.Out(), "\n%sdocker %s%s%s", lead, name, options, synopsis)

+		}

+

+		fmt.Fprintf(flags.Out(), "\n\n%s\n", description)

 	}

+

 	return flags

 }

@@ -17,7 +17,7 @@ import (

 //

 // Usage: docker commit [OPTIONS] CONTAINER [REPOSITORY[:TAG]]

 func (cli *DockerCli) CmdCommit(args ...string) error {

-	cmd := cli.Subcmd("commit", "CONTAINER [REPOSITORY[:TAG]]", "Create a new image from a container's changes", true)

+	cmd := cli.Subcmd("commit", []string{"CONTAINER [REPOSITORY[:TAG]]"}, "Create a new image from a container's changes", true)

 	flPause := cmd.Bool([]string{"p", "-pause"}, true, "Pause container during commit")

 	flComment := cmd.String([]string{"m", "-message"}, "", "Commit message")

 	flAuthor := cmd.String([]string{"a", "#author", "-author"}, "", "Author (e.g., \"John Hannibal Smith <hannibal@a-team.com>\")")

@@ -16,7 +16,7 @@ import (

 //

 // Usage: docker cp CONTAINER:PATH HOSTDIR

 func (cli *DockerCli) CmdCp(args ...string) error {

-	cmd := cli.Subcmd("cp", "CONTAINER:PATH HOSTDIR|-", "Copy files/folders from a PATH on the container to a HOSTDIR on the host\nrunning the command. Use '-' to write the data as a tar file to STDOUT.", true)

+	cmd := cli.Subcmd("cp", []string{"CONTAINER:PATH HOSTDIR|-"}, "Copy files/folders from a PATH on the container to a HOSTDIR on the host\nrunning the command. Use '-' to write the data as a tar file to STDOUT.", true)

 	cmd.Require(flag.Exact, 2)

 	cmd.ParseFlags(args, true)

@@ -135,7 +135,7 @@ func (cli *DockerCli) createContainer(config *runconfig.Config, hostConfig *runc

 //

 // Usage: docker create [OPTIONS] IMAGE [COMMAND] [ARG...]

 func (cli *DockerCli) CmdCreate(args ...string) error {

-	cmd := cli.Subcmd("create", "IMAGE [COMMAND] [ARG...]", "Create a new container", true)

+	cmd := cli.Subcmd("create", []string{"IMAGE [COMMAND] [ARG...]"}, "Create a new container", true)

 	// These are flags not stored in Config/HostConfig

 	var (

@@ -17,7 +17,7 @@ import (

 //

 // Usage: docker diff CONTAINER

 func (cli *DockerCli) CmdDiff(args ...string) error {

-	cmd := cli.Subcmd("diff", "CONTAINER", "Inspect changes on a container's filesystem", true)

+	cmd := cli.Subcmd("diff", []string{"CONTAINER"}, "Inspect changes on a container's filesystem", true)

 	cmd.Require(flag.Exact, 1)

 	cmd.ParseFlags(args, true)

@@ -14,7 +14,7 @@ import (

 //

 // Usage: docker events [OPTIONS]

 func (cli *DockerCli) CmdEvents(args ...string) error {

-	cmd := cli.Subcmd("events", "", "Get real time events from the server", true)

+	cmd := cli.Subcmd("events", nil, "Get real time events from the server", true)

 	since := cmd.String([]string{"#since", "-since"}, "", "Show all events created since timestamp")

 	until := cmd.String([]string{"-until"}, "", "Stream events until this timestamp")

 	flFilter := opts.NewListOpts(nil)

@@ -15,7 +15,7 @@ import (

 //

 // Usage: docker exec [OPTIONS] CONTAINER COMMAND [ARG...]

 func (cli *DockerCli) CmdExec(args ...string) error {

-	cmd := cli.Subcmd("exec", "CONTAINER COMMAND [ARG...]", "Run a command in a running container", true)

+	cmd := cli.Subcmd("exec", []string{"CONTAINER COMMAND [ARG...]"}, "Run a command in a running container", true)

 	execConfig, err := runconfig.ParseExec(cmd, args)

 	// just in case the ParseExec does not exit

@@ -14,7 +14,7 @@ import (

 //

 // Usage: docker export [OPTIONS] CONTAINER

 func (cli *DockerCli) CmdExport(args ...string) error {

-	cmd := cli.Subcmd("export", "CONTAINER", "Export a filesystem as a tar archive (streamed to STDOUT by default)", true)

+	cmd := cli.Subcmd("export", []string{"CONTAINER"}, "Export a filesystem as a tar archive (streamed to STDOUT by default)", true)

 	outfile := cmd.String([]string{"o", "-output"}, "", "Write to a file, instead of STDOUT")

 	cmd.Require(flag.Exact, 1)

@@ -17,7 +17,7 @@ import (

 //

 // Usage: docker history [OPTIONS] IMAGE

 func (cli *DockerCli) CmdHistory(args ...string) error {

-	cmd := cli.Subcmd("history", "IMAGE", "Show the history of an image", true)

+	cmd := cli.Subcmd("history", []string{"IMAGE"}, "Show the history of an image", true)

 	human := cmd.Bool([]string{"H", "-human"}, true, "Print sizes and dates in human readable format")

 	quiet := cmd.Bool([]string{"q", "-quiet"}, false, "Only show numeric IDs")

 	noTrunc := cmd.Bool([]string{"#notrunc", "-no-trunc"}, false, "Don't truncate output")

@@ -21,7 +21,7 @@ import (

 //

 // Usage: docker images [OPTIONS] [REPOSITORY]

 func (cli *DockerCli) CmdImages(args ...string) error {

-	cmd := cli.Subcmd("images", "[REPOSITORY]", "List images", true)

+	cmd := cli.Subcmd("images", []string{"[REPOSITORY]"}, "List images", true)

 	quiet := cmd.Bool([]string{"q", "-quiet"}, false, "Only show numeric IDs")

 	all := cmd.Bool([]string{"a", "-all"}, false, "Show all images (default hides intermediate images)")

 	noTrunc := cmd.Bool([]string{"#notrunc", "-no-trunc"}, false, "Don't truncate output")

@@ -17,7 +17,7 @@ import (

 //

 // Usage: docker import [OPTIONS] URL [REPOSITORY[:TAG]]

 func (cli *DockerCli) CmdImport(args ...string) error {

-	cmd := cli.Subcmd("import", "URL|- [REPOSITORY[:TAG]]", "Create an empty filesystem image and import the contents of the\ntarball (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) into it, then\noptionally tag it.", true)

+	cmd := cli.Subcmd("import", []string{"URL|- [REPOSITORY[:TAG]]"}, "Create an empty filesystem image and import the contents of the\ntarball (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) into it, then\noptionally tag it.", true)

 	flChanges := opts.NewListOpts(nil)

 	cmd.Var(&flChanges, []string{"c", "-change"}, "Apply Dockerfile instruction to the created image")

 	cmd.Require(flag.Min, 1)

@@ -14,7 +14,7 @@ import (

 //

 // Usage: docker info

 func (cli *DockerCli) CmdInfo(args ...string) error {

-	cmd := cli.Subcmd("info", "", "Display system-wide information", true)

+	cmd := cli.Subcmd("info", nil, "Display system-wide information", true)

 	cmd.Require(flag.Exact, 0)

 	cmd.ParseFlags(args, true)

@@ -16,7 +16,7 @@ import (

 //

 // Usage: docker inspect [OPTIONS] CONTAINER|IMAGE [CONTAINER|IMAGE...]

 func (cli *DockerCli) CmdInspect(args ...string) error {

-	cmd := cli.Subcmd("inspect", "CONTAINER|IMAGE [CONTAINER|IMAGE...]", "Return low-level information on a container or image", true)

+	cmd := cli.Subcmd("inspect", []string{"CONTAINER|IMAGE [CONTAINER|IMAGE...]"}, "Return low-level information on a container or image", true)

 	tmplStr := cmd.String([]string{"f", "#format", "-format"}, "", "Format the output using the given go template")

 	cmd.Require(flag.Min, 1)

@@ -10,7 +10,7 @@ import (

 //

 // Usage: docker kill [OPTIONS] CONTAINER [CONTAINER...]

 func (cli *DockerCli) CmdKill(args ...string) error {

-	cmd := cli.Subcmd("kill", "CONTAINER [CONTAINER...]", "Kill a running container using SIGKILL or a specified signal", true)

+	cmd := cli.Subcmd("kill", []string{"CONTAINER [CONTAINER...]"}, "Kill a running container using SIGKILL or a specified signal", true)

 	signal := cmd.String([]string{"s", "-signal"}, "KILL", "Signal to send to the container")

 	cmd.Require(flag.Min, 1)

@@ -13,7 +13,7 @@ import (

 //

 // Usage: docker load [OPTIONS]

 func (cli *DockerCli) CmdLoad(args ...string) error {

-	cmd := cli.Subcmd("load", "", "Load an image from a tar archive on STDIN", true)

+	cmd := cli.Subcmd("load", nil, "Load an image from a tar archive on STDIN", true)

 	infile := cmd.String([]string{"i", "-input"}, "", "Read from a tar archive file, instead of STDIN")

 	cmd.Require(flag.Exact, 0)

@@ -21,7 +21,7 @@ import (

 //

 // Usage: docker login SERVER

 func (cli *DockerCli) CmdLogin(args ...string) error {

-	cmd := cli.Subcmd("login", "[SERVER]", "Register or log in to a Docker registry server, if no server is\nspecified \""+registry.IndexServerAddress()+"\" is the default.", true)

+	cmd := cli.Subcmd("login", []string{"[SERVER]"}, "Register or log in to a Docker registry server, if no server is\nspecified \""+registry.IndexServerAddress()+"\" is the default.", true)

 	cmd.Require(flag.Max, 1)

 	var username, password, email string

@@ -13,7 +13,7 @@ import (

 //

 // Usage: docker logout [SERVER]

 func (cli *DockerCli) CmdLogout(args ...string) error {

-	cmd := cli.Subcmd("logout", "[SERVER]", "Log out from a Docker registry, if no server is\nspecified \""+registry.IndexServerAddress()+"\" is the default.", true)

+	cmd := cli.Subcmd("logout", []string{"[SERVER]"}, "Log out from a Docker registry, if no server is\nspecified \""+registry.IndexServerAddress()+"\" is the default.", true)

 	cmd.Require(flag.Max, 1)

 	cmd.ParseFlags(args, true)

@@ -16,7 +16,7 @@ import (

 // docker logs [OPTIONS] CONTAINER

 func (cli *DockerCli) CmdLogs(args ...string) error {

 	var (

-		cmd    = cli.Subcmd("logs", "CONTAINER", "Fetch the logs of a container", true)

+		cmd    = cli.Subcmd("logs", []string{"CONTAINER"}, "Fetch the logs of a container", true)

 		follow = cmd.Bool([]string{"f", "-follow"}, false, "Follow log output")

 		since  = cmd.String([]string{"-since"}, "", "Show logs since timestamp")

 		times  = cmd.Bool([]string{"t", "-timestamps"}, false, "Show timestamps")

@@ -10,7 +10,7 @@ import (

 //

 // Usage: docker pause CONTAINER [CONTAINER...]

 func (cli *DockerCli) CmdPause(args ...string) error {

-	cmd := cli.Subcmd("pause", "CONTAINER [CONTAINER...]", "Pause all processes within a container", true)

+	cmd := cli.Subcmd("pause", []string{"CONTAINER [CONTAINER...]"}, "Pause all processes within a container", true)

 	cmd.Require(flag.Min, 1)

 	cmd.ParseFlags(args, true)

@@ -14,7 +14,7 @@ import (

 //

 // Usage: docker port CONTAINER [PRIVATE_PORT[/PROTO]]

 func (cli *DockerCli) CmdPort(args ...string) error {

-	cmd := cli.Subcmd("port", "CONTAINER [PRIVATE_PORT[/PROTO]]", "List port mappings for the CONTAINER, or lookup the public-facing port that\nis NAT-ed to the PRIVATE_PORT", true)

+	cmd := cli.Subcmd("port", []string{"CONTAINER [PRIVATE_PORT[/PROTO]]"}, "List port mappings for the CONTAINER, or lookup the public-facing port that\nis NAT-ed to the PRIVATE_PORT", true)

 	cmd.Require(flag.Min, 1)

 	cmd.ParseFlags(args, true)

@@ -29,7 +29,7 @@ func (cli *DockerCli) CmdPs(args ...string) error {

 		psFilterArgs = filters.Args{}

 		v            = url.Values{}

-		cmd      = cli.Subcmd("ps", "", "List containers", true)

+		cmd      = cli.Subcmd("ps", nil, "List containers", true)

 		quiet    = cmd.Bool([]string{"q", "-quiet"}, false, "Only display numeric IDs")

 		size     = cmd.Bool([]string{"s", "-size"}, false, "Display total file sizes")

 		all      = cmd.Bool([]string{"a", "-all"}, false, "Show all containers (default shows just running)")

@@ -15,7 +15,7 @@ import (

 //

 // Usage: docker pull [OPTIONS] IMAGENAME[:TAG|@DIGEST]

 func (cli *DockerCli) CmdPull(args ...string) error {

-	cmd := cli.Subcmd("pull", "NAME[:TAG|@DIGEST]", "Pull an image or a repository from the registry", true)

+	cmd := cli.Subcmd("pull", []string{"NAME[:TAG|@DIGEST]"}, "Pull an image or a repository from the registry", true)

 	allTags := cmd.Bool([]string{"a", "-all-tags"}, false, "Download all tagged images in the repository")

 	cmd.Require(flag.Exact, 1)

@@ -13,7 +13,7 @@ import (

 //

 // Usage: docker push NAME[:TAG]

 func (cli *DockerCli) CmdPush(args ...string) error {

-	cmd := cli.Subcmd("push", "NAME[:TAG]", "Push an image or a repository to the registry", true)

+	cmd := cli.Subcmd("push", []string{"NAME[:TAG]"}, "Push an image or a repository to the registry", true)

 	cmd.Require(flag.Exact, 1)

 	cmd.ParseFlags(args, true)

@@ -10,7 +10,7 @@ import (

 //

 // Usage: docker rename OLD_NAME NEW_NAME

 func (cli *DockerCli) CmdRename(args ...string) error {

-	cmd := cli.Subcmd("rename", "OLD_NAME NEW_NAME", "Rename a container", true)

+	cmd := cli.Subcmd("rename", []string{"OLD_NAME NEW_NAME"}, "Rename a container", true)

 	cmd.Require(flag.Exact, 2)

 	cmd.ParseFlags(args, true)

@@ -12,7 +12,7 @@ import (

 //

 // Usage: docker stop [OPTIONS] CONTAINER [CONTAINER...]

 func (cli *DockerCli) CmdRestart(args ...string) error {

-	cmd := cli.Subcmd("restart", "CONTAINER [CONTAINER...]", "Restart a running container", true)

+	cmd := cli.Subcmd("restart", []string{"CONTAINER [CONTAINER...]"}, "Restart a running container", true)

 	nSeconds := cmd.Int([]string{"t", "-time"}, 10, "Seconds to wait for stop before killing the container")

 	cmd.Require(flag.Min, 1)

@@ -12,7 +12,7 @@ import (

 //

 // Usage: docker rm [OPTIONS] CONTAINER [CONTAINER...]

 func (cli *DockerCli) CmdRm(args ...string) error {

-	cmd := cli.Subcmd("rm", "CONTAINER [CONTAINER...]", "Remove one or more containers", true)

+	cmd := cli.Subcmd("rm", []string{"CONTAINER [CONTAINER...]"}, "Remove one or more containers", true)

 	v := cmd.Bool([]string{"v", "-volumes"}, false, "Remove the volumes associated with the container")

 	link := cmd.Bool([]string{"l", "#link", "-link"}, false, "Remove the specified link")

 	force := cmd.Bool([]string{"f", "-force"}, false, "Force the removal of a running container (uses SIGKILL)")

@@ -14,7 +14,7 @@ import (

 // Usage: docker rmi [OPTIONS] IMAGE [IMAGE...]

 func (cli *DockerCli) CmdRmi(args ...string) error {

 	var (

-		cmd     = cli.Subcmd("rmi", "IMAGE [IMAGE...]", "Remove one or more images", true)

+		cmd     = cli.Subcmd("rmi", []string{"IMAGE [IMAGE...]"}, "Remove one or more images", true)

 		force   = cmd.Bool([]string{"f", "-force"}, false, "Force removal of the image")

 		noprune = cmd.Bool([]string{"-no-prune"}, false, "Do not delete untagged parents")

 	)

@@ -38,7 +38,7 @@ func (cid *cidFile) Write(id string) error {

 //

 // Usage: docker run [OPTIONS] IMAGE [COMMAND] [ARG...]

 func (cli *DockerCli) CmdRun(args ...string) error {

-	cmd := cli.Subcmd("run", "IMAGE [COMMAND] [ARG...]", "Run a command in a new container", true)

+	cmd := cli.Subcmd("run", []string{"IMAGE [COMMAND] [ARG...]"}, "Run a command in a new container", true)

 	// These are flags not stored in Config/HostConfig

 	var (

@@ -15,7 +15,7 @@ import (

 //

 // Usage: docker save [OPTIONS] IMAGE [IMAGE...]

 func (cli *DockerCli) CmdSave(args ...string) error {

-	cmd := cli.Subcmd("save", "IMAGE [IMAGE...]", "Save an image(s) to a tar archive (streamed to STDOUT by default)", true)

+	cmd := cli.Subcmd("save", []string{"IMAGE [IMAGE...]"}, "Save an image(s) to a tar archive (streamed to STDOUT by default)", true)

 	outfile := cmd.String([]string{"o", "-output"}, "", "Write to an file, instead of STDOUT")

 	cmd.Require(flag.Min, 1)

@@ -25,7 +25,7 @@ func (r ByStars) Less(i, j int) bool { return r[i].StarCount < r[j].StarCount }

 //

 // Usage: docker search [OPTIONS] TERM

 func (cli *DockerCli) CmdSearch(args ...string) error {

-	cmd := cli.Subcmd("search", "TERM", "Search the Docker Hub for images", true)

+	cmd := cli.Subcmd("search", []string{"TERM"}, "Search the Docker Hub for images", true)

 	noTrunc := cmd.Bool([]string{"#notrunc", "-no-trunc"}, false, "Don't truncate output")

 	trusted := cmd.Bool([]string{"#t", "#trusted", "#-trusted"}, false, "Only show trusted builds")

 	automated := cmd.Bool([]string{"-automated"}, false, "Only show automated builds")

@@ -48,7 +48,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {

 		cErr chan error

 		tty  bool

-		cmd       = cli.Subcmd("start", "CONTAINER [CONTAINER...]", "Start one or more stopped containers", true)

+		cmd       = cli.Subcmd("start", []string{"CONTAINER [CONTAINER...]"}, "Start one or more stopped containers", true)

 		attach    = cmd.Bool([]string{"a", "-attach"}, false, "Attach STDOUT/STDERR and forward signals")

 		openStdin = cmd.Bool([]string{"i", "-interactive"}, false, "Attach container's STDIN")

 	)

@@ -122,7 +122,7 @@ func (s *containerStats) Display(w io.Writer) error {

 //

 // Usage: docker stats CONTAINER [CONTAINER...]

 func (cli *DockerCli) CmdStats(args ...string) error {

-	cmd := cli.Subcmd("stats", "CONTAINER [CONTAINER...]", "Display a live stream of one or more containers' resource usage statistics", true)

+	cmd := cli.Subcmd("stats", []string{"CONTAINER [CONTAINER...]"}, "Display a live stream of one or more containers' resource usage statistics", true)

 	noStream := cmd.Bool([]string{"-no-stream"}, false, "Disable streaming stats and only pull the first result")

 	cmd.Require(flag.Min, 1)

 	cmd.ParseFlags(args, true)

@@ -14,7 +14,7 @@ import (

 //

 // Usage: docker stop [OPTIONS] CONTAINER [CONTAINER...]

 func (cli *DockerCli) CmdStop(args ...string) error {

-	cmd := cli.Subcmd("stop", "CONTAINER [CONTAINER...]", "Stop a running container by sending SIGTERM and then SIGKILL after a\ngrace period", true)

+	cmd := cli.Subcmd("stop", []string{"CONTAINER [CONTAINER...]"}, "Stop a running container by sending SIGTERM and then SIGKILL after a\ngrace period", true)

 	nSeconds := cmd.Int([]string{"t", "-time"}, 10, "Seconds to wait for stop before killing it")

 	cmd.Require(flag.Min, 1)

@@ -12,7 +12,7 @@ import (

 //

 // Usage: docker tag [OPTIONS] IMAGE[:TAG] [REGISTRYHOST/][USERNAME/]NAME[:TAG]

 func (cli *DockerCli) CmdTag(args ...string) error {

-	cmd := cli.Subcmd("tag", "IMAGE[:TAG] [REGISTRYHOST/][USERNAME/]NAME[:TAG]", "Tag an image into a repository", true)

+	cmd := cli.Subcmd("tag", []string{"IMAGE[:TAG] [REGISTRYHOST/][USERNAME/]NAME[:TAG]"}, "Tag an image into a repository", true)

 	force := cmd.Bool([]string{"f", "#force", "-force"}, false, "Force")

 	cmd.Require(flag.Exact, 2)

@@ -15,7 +15,7 @@ import (

 //

 // Usage: docker top CONTAINER

 func (cli *DockerCli) CmdTop(args ...string) error {

-	cmd := cli.Subcmd("top", "CONTAINER [ps OPTIONS]", "Display the running processes of a container", true)

+	cmd := cli.Subcmd("top", []string{"CONTAINER [ps OPTIONS]"}, "Display the running processes of a container", true)

 	cmd.Require(flag.Min, 1)

 	cmd.ParseFlags(args, true)

@@ -10,7 +10,7 @@ import (

 //

 // Usage: docker unpause CONTAINER [CONTAINER...]

 func (cli *DockerCli) CmdUnpause(args ...string) error {

-	cmd := cli.Subcmd("unpause", "CONTAINER [CONTAINER...]", "Unpause all processes within a container", true)

+	cmd := cli.Subcmd("unpause", []string{"CONTAINER [CONTAINER...]"}, "Unpause all processes within a container", true)

 	cmd.Require(flag.Min, 1)

 	cmd.ParseFlags(args, true)

@@ -18,7 +18,7 @@ import (

 //

 // Usage: docker version

 func (cli *DockerCli) CmdVersion(args ...string) error {

-	cmd := cli.Subcmd("version", "", "Show the Docker version information.", true)

+	cmd := cli.Subcmd("version", nil, "Show the Docker version information.", true)

 	cmd.Require(flag.Exact, 0)

 	cmd.ParseFlags(args, true)

@@ -12,7 +12,7 @@ import (

 //

 // Usage: docker wait CONTAINER [CONTAINER...]

 func (cli *DockerCli) CmdWait(args ...string) error {

-	cmd := cli.Subcmd("wait", "CONTAINER [CONTAINER...]", "Block until a container stops, then print its exit code.", true)

+	cmd := cli.Subcmd("wait", []string{"CONTAINER [CONTAINER...]"}, "Block until a container stops, then print its exit code.", true)

 	cmd.Require(flag.Min, 1)

 	cmd.ParseFlags(args, true)

@@ -215,7 +215,7 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {

 					c.Fatalf("Bad output from %q\nstdout:%q\nstderr:%q\nec:%d\nerr:%q", args, stdout, stderr, ec, err)

 				}

 				// Should have just short usage

-				if !strings.Contains(stderr, "\nUsage: ") {

+				if !strings.Contains(stderr, "\nUsage:\t") {

 					c.Fatalf("Missing short usage on %q\nstderr:%q", args, stderr)

 				}

 				// But shouldn't have full usage

@@ -53,7 +53,7 @@ func (s *DockerSuite) TestSearchCmdOptions(c *check.C) {

 		c.Fatalf("failed to get search help information: %s, %v", out, err)

 	}

-	if !strings.Contains(out, "Usage: docker search [OPTIONS] TERM") {

+	if !strings.Contains(out, "Usage:\tdocker search [OPTIONS] TERM") {

 		c.Fatalf("failed to show docker search usage: %s, %v", out, err)

 	}