@@ -7,11 +7,11 @@ import (

 	"encoding/base64"

 	"encoding/json"

 	"errors"

-	"flag"

 	"fmt"

 	"github.com/dotcloud/docker/archive"

 	"github.com/dotcloud/docker/auth"

 	"github.com/dotcloud/docker/engine"

+	flag "github.com/dotcloud/docker/pkg/mflag"

 	"github.com/dotcloud/docker/pkg/term"

 	"github.com/dotcloud/docker/registry"

 	"github.com/dotcloud/docker/utils"

@@ -164,10 +164,10 @@ func MkBuildContext(dockerfile string, files [][2]string) (archive.Archive, erro

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

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

-	tag := cmd.String("t", "", "Repository name (and optionally a tag) to be applied to the resulting image in case of success")

-	suppressOutput := cmd.Bool("q", false, "Suppress verbose build output")

-	noCache := cmd.Bool("no-cache", false, "Do not use cache when building the image")

-	rm := cmd.Bool("rm", false, "Remove intermediate containers after a successful build")

+	tag := cmd.String([]string{"t", "-tag"}, "", "Repository name (and optionally a tag) to be applied to the resulting image in case of success")

+	suppressOutput := cmd.Bool([]string{"q", "-quiet"}, false, "Suppress verbose build output")

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

+	rm := cmd.Bool([]string{"#rm", "-rm"}, false, "Remove intermediate containers after a successful build")

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

 		return nil

 	}

@@ -253,9 +253,9 @@ func (cli *DockerCli) CmdLogin(args ...string) error {

 	var username, password, email string

-	cmd.StringVar(&username, "u", "", "username")

-	cmd.StringVar(&password, "p", "", "password")

-	cmd.StringVar(&email, "e", "", "email")

+	cmd.StringVar(&username, []string{"u", "-username"}, "", "username")

+	cmd.StringVar(&password, []string{"p", "-password"}, "", "password")

+	cmd.StringVar(&email, []string{"e", "-email"}, "", "email")

 	err := cmd.Parse(args)

 	if err != nil {

 		return nil

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

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

 	cmd := cli.Subcmd("stop", "[OPTIONS] CONTAINER [CONTAINER...]", "Stop a running container (Send SIGTERM, and then SIGKILL after grace period)")

-	nSeconds := cmd.Int("t", 10, "Number of seconds to wait for the container to stop before killing it.")

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

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

 		return nil

 	}

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

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

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

-	nSeconds := cmd.Int("t", 10, "Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default=10")

+	nSeconds := cmd.Int([]string{"t", "-time"}, 10, "Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default=10")

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

 		return nil

 	}

@@ -574,8 +574,8 @@ func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {

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

 	cmd := cli.Subcmd("start", "CONTAINER [CONTAINER...]", "Restart a stopped container")

-	attach := cmd.Bool("a", false, "Attach container's stdout/stderr and forward all signals to the process")

-	openStdin := cmd.Bool("i", false, "Attach container's stdin")

+	attach := cmd.Bool([]string{"a", "-attach"}, false, "Attach container's stdout/stderr and forward all signals to the process")

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

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

 		return nil

 	}

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

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

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

-	tmplStr := cmd.String("format", "", "Format the output using the given go template.")

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

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

 		return nil

 	}

@@ -846,8 +846,8 @@ func (cli *DockerCli) CmdRmi(args ...string) error {

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

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

-	quiet := cmd.Bool("q", false, "only show numeric IDs")

-	noTrunc := cmd.Bool("notrunc", false, "Don't truncate output")

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

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

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

 		return nil

@@ -906,8 +906,8 @@ func (cli *DockerCli) CmdHistory(args ...string) error {

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

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

-	v := cmd.Bool("v", false, "Remove the volumes associated to the container")

-	link := cmd.Bool("link", false, "Remove the specified link and not the underlying container")

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

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

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

 		return nil

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

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

 	cmd := cli.Subcmd("pull", "NAME", "Pull an image or a repository from the registry")

-	tag := cmd.String("t", "", "Download tagged image in repository")

+	tag := cmd.String([]string{"t", "-tag"}, "", "Download tagged image in repository")

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

 		return nil

 	}

@@ -1118,11 +1118,11 @@ func (cli *DockerCli) CmdPull(args ...string) error {

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

 	cmd := cli.Subcmd("images", "[OPTIONS] [NAME]", "List images")

-	quiet := cmd.Bool("q", false, "only show numeric IDs")

-	all := cmd.Bool("a", false, "show all images (by default filter out the intermediate images used to build)")

-	noTrunc := cmd.Bool("notrunc", false, "Don't truncate output")

-	flViz := cmd.Bool("viz", false, "output graph in graphviz format")

-	flTree := cmd.Bool("tree", false, "output graph in tree format")

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

+	all := cmd.Bool([]string{"a", "-all"}, false, "show all images (by default filter out the intermediate images used to build)")

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

+	flViz := cmd.Bool([]string{"v", "#viz", "-viz"}, false, "output graph in graphviz format")

+	flTree := cmd.Bool([]string{"t", "#tree", "-tree"}, false, "output graph in tree format")

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

 		return nil

@@ -1329,14 +1329,14 @@ func displayablePorts(ports []APIPort) string {

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

 	cmd := cli.Subcmd("ps", "[OPTIONS]", "List containers")

-	quiet := cmd.Bool("q", false, "Only display numeric IDs")

-	size := cmd.Bool("s", false, "Display sizes")

-	all := cmd.Bool("a", false, "Show all containers. Only running containers are shown by default.")

-	noTrunc := cmd.Bool("notrunc", false, "Don't truncate output")

-	nLatest := cmd.Bool("l", false, "Show only the latest created container, include non-running ones.")

-	since := cmd.String("sinceId", "", "Show only containers created since Id, include non-running ones.")

-	before := cmd.String("beforeId", "", "Show only container created before Id, include non-running ones.")

-	last := cmd.Int("n", -1, "Show n last created containers, include non-running ones.")

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

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

+	all := cmd.Bool([]string{"a", "-all"}, false, "Show all containers. Only running containers are shown by default.")

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

+	nLatest := cmd.Bool([]string{"l", "-latest"}, false, "Show only the latest created container, include non-running ones.")

+	since := cmd.String([]string{"#sinceId", "-since-id"}, "", "Show only containers created since Id, include non-running ones.")

+	before := cmd.String([]string{"#beforeId", "-before-id"}, "", "Show only container created before Id, include non-running ones.")

+	last := cmd.Int([]string{"n"}, -1, "Show n last created containers, include non-running ones.")

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

 		return nil

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

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

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

-	flComment := cmd.String("m", "", "Commit message")

-	flAuthor := cmd.String("author", "", "Author (eg. \"John Hannibal Smith <hannibal@a-team.com>\"")

-	flConfig := cmd.String("run", "", "Config automatically applied when the image is run. "+`(ex: -run='{"Cmd": ["cat", "/world"], "PortSpecs": ["22"]}')`)

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

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

+	flConfig := cmd.String([]string{"#run", "-run"}, "", "Config automatically applied when the image is run. "+`(ex: -run='{"Cmd": ["cat", "/world"], "PortSpecs": ["22"]}')`)

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

 		return nil

 	}

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

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

 	cmd := cli.Subcmd("events", "[OPTIONS]", "Get real time events from the server")

-	since := cmd.String("since", "", "Show previously created events and then stream.")

+	since := cmd.String([]string{"#since", "-since"}, "", "Show previously created events and then stream.")

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

 		return nil

 	}

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

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

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

-	follow := cmd.Bool("f", false, "Follow log output")

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

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

 		return nil

 	}

