@@ -161,7 +161,7 @@ func (srv *Server) CmdLogin(stdin io.ReadCloser, stdout rcli.DockerConn, args ..

 // 'docker wait': block until a container stops

 func (srv *Server) CmdWait(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

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

+	cmd := rcli.Subcmd(stdout, "wait", "CONTAINER [CONTAINER...]", "Block until a container stops, then print its exit code.")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -217,7 +217,7 @@ func (srv *Server) CmdInfo(stdin io.ReadCloser, stdout io.Writer, args ...string

 }

 func (srv *Server) CmdStop(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

-	cmd := rcli.Subcmd(stdout, "stop", "[OPTIONS] CONTAINER [CONTAINER...]", "Stop a running container")

+	cmd := rcli.Subcmd(stdout, "stop", "CONTAINER [CONTAINER...]", "Stop a running container")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -239,7 +239,7 @@ func (srv *Server) CmdStop(stdin io.ReadCloser, stdout io.Writer, args ...string

 }

 func (srv *Server) CmdRestart(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

-	cmd := rcli.Subcmd(stdout, "restart", "[OPTIONS] CONTAINER [CONTAINER...]", "Restart a running container")

+	cmd := rcli.Subcmd(stdout, "restart", "CONTAINER [CONTAINER...]", "Restart a running container")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -261,7 +261,7 @@ func (srv *Server) CmdRestart(stdin io.ReadCloser, stdout io.Writer, args ...str

 }

 func (srv *Server) CmdStart(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

-	cmd := rcli.Subcmd(stdout, "start", "[OPTIONS] CONTAINER [CONTAINER...]", "Start a stopped container")

+	cmd := rcli.Subcmd(stdout, "start", "CONTAINER [CONTAINER...]", "Start a stopped container")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -283,7 +283,7 @@ func (srv *Server) CmdStart(stdin io.ReadCloser, stdout io.Writer, args ...strin

 }

 func (srv *Server) CmdInspect(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

-	cmd := rcli.Subcmd(stdout, "inspect", "[OPTIONS] CONTAINER", "Return low-level information on a container")

+	cmd := rcli.Subcmd(stdout, "inspect", "CONTAINER", "Return low-level information on a container")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -318,7 +318,7 @@ func (srv *Server) CmdInspect(stdin io.ReadCloser, stdout io.Writer, args ...str

 }

 func (srv *Server) CmdPort(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

-	cmd := rcli.Subcmd(stdout, "port", "[OPTIONS] CONTAINER PRIVATE_PORT", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT")

+	cmd := rcli.Subcmd(stdout, "port", "CONTAINER PRIVATE_PORT", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -342,7 +342,7 @@ func (srv *Server) CmdPort(stdin io.ReadCloser, stdout io.Writer, args ...string

 // 'docker rmi IMAGE' removes all images with the name IMAGE

 func (srv *Server) CmdRmi(stdin io.ReadCloser, stdout io.Writer, args ...string) (err error) {

-	cmd := rcli.Subcmd(stdout, "rmimage", "[OPTIONS] IMAGE [IMAGE...]", "Remove an image")

+	cmd := rcli.Subcmd(stdout, "rmimage", "IMAGE [IMAGE...]", "Remove an image")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -359,7 +359,7 @@ func (srv *Server) CmdRmi(stdin io.ReadCloser, stdout io.Writer, args ...string)

 }

 func (srv *Server) CmdHistory(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

-	cmd := rcli.Subcmd(stdout, "history", "[OPTIONS] IMAGE", "Show the history of an image")

+	cmd := rcli.Subcmd(stdout, "history", "IMAGE", "Show the history of an image")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -385,7 +385,7 @@ func (srv *Server) CmdHistory(stdin io.ReadCloser, stdout io.Writer, args ...str

 }

 func (srv *Server) CmdRm(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

-	cmd := rcli.Subcmd(stdout, "rm", "[OPTIONS] CONTAINER [CONTAINER...]", "Remove a container")

+	cmd := rcli.Subcmd(stdout, "rm", "CONTAINER [CONTAINER...]", "Remove a container")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

@@ -407,10 +407,14 @@ func (srv *Server) CmdRm(stdin io.ReadCloser, stdout io.Writer, args ...string)

 // 'docker kill NAME' kills a running container

 func (srv *Server) CmdKill(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

-	cmd := rcli.Subcmd(stdout, "kill", "[OPTIONS] CONTAINER [CONTAINER...]", "Kill a running container")

+	cmd := rcli.Subcmd(stdout, "kill", "CONTAINER [CONTAINER...]", "Kill a running container")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

+	if cmd.NArg() < 1 {

+		cmd.Usage()

+		return nil

+	}

 	for _, name := range cmd.Args() {

 		container := srv.runtime.Get(name)

 		if container == nil {

@@ -425,17 +429,19 @@ func (srv *Server) CmdKill(stdin io.ReadCloser, stdout io.Writer, args ...string

 func (srv *Server) CmdImport(stdin io.ReadCloser, stdout rcli.DockerConn, args ...string) error {

 	stdout.Flush()

-	cmd := rcli.Subcmd(stdout, "import", "[OPTIONS] URL|- [REPOSITORY [TAG]]", "Create a new filesystem image from the contents of a tarball")

+	cmd := rcli.Subcmd(stdout, "import", "URL|- [REPOSITORY [TAG]]", "Create a new filesystem image from the contents of a tarball")

 	var archive io.Reader

 	var resp *http.Response

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

+	if cmd.NArg() < 1 {

+		cmd.Usage()

+		return nil

+	}

 	src := cmd.Arg(0)

-	if src == "" {

-		return fmt.Errorf("Not enough arguments")

-	} else if src == "-" {

+	if src == "-" {

 		archive = stdin

 	} else {

 		u, err := url.Parse(src)

@@ -737,13 +743,14 @@ func (srv *Server) CmdExport(stdin io.ReadCloser, stdout io.Writer, args ...stri

 func (srv *Server) CmdDiff(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

 	cmd := rcli.Subcmd(stdout,

-		"diff", "CONTAINER [OPTIONS]",

+		"diff", "CONTAINER",

 		"Inspect changes on a container's filesystem")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}

 	if cmd.NArg() < 1 {

-		return fmt.Errorf("Not enough arguments")

+		cmd.Usage()

+		return nil

 	}

 	if container := srv.runtime.Get(cmd.Arg(0)); container == nil {

 		return fmt.Errorf("No such container")

@@ -760,7 +767,7 @@ func (srv *Server) CmdDiff(stdin io.ReadCloser, stdout io.Writer, args ...string

 }

 func (srv *Server) CmdLogs(stdin io.ReadCloser, stdout io.Writer, args ...string) error {

-	cmd := rcli.Subcmd(stdout, "logs", "[OPTIONS] CONTAINER", "Fetch the logs of a container")

+	cmd := rcli.Subcmd(stdout, "logs", "CONTAINER", "Fetch the logs of a container")

 	if err := cmd.Parse(args); err != nil {

 		return nil

 	}