@@ -1593,8 +1593,8 @@ func (cli *DockerCli) CmdLogs(args ...string) error {

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

 	cmd := cli.Subcmd("attach", "[OPTIONS] CONTAINER", "Attach to a running container")

-	noStdin := cmd.Bool("nostdin", false, "Do not attach stdin")

-	proxy := cmd.Bool("sig-proxy", true, "Proxify all received signal to the process (even in non-tty mode)")

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

+	proxy := cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxify all received signal to the process (even in non-tty mode)")

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

 		return nil

 	}

@@ -1657,9 +1657,9 @@ func (cli *DockerCli) CmdAttach(args ...string) error {

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

 	cmd := cli.Subcmd("search", "TERM", "Search the docker index for images")

-	noTrunc := cmd.Bool("notrunc", false, "Don't truncate output")

-	trusted := cmd.Bool("trusted", false, "Only show trusted builds")

-	stars := cmd.Int("stars", 0, "Only displays with at least xxx stars")

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

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

+	stars := cmd.Int([]string{"s", "#stars", "-stars"}, 0, "Only displays with at least xxx stars")

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

 		return nil

 	}

@@ -1712,7 +1712,7 @@ type ports []int

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

 	cmd := cli.Subcmd("tag", "[OPTIONS] IMAGE REPOSITORY[:TAG]", "Tag an image into a repository")

-	force := cmd.Bool("f", false, "Force")

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

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

 		return nil

 	}

@@ -1766,36 +1766,36 @@ func parseRun(cmd *flag.FlagSet, args []string, capabilities *Capabilities) (*Co

 		flVolumesFrom ListOpts

 		flLxcOpts     ListOpts

-		flAutoRemove      = cmd.Bool("rm", false, "Automatically remove the container when it exits (incompatible with -d)")

-		flDetach          = cmd.Bool("d", false, "Detached mode: Run container in the background, print new container id")

-		flNetwork         = cmd.Bool("n", true, "Enable networking for this container")

-		flPrivileged      = cmd.Bool("privileged", false, "Give extended privileges to this container")

-		flPublishAll      = cmd.Bool("P", false, "Publish all exposed ports to the host interfaces")

-		flStdin           = cmd.Bool("i", false, "Keep stdin open even if not attached")

-		flTty             = cmd.Bool("t", false, "Allocate a pseudo-tty")

-		flContainerIDFile = cmd.String("cidfile", "", "Write the container ID to the file")

-		flEntrypoint      = cmd.String("entrypoint", "", "Overwrite the default entrypoint of the image")

-		flHostname        = cmd.String("h", "", "Container host name")

-		flMemoryString    = cmd.String("m", "", "Memory limit (format: <number><optional unit>, where unit = b, k, m or g)")

-		flUser            = cmd.String("u", "", "Username or UID")

-		flWorkingDir      = cmd.String("w", "", "Working directory inside the container")

-		flCpuShares       = cmd.Int64("c", 0, "CPU shares (relative weight)")

+		flAutoRemove      = cmd.Bool([]string{"#rm", "-rm"}, false, "Automatically remove the container when it exits (incompatible with -d)")

+		flDetach          = cmd.Bool([]string{"d", "-detach"}, false, "Detached mode: Run container in the background, print new container id")

+		flNetwork         = cmd.Bool([]string{"n", "-networking"}, true, "Enable networking for this container")

+		flPrivileged      = cmd.Bool([]string{"#privileged", "-privileged"}, false, "Give extended privileges to this container")

+		flPublishAll      = cmd.Bool([]string{"P", "-publish-all"}, false, "Publish all exposed ports to the host interfaces")

+		flStdin           = cmd.Bool([]string{"i", "-interactive"}, false, "Keep stdin open even if not attached")

+		flTty             = cmd.Bool([]string{"t", "-tty"}, false, "Allocate a pseudo-tty")

+		flContainerIDFile = cmd.String([]string{"#cidfile", "-cidfile"}, "", "Write the container ID to the file")

+		flEntrypoint      = cmd.String([]string{"#entrypoint", "-entrypoint"}, "", "Overwrite the default entrypoint of the image")

+		flHostname        = cmd.String([]string{"h", "-hostname"}, "", "Container host name")

+		flMemoryString    = cmd.String([]string{"m", "-memory"}, "", "Memory limit (format: <number><optional unit>, where unit = b, k, m or g)")

+		flUser            = cmd.String([]string{"u", "-username"}, "", "Username or UID")

+		flWorkingDir      = cmd.String([]string{"w", "-workdir"}, "", "Working directory inside the container")

+		flCpuShares       = cmd.Int64([]string{"c", "-cpu-shares"}, 0, "CPU shares (relative weight)")

 		// For documentation purpose

-		_ = cmd.Bool("sig-proxy", true, "Proxify all received signal to the process (even in non-tty mode)")

-		_ = cmd.String("name", "", "Assign a name to the container")

+		_ = cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxify all received signal to the process (even in non-tty mode)")

+		_ = cmd.String([]string{"#name", "-name"}, "", "Assign a name to the container")

 	)

-	cmd.Var(&flAttach, "a", "Attach to stdin, stdout or stderr.")

-	cmd.Var(&flVolumes, "v", "Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)")

-	cmd.Var(&flLinks, "link", "Add link to another container (name:alias)")

-	cmd.Var(&flEnv, "e", "Set environment variables")

+	cmd.Var(&flAttach, []string{"a", "-attach"}, "Attach to stdin, stdout or stderr.")

+	cmd.Var(&flVolumes, []string{"v", "-volume"}, "Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)")

+	cmd.Var(&flLinks, []string{"#link", "-link"}, "Add link to another container (name:alias)")

+	cmd.Var(&flEnv, []string{"e", "-env"}, "Set environment variables")

-	cmd.Var(&flPublish, "p", fmt.Sprintf("Publish a container's port to the host (format: %s) (use 'docker port' to see the actual mapping)", PortSpecTemplateFormat))

-	cmd.Var(&flExpose, "expose", "Expose a port from the container without publishing it to your host")

-	cmd.Var(&flDns, "dns", "Set custom dns servers")

-	cmd.Var(&flVolumesFrom, "volumes-from", "Mount volumes from the specified container(s)")

-	cmd.Var(&flLxcOpts, "lxc-conf", "Add custom lxc options -lxc-conf=\"lxc.cgroup.cpuset.cpus = 0,1\"")

+	cmd.Var(&flPublish, []string{"p", "-publish"}, fmt.Sprintf("Publish a container's port to the host (format: %s) (use 'docker port' to see the actual mapping)", PortSpecTemplateFormat))

+	cmd.Var(&flExpose, []string{"#expose", "-expose"}, "Expose a port from the container without publishing it to your host")

+	cmd.Var(&flDns, []string{"#dns", "-dns"}, "Set custom dns servers")

+	cmd.Var(&flVolumesFrom, []string{"#volumes-from", "-volumes-from"}, "Mount volumes from the specified container(s)")

+	cmd.Var(&flLxcOpts, []string{"#lxc-conf", "-lxc-conf"}, "Add custom lxc options -lxc-conf=\"lxc.cgroup.cpuset.cpus = 0,1\"")

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

 		return nil, nil, cmd, err

@@ -1892,7 +1892,7 @@ func parseRun(cmd *flag.FlagSet, args []string, capabilities *Capabilities) (*Co

 	// Merge in exposed ports to the map of published ports

 	for _, e := range flExpose.GetAll() {

 		if strings.Contains(e, ":") {

-			return nil, nil, cmd, fmt.Errorf("Invalid port format for -expose: %s", e)

+			return nil, nil, cmd, fmt.Errorf("Invalid port format for --expose: %s", e)

 		}

 		p := NewPort(splitProtoPort(e))

 		if _, exists := ports[p]; !exists {

@@ -25,7 +25,7 @@ __docker_containers_all()

 {

 	local containers

 	containers="$( docker ps -a -q )"

-	names="$( docker inspect -format '{{.Name}}' $containers | sed 's,^/,,' )"

+	names="$( docker inspect --format '{{.Name}}' $containers | sed 's,^/,,' )"

 	COMPREPLY=( $( compgen -W "$names $containers" -- "$cur" ) )

 }

@@ -33,7 +33,7 @@ __docker_containers_running()

 {

 	local containers

 	containers="$( docker ps -q )"

-	names="$( docker inspect -format '{{.Name}}' $containers | sed 's,^/,,' )"

+	names="$( docker inspect --format '{{.Name}}' $containers | sed 's,^/,,' )"

 	COMPREPLY=( $( compgen -W "$names $containers" -- "$cur" ) )

 }

@@ -41,7 +41,7 @@ __docker_containers_stopped()

 {

 	local containers

 	containers="$( comm -13 <(docker ps -q | sort -u) <(docker ps -a -q | sort -u) )"

-	names="$( docker inspect -format '{{.Name}}' $containers | sed 's,^/,,' )"

+	names="$( docker inspect --format '{{.Name}}' $containers | sed 's,^/,,' )"

 	COMPREPLY=( $( compgen -W "$names $containers" -- "$cur" ) )

 }

@@ -73,7 +73,7 @@ __docker_containers_and_images()

 {

 	local containers images

 	containers="$( docker ps -a -q )"

-	names="$( docker inspect -format '{{.Name}}' $containers | sed 's,^/,,' )"

+	names="$( docker inspect --format '{{.Name}}' $containers | sed 's,^/,,' )"

 	images="$( docker images | awk 'NR>1{print $1":"$2}' )"

 	COMPREPLY=( $( compgen -W "$images $names $containers" -- "$cur" ) )

 	__ltrim_colon_completions "$cur"

@@ -118,7 +118,7 @@ _docker_build()

 	case "$cur" in

 		-*)

-			COMPREPLY=( $( compgen -W "-no-cache -t -q -rm" -- "$cur" ) )

+			COMPREPLY=( $( compgen -W "--no-cache -t -q --rm" -- "$cur" ) )

 			;;

 		*)

 			_filedir

@@ -138,7 +138,7 @@ _docker_commit()

 	case "$cur" in

 		-*)

-			COMPREPLY=( $( compgen -W "-author -m -run" -- "$cur" ) )

+			COMPREPLY=( $( compgen -W "--author -m --run" -- "$cur" ) )

 			;;

 		*)

 			local counter=$cpos

@@ -191,7 +191,7 @@ _docker_events()

 	case "$cur" in

 		-*)

-			COMPREPLY=( $( compgen -W "-since" -- "$cur" ) )

+			COMPREPLY=( $( compgen -W "--since" -- "$cur" ) )

 			;;

 		*)

 			;;

@@ -223,7 +223,7 @@ _docker_images()

 {

 	case "$cur" in

 		-*)

-			COMPREPLY=( $( compgen -W "-a -notrunc -q -viz" -- "$cur" ) )

+			COMPREPLY=( $( compgen -W "-a --no-trunc -q --viz" -- "$cur" ) )

 			;;

 		*)

 			local counter=$cpos

@@ -308,7 +308,7 @@ _docker_port()

 _docker_ps()

 {

 	case "$prev" in

-		-beforeId|-n|-sinceId)

+		-before-id|-n|-since-id)

 			return

 			;;

 		*)

@@ -317,7 +317,7 @@ _docker_ps()

 	case "$cur" in

 		-*)

-			COMPREPLY=( $( compgen -W "-a -beforeId -l -n -notrunc -q -s -sinceId" -- "$cur" ) )

+			COMPREPLY=( $( compgen -W "-a --before-id -l -n --no-trunc -q -s --since-id" -- "$cur" ) )

 			;;

 		*)

 			;;

@@ -388,13 +388,13 @@ _docker_rmi()

 _docker_run()

 {

 	case "$prev" in

-		-cidfile)

+		--cidfile)

 			_filedir

 			;;

-		-volumes-from)

+		--volumes-from)

 			__docker_containers_all

 			;;

-		-a|-c|-dns|-e|-entrypoint|-h|-lxc-conf|-m|-p|-u|-v|-w)

+		-a|-c|--dns|-e|--entrypoint|-h|--lxc-conf|-m|-p|-u|-v|-w)

 			return

 			;;

 		*)

@@ -403,13 +403,13 @@ _docker_run()

 	case "$cur" in

 		-*)

-			COMPREPLY=( $( compgen -W "-a -c -cidfile -d -dns -e -entrypoint -h -i -lxc-conf -m -n -p -privileged -t -u -v -volumes-from -w" -- "$cur" ) )

+			COMPREPLY=( $( compgen -W "-a -c --cidfile -d --dns -e --entrypoint -h -i --lxc-conf -m -n -p --privileged -t -u -v --volumes-from -w" -- "$cur" ) )

 			;;

 		*)

 			local counter=$cpos

 			while [ $counter -le $cword ]; do

 				case "${words[$counter]}" in

-					-a|-c|-cidfile|-dns|-e|-entrypoint|-h|-lxc-conf|-m|-p|-u|-v|-volumes-from|-w)

+					-a|-c|--cidfile|--dns|-e|--entrypoint|-h|--lxc-conf|-m|-p|-u|-v|--volumes-from|-w)

 						(( counter++ ))

 						;;

 					-*)

@@ -430,7 +430,7 @@ _docker_run()

 _docker_search()

 {

-	COMPREPLY=( $( compgen -W "-notrunc" "-stars" "-trusted" -- "$cur" ) )

+	COMPREPLY=( $( compgen -W "--no-trunc" "--stars" "--trusted" -- "$cur" ) )

 }

 _docker_start()

@@ -174,7 +174,7 @@ __docker_subcommand () {

         (ps)

             _arguments '-a[Show all containers. Only running containers are shown by default]' \

                 '-h[Show help]' \

-                '-beforeId=-[Show only container created before Id, include non-running one]:containers:__docker_containers' \

+                '-before-id=-[Show only container created before Id, include non-running one]:containers:__docker_containers' \

             '-n=-[Show n last created containers, include non-running one]:n:(1 5 10 25 50)'

             ;;

         (tag)

@@ -189,9 +189,9 @@ __docker_subcommand () {

                 '-a=-[Attach to stdin, stdout or stderr]:toggle:(true false)' \

                 '-c=-[CPU shares (relative weight)]:CPU shares: ' \

                 '-d[Detached mode: leave the container running in the background]' \

-                '*-dns=[Set custom dns servers]:dns server: ' \

+                '*--dns=[Set custom dns servers]:dns server: ' \

                 '*-e=[Set environment variables]:environment variable: ' \

-                '-entrypoint=-[Overwrite the default entrypoint of the image]:entry point: ' \

+                '--entrypoint=-[Overwrite the default entrypoint of the image]:entry point: ' \

                 '-h=-[Container host name]:hostname:_hosts' \

                 '-i[Keep stdin open even if not attached]' \

                 '-m=-[Memory limit (in bytes)]:limit: ' \

@@ -199,7 +199,7 @@ __docker_subcommand () {

                 '-t=-[Allocate a pseudo-tty]:toggle:(true false)' \

                 '-u=-[Username or UID]:user:_users' \

                 '*-v=-[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]:volume: '\

-                '-volumes-from=-[Mount volumes from the specified container]:volume: ' \

+                '--volumes-from=-[Mount volumes from the specified container]:volume: ' \

                 '(-):images:__docker_images' \

                 '(-):command: _command_names -e' \

                 '*::arguments: _normal'

@@ -1,10 +1,10 @@

 package main

 import (

-	"flag"

 	"fmt"

 	"github.com/dotcloud/docker"

 	"github.com/dotcloud/docker/engine"

+	flag "github.com/dotcloud/docker/pkg/mflag"

 	"github.com/dotcloud/docker/sysinit"

 	"github.com/dotcloud/docker/utils"

 	"log"

@@ -25,25 +25,25 @@ func main() {

 	}

 	var (

-		flVersion            = flag.Bool("v", false, "Print version information and quit")

-		flDaemon             = flag.Bool("d", false, "Enable daemon mode")

-		flDebug              = flag.Bool("D", false, "Enable debug mode")

-		flAutoRestart        = flag.Bool("r", true, "Restart previously running containers")

-		bridgeName           = flag.String("b", "", "Attach containers to a pre-existing network bridge; use 'none' to disable container networking")

-		bridgeIp             = flag.String("bip", "", "Use this CIDR notation address for the network bridge's IP, not compatible with -b")

-		pidfile              = flag.String("p", "/var/run/docker.pid", "Path to use for daemon PID file")

-		flRoot               = flag.String("g", "/var/lib/docker", "Path to use as the root of the docker runtime")

-		flEnableCors         = flag.Bool("api-enable-cors", false, "Enable CORS headers in the remote API")

+		flVersion            = flag.Bool([]string{"v", "-version"}, false, "Print version information and quit")

+		flDaemon             = flag.Bool([]string{"d", "-daemon"}, false, "Enable daemon mode")

+		flDebug              = flag.Bool([]string{"D", "-debug"}, false, "Enable debug mode")

+		flAutoRestart        = flag.Bool([]string{"r", "-restart"}, true, "Restart previously running containers")

+		bridgeName           = flag.String([]string{"b", "-bridge"}, "", "Attach containers to a pre-existing network bridge; use 'none' to disable container networking")

+		bridgeIp             = flag.String([]string{"#bip", "-bip"}, "", "Use this CIDR notation address for the network bridge's IP, not compatible with -b")

+		pidfile              = flag.String([]string{"p", "-pidfile"}, "/var/run/docker.pid", "Path to use for daemon PID file")

+		flRoot               = flag.String([]string{"g", "-graph"}, "/var/lib/docker", "Path to use as the root of the docker runtime")

+		flEnableCors         = flag.Bool([]string{"#api-enable-cors", "-api-enable-cors"}, false, "Enable CORS headers in the remote API")

 		flDns                = docker.NewListOpts(docker.ValidateIp4Address)

-		flEnableIptables     = flag.Bool("iptables", true, "Disable docker's addition of iptables rules")

-		flDefaultIp          = flag.String("ip", "0.0.0.0", "Default IP address to use when binding container ports")

-		flInterContainerComm = flag.Bool("icc", true, "Enable inter-container communication")

-		flGraphDriver        = flag.String("s", "", "Force the docker runtime to use a specific storage driver")

+		flEnableIptables     = flag.Bool([]string{"#iptables", "-iptables"}, true, "Disable docker's addition of iptables rules")

+		flDefaultIp          = flag.String([]string{"#ip", "-ip"}, "0.0.0.0", "Default IP address to use when binding container ports")

+		flInterContainerComm = flag.Bool([]string{"#icc", "-icc"}, true, "Enable inter-container communication")

+		flGraphDriver        = flag.String([]string{"s", "-storage-driver"}, "", "Force the docker runtime to use a specific storage driver")

 		flHosts              = docker.NewListOpts(docker.ValidateHost)

-		flMtu                = flag.Int("mtu", docker.DefaultNetworkMtu, "Set the containers network mtu")

+		flMtu                = flag.Int([]string{"#mtu", "-mtu"}, docker.DefaultNetworkMtu, "Set the containers network mtu")

 	)

-	flag.Var(&flDns, "dns", "Force docker to use specific DNS servers")

-	flag.Var(&flHosts, "H", "Multiple tcp://host:port or unix://path/to/socket to bind in daemon mode, single connection otherwise")

+	flag.Var(&flDns, []string{"#dns", "-dns"}, "Force docker to use specific DNS servers")

+	flag.Var(&flHosts, []string{"H", "-host"}, "Multiple tcp://host:port or unix://path/to/socket to bind in daemon mode, single connection otherwise")

 	flag.Parse()

@@ -62,7 +62,7 @@ func main() {

 	}

 	if *bridgeName != "" && *bridgeIp != "" {

-		log.Fatal("You specified -b & -bip, mutually exclusive options. Please specify only one.")

+		log.Fatal("You specified -b & --bip, mutually exclusive options. Please specify only one.")

 	}

 	if *flDebug {

@@ -41,7 +41,7 @@ This time, we're requesting shared access to ``$COUCH1``'s volumes.

 .. code-block:: bash

-    COUCH2=$(sudo docker run -d -p 5984 -volumes-from $COUCH1 shykes/couchdb:2013-05-03)

+    COUCH2=$(sudo docker run -d -p 5984 --volumes-from $COUCH1 shykes/couchdb:2013-05-03)

 Browse data on the second database

 ----------------------------------

@@ -43,7 +43,7 @@ container. The ``BUILD_JOB`` environment variable will be set with the new conta

     [...]

 While this container is running, we can attach to the new container to

-see what is going on. The flag ``-sig-proxy`` set as ``false`` allows you to connect and

+see what is going on. The flag ``--sig-proxy`` set as ``false`` allows you to connect and

 disconnect (Ctrl-C) to it without stopping the container.

 .. code-block:: bash

@@ -44,7 +44,7 @@ use a container link to provide access to our Redis database.

 .. code-block:: bash

-    sudo docker run -name redis -d <your username>/redis

+    sudo docker run --name redis -d <your username>/redis

 Create your web application container

 -------------------------------------

@@ -56,7 +56,7 @@ Redis instance running inside that container to only this container.

 .. code-block:: bash

-    sudo docker run -link redis:db -i -t ubuntu:12.10 /bin/bash

+    sudo docker run --link redis:db -i -t ubuntu:12.10 /bin/bash

 Once inside our freshly created container we need to install Redis to get the 

 ``redis-cli`` binary to test our connection.

@@ -26,22 +26,21 @@ To list available commands, either run ``docker`` with no parameters or execute

 ::

     Usage of docker:

-      -D=false: Enable debug mode

-      -H=[unix:///var/run/docker.sock]: tcp://[host[:port]] to bind or unix://[/path/to/socket] to use. When host=[0.0.0.0], port=[4243] or path=[/var/run/docker.sock] is omitted, default values are used.

-      -api-enable-cors=false: Enable CORS headers in the remote API

-      -b="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking

-      -bip="": Use the provided CIDR notation address for the dynamically created bridge (docker0); Mutually exclusive of -b

-      -d=false: Enable daemon mode

-      -dns="": Force docker to use specific DNS servers

-      -g="/var/lib/docker": Path to use as the root of the docker runtime

-      -icc=true: Enable inter-container communication

-      -ip="0.0.0.0": Default IP address to use when binding container ports

-      -iptables=true: Disable docker's addition of iptables rules

-      -mtu=1500: Set the containers network mtu

-      -p="/var/run/docker.pid": Path to use for daemon PID file

-      -r=true: Restart previously running containers

-      -s="": Force the docker runtime to use a specific storage driver

-      -v=false: Print version information and quit

+      -D, --debug=false: Enable debug mode

+      -H, --host=[]: Multiple tcp://host:port or unix://path/to/socket to bind in daemon mode, single connection otherwise

+      --api-enable-cors=false: Enable CORS headers in the remote API

+      -b, --bridge="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking

+      --bip="": Use this CIDR notation address for the network bridge's IP, not compatible with -b

+      -d, --daemon=false: Enable daemon mode

+      --dns=[]: Force docker to use specific DNS servers

+      -g, --graph="/var/lib/docker": Path to use as the root of the docker runtime

+      --icc=true: Enable inter-container communication

+      --ip="0.0.0.0": Default IP address to use when binding container ports

+      --iptables=true: Disable docker's addition of iptables rules

+      -p, --pidfile="/var/run/docker.pid": Path to use for daemon PID file

+      -r, --restart=true: Restart previously running containers

+      -s, --storage-driver="": Force the docker runtime to use a specific storage driver

+      -v, --version=false: Print version information and quit

 The Docker daemon is the persistent process that manages containers.  Docker uses the same binary for both the 

 daemon and client.  To run the daemon you provide the ``-d`` flag.

@@ -75,8 +74,8 @@ the ``-H`` flag for the client.

     Attach to a running container.

-      -nostdin=false: Do not attach stdin

-      -sig-proxy=true: Proxify all received signal to the process (even in non-tty mode)

+      --no-stdin=false: Do not attach stdin

+      --sig-proxy=true: Proxify all received signal to the process (even in non-tty mode)

 You can detach from the container again (and leave it running) with

 ``CTRL-c`` (for a quiet exit) or ``CTRL-\`` to get a stacktrace of

@@ -135,11 +134,11 @@ Examples:

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

     Build a new container image from the source code at PATH

-      -t="": Repository name (and optionally a tag) to be applied 

+      -t, --time="": Repository name (and optionally a tag) to be applied 

              to the resulting image in case of success.

-      -q=false: Suppress verbose build output.

-      -no-cache: Do not use the cache when building the image.

-      -rm: Remove intermediate containers after a successful build

+      -q, --quiet=false: Suppress verbose build output.

+      --no-cache: Do not use the cache when building the image.

+      --rm: Remove intermediate containers after a successful build

 The files at ``PATH`` or ``URL`` are called the "context" of the build. The

 build process may refer to any of the files in the context, for example when

@@ -233,9 +232,9 @@ by using the ``git://`` schema.

     Create a new image from a container's changes

-      -m="": Commit message

-      -author="": Author (eg. "John Hannibal Smith <hannibal@a-team.com>"

-      -run="": Configuration to be applied when the image is launched with `docker run`.

+      -m, --message="": Commit message

+      -a, --author="": Author (eg. "John Hannibal Smith <hannibal@a-team.com>"

+      --run="": Configuration to be applied when the image is launched with `docker run`.

                (ex: -run='{"Cmd": ["cat", "/world"], "PortSpecs": ["22"]}')

 .. _cli_commit_examples:

@@ -279,7 +278,7 @@ run ``ls /etc``.

 Full -run example

 .................

-The ``-run`` JSON hash changes the ``Config`` section when running ``docker inspect CONTAINERID``

+The ``--run`` JSON hash changes the ``Config`` section when running ``docker inspect CONTAINERID``

 or ``config`` when running ``docker inspect IMAGEID``.

 (Multiline is okay within a single quote ``'``)

@@ -379,7 +378,7 @@ For example:

     Get real time events from the server

-    -since="": Show previously created events and then stream.

+    --since="": Show previously created events and then stream.

                (either seconds since epoch, or date string as below)

 .. _cli_events_example:

@@ -459,8 +458,8 @@ For example:

     Show the history of an image

-      -notrunc=false: Don't truncate output

-      -q=false: only show numeric IDs

+      --no-trunc=false: Don't truncate output

+      -q, --quiet=false: only show numeric IDs

 To see how the ``docker:latest`` image was built:

@@ -507,11 +506,11 @@ To see how the ``docker:latest`` image was built:

     List images

-      -a=false: show all images (by default filter out the intermediate images used to build)

-      -notrunc=false: Don't truncate output

-      -q=false: only show numeric IDs

-      -tree=false: output graph in tree format

-      -viz=false: output graph in graphviz format

+      -a, --all=false: show all images (by default filter out the intermediate images used to build)

+      --no-trunc=false: Don't truncate output

+      -q, --quiet=false: only show numeric IDs

+      --tree=false: output graph in tree format

+      --viz=false: output graph in graphviz format

 Listing the most recently created images

 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@@ -535,7 +534,7 @@ Listing the full length image IDs

 .. code-block:: bash

-	$ sudo docker images -notrunc | head

+	$ sudo docker images --no-trunc | head

 	REPOSITORY                    TAG                 IMAGE ID                                                           CREATED             VIRTUAL SIZE

 	<none>                        <none>              77af4d6b9913e693e8d0b4b294fa62ade6054e6b2f1ffb617ac955dd63fb0182   19 hours ago        1.089 GB

 	committest                    latest              b6fa739cedf5ea12a620a439402b6004d057da800f91c7524b5086a5e4749c9f   19 hours ago        1.089 GB

@@ -552,7 +551,7 @@ Displaying images visually

 .. code-block:: bash

-    $ sudo docker images -viz | dot -Tpng -o docker.png

+    $ sudo docker images --viz | dot -Tpng -o docker.png

 .. image:: docker_images.gif

    :alt: Example inheritance graph of Docker images.

@@ -563,7 +562,7 @@ Displaying image hierarchy

 .. code-block:: bash

-    $ sudo docker images -tree

+    $ sudo docker images --tree

     ├─8dbd9e392a96 Size: 131.5 MB (virtual 131.5 MB) Tags: ubuntu:12.04,ubuntu:latest,ubuntu:precise

     └─27cf78414709 Size: 180.1 MB (virtual 180.1 MB)

@@ -702,7 +701,7 @@ Insert file from GitHub

     Return low-level information on a container/image

-      -format="": Format the output using the given go template.

+      -f, --format="": Format the output using the given go template.

 By default, this will render all results in a JSON array.  If a format

 is specified, the given template will be executed for each result.

@@ -721,7 +720,7 @@ fairly straightforward manner.

 .. code-block:: bash

-    $ sudo docker inspect -format='{{.NetworkSettings.IPAddress}}' $INSTANCE_ID

+    $ sudo docker inspect --format='{{.NetworkSettings.IPAddress}}' $INSTANCE_ID

 List All Port Bindings

 ......................

@@ -790,9 +789,9 @@ Known Issues (kill)

     Register or Login to the docker registry server

-    -e="": email

-    -p="": password

-    -u="": username

+    -e, --email="": email

+    -p, --password="": password

+    -u, --username="": username

     If you want to login to a private registry you can

     specify this by adding the server name.

@@ -812,12 +811,14 @@ Known Issues (kill)

     Fetch the logs of a container

+    -f, --follow=false: Follow log output

+

 The ``docker logs`` command is a convenience which batch-retrieves whatever

 logs are present at the time of execution. This does not guarantee execution

 order when combined with a ``docker run`` (i.e. your run may not have generated

 any logs at the time you execute ``docker logs``).

-The ``docker logs -f`` command combines ``docker logs`` and ``docker attach``:

+The ``docker logs --follow`` command combines ``docker logs`` and ``docker attach``:

 it will first return all logs from the beginning and then continue streaming

 new output from the container's stdout and stderr.

@@ -845,9 +846,9 @@ new output from the container's stdout and stderr.

     List containers

-      -a=false: Show all containers. Only running containers are shown by default.

-      -notrunc=false: Don't truncate output

-      -q=false: Only display numeric IDs

+      -a, --all=false: Show all containers. Only running containers are shown by default.

+      --no-trunc=false: Don't truncate output

+      -q, --quiet=false: Only display numeric IDs

 Running ``docker ps`` showing 2 linked containers.

@@ -903,7 +904,7 @@ Running ``docker ps`` showing 2 linked containers.

     Usage: docker rm [OPTIONS] CONTAINER

     Remove one or more containers

-        -link="": Remove the link instead of the actual container

+        --link="": Remove the link instead of the actual container

 Known Issues (rm)

 ~~~~~~~~~~~~~~~~~

@@ -926,7 +927,7 @@ This will remove the container referenced under the link ``/redis``.

 .. code-block:: bash

-    $ sudo docker rm -link /webapp/redis

+    $ sudo docker rm --link /webapp/redis

     /webapp/redis

@@ -996,31 +997,31 @@ image is removed.

     Run a command in a new container

-      -a=map[]: Attach to stdin, stdout or stderr

-      -c=0: CPU shares (relative weight)

-      -cidfile="": Write the container ID to the file

-      -d=false: Detached mode: Run container in the background, print new container id

-      -e=[]: Set environment variables

-      -h="": Container host name

-      -i=false: Keep stdin open even if not attached

-      -privileged=false: Give extended privileges to this container

-      -m="": Memory limit (format: <number><optional unit>, where unit = b, k, m or g)

-      -n=true: Enable networking for this container

-      -p=[]: Map a network port to the container

-      -rm=false: Automatically remove the container when it exits (incompatible with -d)

-      -t=false: Allocate a pseudo-tty

-      -u="": Username or UID

-      -dns=[]: Set custom dns servers for the container

-      -v=[]: Create a bind mount with: [host-dir]:[container-dir]:[rw|ro]. If "container-dir" is missing, then docker creates a new volume.

-      -volumes-from="": Mount all volumes from the given container(s)

-      -entrypoint="": Overwrite the default entrypoint set by the image

-      -w="": Working directory inside the container

-      -lxc-conf=[]: Add custom lxc options -lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"

-      -sig-proxy=true: Proxify all received signal to the process (even in non-tty mode)

-      -expose=[]: Expose a port from the container without publishing it to your host

-      -link="": Add link to another container (name:alias)

-      -name="": Assign the specified name to the container. If no name is specific docker will generate a random name

-      -P=false: Publish all exposed ports to the host interfaces

+      -a, --attach=map[]: Attach to stdin, stdout or stderr

+      -c, --cpu-shares=0: CPU shares (relative weight)

+      --cidfile="": Write the container ID to the file

+      -d, --detach=false: Detached mode: Run container in the background, print new container id

+      -e, --env=[]: Set environment variables

+      -h, --host="": Container host name

+      -i, --interactive=false: Keep stdin open even if not attached

+      --privileged=false: Give extended privileges to this container

+      -m, --memory="": Memory limit (format: <number><optional unit>, where unit = b, k, m or g)

+      -n, --networking=true: Enable networking for this container

+      -p, --publish=[]: Map a network port to the container

+      --rm=false: Automatically remove the container when it exits (incompatible with -d)

+      -t, --tty=false: Allocate a pseudo-tty

+      -u, --username="": Username or UID

+      --dns=[]: Set custom dns servers for the container

+      -v, --volume=[]: Create a bind mount with: [host-dir]:[container-dir]:[rw|ro]. If "container-dir" is missing, then docker creates a new volume.

+      --volumes-from="": Mount all volumes from the given container(s)

+      --entrypoint="": Overwrite the default entrypoint set by the image

+      -w, --workdir="": Working directory inside the container

+      --lxc-conf=[]: Add custom lxc options -lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"

+      --sig-proxy=true: Proxify all received signal to the process (even in non-tty mode)

+      --expose=[]: Expose a port from the container without publishing it to your host

+      --link="": Add link to another container (name:alias)

+      --name="": Assign the specified name to the container. If no name is specific docker will generate a random name

+      -P, --publish-all=false: Publish all exposed ports to the host interfaces

 The ``docker run`` command first ``creates`` a writeable container layer over

 the specified image, and then ``starts`` it using the specified command. That

@@ -1042,7 +1043,7 @@ Examples:

 .. code-block:: bash

-    $ sudo docker run -cidfile /tmp/docker_test.cid ubuntu echo "test"

+    $ sudo docker run --cidfile /tmp/docker_test.cid ubuntu echo "test"

 This will create a container and print ``test`` to the console. The

 ``cidfile`` flag makes Docker attempt to create a new file and write the

@@ -1051,7 +1052,7 @@ error. Docker will close this file when ``docker run`` exits.

 .. code-block:: bash

-   $ sudo docker run -t -i -rm ubuntu bash

+   $ sudo docker run -t -i --rm ubuntu bash

    root@bc338942ef20:/# mount -t tmpfs none /mnt

    mount: permission denied

@@ -1063,7 +1064,7 @@ allow it to run:

 .. code-block:: bash

-   $ sudo docker run -privileged ubuntu bash

+   $ sudo docker run --privileged ubuntu bash

    root@50e3f57e16e6:/# mount -t tmpfs none /mnt

    root@50e3f57e16e6:/# df -h

    Filesystem      Size  Used Avail Use% Mounted on

@@ -1104,7 +1105,7 @@ in Docker.

 .. code-block:: bash

-    $ sudo docker run -expose 80 ubuntu bash

+    $ sudo docker run --expose 80 ubuntu bash

 This exposes port ``80`` of the container for use within a link without

 publishing the port to the host system's interfaces. :ref:`port_redirection`

@@ -1112,28 +1113,28 @@ explains in detail how to manipulate ports in Docker.

 .. code-block:: bash

-    $ sudo docker run -name console -t -i ubuntu bash

+    $ sudo docker run --name console -t -i ubuntu bash

 This will create and run a new container with the container name

 being ``console``.

 .. code-block:: bash

-    $ sudo docker run -link /redis:redis -name console ubuntu bash

+    $ sudo docker run --link /redis:redis --name console ubuntu bash

-The ``-link`` flag will link the container named ``/redis`` into the

+The ``--link`` flag will link the container named ``/redis`` into the

 newly created container with the alias ``redis``.  The new container

 can access the network and environment of the redis container via

-environment variables.  The ``-name`` flag will assign the name ``console``

+environment variables.  The ``--name`` flag will assign the name ``console``

 to the newly created container.

 .. code-block:: bash

-   $ sudo docker run -volumes-from 777f7dc92da7,ba8c0c54f0f2:ro -i -t ubuntu pwd

+   $ sudo docker run --volumes-from 777f7dc92da7,ba8c0c54f0f2:ro -i -t ubuntu pwd