Zsh completion : all --<option>= flag values may be given in the next argument

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>

contrib/completion/zsh/_docker

@@ -253,10 +253,10 @@ __docker_network_subcommand() {
             _arguments -A '-*' \
                 $opts_help \
                 "($help -d --driver)"{-d,--driver=}"[Driver to manage the Network]:driver:(null host bridge overlay)" \
-                "($help)--ipam-driver=-[IP Address Management Driver]:driver:(default)" \
-                "($help)*--subnet=-[Subnet in CIDR format that represents a network segment]:IP/mask: " \
-                "($help)*--ip-range=-[Allocate container ip from a sub-range]:IP/mask: " \
-                "($help)*--gateway=-[ipv4 or ipv6 Gateway for the master subnet]:IP: " \
+                "($help)--ipam-driver=[IP Address Management Driver]:driver:(default)" \
+                "($help)*--subnet=[Subnet in CIDR format that represents a network segment]:IP/mask: " \
+                "($help)*--ip-range=[Allocate container ip from a sub-range]:IP/mask: " \
+                "($help)*--gateway=[ipv4 or ipv6 Gateway for the master subnet]:IP: " \
                 "($help)*--aux-address[Auxiliary ipv4 or ipv6 addresses used by network driver]:key=IP: " \
                 "($help -)1:Network Name: " && ret=0
             ;;
@@ -333,20 +333,20 @@ __docker_volume_subcommand() {
         (create)
             _arguments \
                 $opts_help \
-                "($help -d --driver)"{-d,--driver=-}"[Specify volume driver name]:Driver name: " \
-                "($help)--name=-[Specify volume name]" \
-                "($help -o --opt)*"{-o,--opt=-}"[Set driver specific options]:Driver option: " && ret=0
+                "($help -d --driver)"{-d,--driver=}"[Specify volume driver name]:Driver name: " \
+                "($help)--name=[Specify volume name]" \
+                "($help -o --opt)*"{-o,--opt=}"[Set driver specific options]:Driver option: " && ret=0
             ;;
         (inspect)
             _arguments \
                 $opts_help \
-                "($help -f --format)"{-f,--format=-}"[Format the output using the given go template]:template: " \
+                "($help -f --format)"{-f,--format=}"[Format the output using the given go template]:template: " \
                 "($help -)1:volume:__docker_volumes" && ret=0
             ;;
         (ls)
             _arguments \
                 $opts_help \
-                "($help -f --filter)*"{-f,--filter=-}"[Provide filter values (i.e. 'dangling=true')]:filter: " \
+                "($help -f --filter)*"{-f,--filter=}"[Provide filter values (i.e. 'dangling=true')]:filter: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display volume names]" && ret=0
             ;;
         (rm)
@@ -394,57 +394,57 @@ __docker_subcommand() {
 
     opts_help=("(: -)--help[Print usage]")
     opts_cpumemlimit=(
-        "($help)--cpu-shares=-[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)"
-        "($help)--cgroup-parent=-[Parent cgroup for the container]:cgroup: "
-        "($help)--cpu-period=-[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: "
-        "($help)--cpu-quota=-[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: "
-        "($help)--cpuset-cpus=-[CPUs in which to allow execution]:CPUs: "
-        "($help)--cpuset-mems=-[MEMs in which to allow execution]:MEMs: "
-        "($help -m --memory)"{-m,--memory=-}"[Memory limit]:Memory limit: "
-        "($help)--memory-swap=-[Total memory limit with swap]:Memory limit: "
-        "($help)*--ulimit=-[ulimit options]:ulimit: "
+        "($help)--cpu-shares=[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)"
+        "($help)--cgroup-parent=[Parent cgroup for the container]:cgroup: "
+        "($help)--cpu-period=[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: "
+        "($help)--cpu-quota=[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: "
+        "($help)--cpuset-cpus=[CPUs in which to allow execution]:CPUs: "
+        "($help)--cpuset-mems=[MEMs in which to allow execution]:MEMs: "
+        "($help -m --memory)"{-m,--memory=}"[Memory limit]:Memory limit: "
+        "($help)--memory-swap=[Total memory limit with swap]:Memory limit: "
+        "($help)*--ulimit=[ulimit options]:ulimit: "
     )
     opts_create=(
-        "($help -a --attach)"{-a,--attach=-}"[Attach to stdin, stdout or stderr]:device:(STDIN STDOUT STDERR)"
-        "($help)*--add-host=-[Add a custom host-to-IP mapping]:host\:ip mapping: "
-        "($help)--blkio-weight=-[Block IO (relative weight), between 10 and 1000]:Block IO weight:(10 100 500 1000)"
-        "($help)*--cap-add=-[Add Linux capabilities]:capability: "
-        "($help)*--cap-drop=-[Drop Linux capabilities]:capability: "
-        "($help)--cidfile=-[Write the container ID to the file]:CID file:_files"
-        "($help)*--device=-[Add a host device to the container]:device:_files"
-        "($help)*--dns=-[Set custom DNS servers]:DNS server: "
-        "($help)*--dns-opt=-[Set custom DNS options]:DNS option: "
-        "($help)*--dns-search=-[Set custom DNS search domains]:DNS domains: "
-        "($help)*"{-e,--env=-}"[Set environment variables]:environment variable: "
-        "($help)--entrypoint=-[Overwrite the default entrypoint of the image]:entry point: "
-        "($help)*--env-file=-[Read environment variables from a file]:environment file:_files"
-        "($help)*--expose=-[Expose a port from the container without publishing it]: "
-        "($help)*--group-add=-[Add additional groups to run as]:group:_groups"
-        "($help -h --hostname)"{-h,--hostname=-}"[Container host name]:hostname:_hosts"
+        "($help -a --attach)"{-a,--attach=}"[Attach to stdin, stdout or stderr]:device:(STDIN STDOUT STDERR)"
+        "($help)*--add-host=[Add a custom host-to-IP mapping]:host\:ip mapping: "
+        "($help)--blkio-weight=[Block IO (relative weight), between 10 and 1000]:Block IO weight:(10 100 500 1000)"
+        "($help)*--cap-add=[Add Linux capabilities]:capability: "
+        "($help)*--cap-drop=[Drop Linux capabilities]:capability: "
+        "($help)--cidfile=[Write the container ID to the file]:CID file:_files"
+        "($help)*--device=[Add a host device to the container]:device:_files"
+        "($help)*--dns=[Set custom DNS servers]:DNS server: "
+        "($help)*--dns-opt=[Set custom DNS options]:DNS option: "
+        "($help)*--dns-search=[Set custom DNS search domains]:DNS domains: "
+        "($help)*"{-e,--env=}"[Set environment variables]:environment variable: "
+        "($help)--entrypoint=[Overwrite the default entrypoint of the image]:entry point: "
+        "($help)*--env-file=[Read environment variables from a file]:environment file:_files"
+        "($help)*--expose=[Expose a port from the container without publishing it]: "
+        "($help)*--group-add=[Add additional groups to run as]:group:_groups"
+        "($help -h --hostname)"{-h,--hostname=}"[Container host name]:hostname:_hosts"
         "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]"
-        "($help)--ipc=-[IPC namespace to use]:IPC namespace: "
+        "($help)--ipc=[IPC namespace to use]:IPC namespace: "
         "($help)--kernel-memory[Kernel memory limit in bytes.]:Memory limit: "
-        "($help)*--link=-[Add link to another container]:link:->link"
-        "($help)*"{-l,--label=-}"[Set meta data on a container]:label: "
-        "($help)--log-driver=-[Default driver for container logs]:Logging driver:(json-file syslog journald gelf fluentd awslogs none)"
-        "($help)*--log-opt=-[Log driver specific options]:log driver options: "
-        "($help)*--lxc-conf=-[Add custom lxc options]:lxc options: "
-        "($help)--mac-address=-[Container MAC address]:MAC address: "
-        "($help)--name=-[Container name]:name: "
-        "($help)--net=-[Connect a container to a network]:network mode:(bridge none container host)"
+        "($help)*--link=[Add link to another container]:link:->link"
+        "($help)*"{-l,--label=}"[Set meta data on a container]:label: "
+        "($help)--log-driver=[Default driver for container logs]:Logging driver:(json-file syslog journald gelf fluentd awslogs none)"
+        "($help)*--log-opt=[Log driver specific options]:log driver options: "
+        "($help)*--lxc-conf=[Add custom lxc options]:lxc options: "
+        "($help)--mac-address=[Container MAC address]:MAC address: "
+        "($help)--name=[Container name]:name: "
+        "($help)--net=[Connect a container to a network]:network mode:(bridge none container host)"
         "($help)--oom-kill-disable[Disable OOM Killer]"
         "($help -P --publish-all)"{-P,--publish-all}"[Publish all exposed ports]"
-        "($help)*"{-p,--publish=-}"[Expose a container's port to the host]:port:_ports"
-        "($help)--pid=-[PID namespace to use]:PID: "
+        "($help)*"{-p,--publish=}"[Expose a container's port to the host]:port:_ports"
+        "($help)--pid=[PID namespace to use]:PID: "
         "($help)--privileged[Give extended privileges to this container]"
         "($help)--read-only[Mount the container's root filesystem as read only]"
-        "($help)--restart=-[Restart policy]:restart policy:(no on-failure always unless-stopped)"
-        "($help)*--security-opt=-[Security options]:security option: "
+        "($help)--restart=[Restart policy]:restart policy:(no on-failure always unless-stopped)"
+        "($help)*--security-opt=[Security options]:security option: "
         "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]"
-        "($help -u --user)"{-u,--user=-}"[Username or UID]:user:_users"
+        "($help -u --user)"{-u,--user=}"[Username or UID]:user:_users"
         "($help)*-v[Bind mount a volume]:volume: "
-        "($help)*--volumes-from=-[Mount volumes from the specified container]:volume: "
-        "($help -w --workdir)"{-w,--workdir=-}"[Working directory inside the container]:directory:_directories"
+        "($help)*--volumes-from=[Mount volumes from the specified container]:volume: "
+        "($help -w --workdir)"{-w,--workdir=}"[Working directory inside the container]:directory:_directories"
     )
 
     case "$words[1]" in
@@ -460,21 +460,21 @@ __docker_subcommand() {
                 $opts_help \
                 $opts_cpumemlimit \
                 "($help)*--build-arg[Set build-time variables]:<varname>=<value>: " \
-                "($help -f --file)"{-f,--file=-}"[Name of the Dockerfile]:Dockerfile:_files" \
+                "($help -f --file)"{-f,--file=}"[Name of the Dockerfile]:Dockerfile:_files" \
                 "($help)--force-rm[Always remove intermediate containers]" \
                 "($help)--no-cache[Do not use cache when building the image]" \
                 "($help)--pull[Attempt to pull a newer version of the image]" \
                 "($help -q --quiet)"{-q,--quiet}"[Suppress verbose build output]" \
                 "($help)--rm[Remove intermediate containers after a successful build]" \
-                "($help -t --tag)"{-t,--tag=-}"[Repository, name and tag for the image]: :__docker_repositories_with_tags" \
+                "($help -t --tag)"{-t,--tag=}"[Repository, name and tag for the image]: :__docker_repositories_with_tags" \
                 "($help -):path or URL:_directories" && ret=0
             ;;
         (commit)
             _arguments \
                 $opts_help \
-                "($help -a --author)"{-a,--author=-}"[Author]:author: " \
-                "($help -c --change)*"{-c,--change=-}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \
-                "($help -m --message)"{-m,--message=-}"[Commit message]:message: " \
+                "($help -a --author)"{-a,--author=}"[Author]:author: " \
+                "($help -c --change)*"{-c,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \
+                "($help -m --message)"{-m,--message=}"[Commit message]:message: " \
                 "($help -p --pause)"{-p,--pause}"[Pause container during commit]" \
                 "($help -):container:__docker_containers" \
                 "($help -): :__docker_repositories_with_tags" && ret=0
@@ -517,49 +517,49 @@ __docker_subcommand() {
         (daemon)
             _arguments \
                 $opts_help \
-                "($help)--api-cors-header=-[Set CORS headers in the remote API]:CORS headers: " \
-                "($help -b --bridge)"{-b,--bridge=-}"[Attach containers to a network bridge]:bridge:_net_interfaces" \
-                "($help)--bip=-[Specify network bridge IP]" \
+                "($help)--api-cors-header=[Set CORS headers in the remote API]:CORS headers: " \
+                "($help -b --bridge)"{-b,--bridge=}"[Attach containers to a network bridge]:bridge:_net_interfaces" \
+                "($help)--bip=[Specify network bridge IP]" \
                 "($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
                 "($help)--default-gateway[Container default gateway IPv4 address]:IPv4 address: " \
                 "($help)--default-gateway-v6[Container default gateway IPv6 address]:IPv6 address: " \
-                "($help)--cluster-store=-[URL of the distributed storage backend]:Cluster Store:->cluster-store" \
-                "($help)--cluster-advertise=-[Address of the daemon instance to advertise]:Instance to advertise (host\:port): " \
+                "($help)--cluster-store=[URL of the distributed storage backend]:Cluster Store:->cluster-store" \
+                "($help)--cluster-advertise=[Address of the daemon instance to advertise]:Instance to advertise (host\:port): " \
                 "($help)*--cluster-store-opt[Set cluster options]:Cluster options:->cluster-store-options" \
-                "($help)*--dns=-[DNS server to use]:DNS: " \
-                "($help)*--dns-search=-[DNS search domains to use]:DNS search: " \
-                "($help)*--dns-opt=-[DNS options to use]:DNS option: " \
-                "($help)*--default-ulimit=-[Set default ulimit settings for containers]:ulimit: " \
+                "($help)*--dns=[DNS server to use]:DNS: " \
+                "($help)*--dns-search=[DNS search domains to use]:DNS search: " \
+                "($help)*--dns-opt=[DNS options to use]:DNS option: " \
+                "($help)*--default-ulimit=[Set default ulimit settings for containers]:ulimit: " \
                 "($help)--disable-legacy-registry[Do not contact legacy registries]" \
-                "($help -e --exec-driver)"{-e,--exec-driver=-}"[Exec driver to use]:driver:(native lxc windows)" \
-                "($help)*--exec-opt=-[Set exec driver options]:exec driver options: " \
-                "($help)--exec-root=-[Root of the Docker execdriver]:path:_directories" \
-                "($help)--fixed-cidr=-[IPv4 subnet for fixed IPs]:IPv4 subnet: " \
-                "($help)--fixed-cidr-v6=-[IPv6 subnet for fixed IPs]:IPv6 subnet: " \
-                "($help -G --group)"{-G,--group=-}"[Group for the unix socket]:group:_groups" \
-                "($help -g --graph)"{-g,--graph=-}"[Root of the Docker runtime]:path:_directories" \
-                "($help -H --host)"{-H,--host=-}"[tcp://host:port to bind/connect to]:host: " \
+                "($help -e --exec-driver)"{-e,--exec-driver=}"[Exec driver to use]:driver:(native lxc windows)" \
+                "($help)*--exec-opt=[Set exec driver options]:exec driver options: " \
+                "($help)--exec-root=[Root of the Docker execdriver]:path:_directories" \
+                "($help)--fixed-cidr=[IPv4 subnet for fixed IPs]:IPv4 subnet: " \
+                "($help)--fixed-cidr-v6=[IPv6 subnet for fixed IPs]:IPv6 subnet: " \
+                "($help -G --group)"{-G,--group=}"[Group for the unix socket]:group:_groups" \
+                "($help -g --graph)"{-g,--graph=}"[Root of the Docker runtime]:path:_directories" \
+                "($help -H --host)"{-H,--host=}"[tcp://host:port to bind/connect to]:host: " \
                 "($help)--icc[Enable inter-container communication]" \
-                "($help)*--insecure-registry=-[Enable insecure registry communication]:registry: " \
-                "($help)--ip=-[Default IP when binding container ports]" \
+                "($help)*--insecure-registry=[Enable insecure registry communication]:registry: " \
+                "($help)--ip=[Default IP when binding container ports]" \
                 "($help)--ip-forward[Enable net.ipv4.ip_forward]" \
                 "($help)--ip-masq[Enable IP masquerading]" \
                 "($help)--iptables[Enable addition of iptables rules]" \
                 "($help)--ipv6[Enable IPv6 networking]" \
-                "($help -l --log-level)"{-l,--log-level=-}"[Set the logging level]:level:(debug info warn error fatal)" \
-                "($help)*--label=-[Set key=value labels to the daemon]:label: " \
-                "($help)--log-driver=-[Default driver for container logs]:Logging driver:(json-file syslog journald gelf fluentd awslogs none)" \
-                "($help)*--log-opt=-[Log driver specific options]:log driver options: " \
-                "($help)--mtu=-[Set the containers network MTU]:mtu:(0 576 1420 1500 9000)" \
-                "($help -p --pidfile)"{-p,--pidfile=-}"[Path to use for daemon PID file]:PID file:_files" \
-                "($help)*--registry-mirror=-[Preferred Docker registry mirror]:registry mirror: " \
-                "($help -s --storage-driver)"{-s,--storage-driver=-}"[Storage driver to use]:driver:(aufs devicemapper btrfs zfs overlay)" \
+                "($help -l --log-level)"{-l,--log-level=}"[Set the logging level]:level:(debug info warn error fatal)" \
+                "($help)*--label=[Set key=value labels to the daemon]:label: " \
+                "($help)--log-driver=[Default driver for container logs]:Logging driver:(json-file syslog journald gelf fluentd awslogs none)" \
+                "($help)*--log-opt=[Log driver specific options]:log driver options: " \
+                "($help)--mtu=[Set the containers network MTU]:mtu:(0 576 1420 1500 9000)" \
+                "($help -p --pidfile)"{-p,--pidfile=}"[Path to use for daemon PID file]:PID file:_files" \
+                "($help)*--registry-mirror=[Preferred Docker registry mirror]:registry mirror: " \
+                "($help -s --storage-driver)"{-s,--storage-driver=}"[Storage driver to use]:driver:(aufs devicemapper btrfs zfs overlay)" \
                 "($help)--selinux-enabled[Enable selinux support]" \
-                "($help)*--storage-opt=-[Set storage driver options]:storage driver options: " \
+                "($help)*--storage-opt=[Set storage driver options]:storage driver options: " \
                 "($help)--tls[Use TLS]" \
-                "($help)--tlscacert=-[Trust certs signed only by this CA]:PEM file:_files -g "*.(pem|crt)"" \
-                "($help)--tlscert=-[Path to TLS certificate file]:PEM file:_files -g "*.(pem|crt)"" \
-                "($help)--tlskey=-[Path to TLS key file]:Key file:_files -g "*.(pem|key)"" \
+                "($help)--tlscacert=[Trust certs signed only by this CA]:PEM file:_files -g "*.(pem|crt)"" \
+                "($help)--tlscert=[Path to TLS certificate file]:PEM file:_files -g "*.(pem|crt)"" \
+                "($help)--tlskey=[Path to TLS key file]:Key file:_files -g "*.(pem|key)"" \
                 "($help)--tlsverify[Use TLS and verify the remote]" \
                 "($help)--userland-proxy[Use userland proxy for loopback traffic]" && ret=0
 
@@ -590,9 +590,9 @@ __docker_subcommand() {
         (events)
             _arguments \
                 $opts_help \
-                "($help)*"{-f,--filter=-}"[Filter values]:filter: " \
-                "($help)--since=-[Events created since this timestamp]:timestamp: " \
-                "($help)--until=-[Events created until this timestamp]:timestamp: " && ret=0
+                "($help)*"{-f,--filter=}"[Filter values]:filter: " \
+                "($help)--since=[Events created since this timestamp]:timestamp: " \
+                "($help)--until=[Events created until this timestamp]:timestamp: " && ret=0
             ;;
         (exec)
             local state
@@ -602,7 +602,7 @@ __docker_subcommand() {
                 "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" \
                 "($help)--privileged[Give extended Linux capabilities to the command]" \
                 "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \
-                "($help -u --user)"{-u,--user=-}"[Username or UID]:user:_users" \
+                "($help -u --user)"{-u,--user=}"[Username or UID]:user:_users" \
                 "($help -):containers:__docker_runningcontainers" \
                 "($help -)*::command:->anycommand" && ret=0
 
@@ -617,7 +617,7 @@ __docker_subcommand() {
         (export)
             _arguments \
                 $opts_help \
-                "($help -o --output)"{-o,--output=-}"[Write to a file, instead of stdout]:output file:_files" \
+                "($help -o --output)"{-o,--output=}"[Write to a file, instead of stdout]:output file:_files" \
                 "($help -)*:containers:__docker_containers" && ret=0
             ;;
         (history)
@@ -633,7 +633,7 @@ __docker_subcommand() {
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Show all images]" \
                 "($help)--digest[Show digests]" \
-                "($help)*"{-f,--filter=-}"[Filter values]:filter: " \
+                "($help)*"{-f,--filter=}"[Filter values]:filter: " \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
                 "($help -): :__docker_repositories" && ret=0
@@ -641,8 +641,8 @@ __docker_subcommand() {
         (import)
             _arguments \
                 $opts_help \
-                "($help -c --change)*"{-c,--change=-}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \
-                "($help -m --message)"{-m,--message=-}"[Set commit message for imported image]:message: " \
+                "($help -c --change)*"{-c,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \
+                "($help -m --message)"{-m,--message=}"[Set commit message for imported image]:message: " \
                 "($help -):URL:(- http:// file://)" \
                 "($help -): :__docker_repositories_with_tags" && ret=0
             ;;
@@ -654,9 +654,9 @@ __docker_subcommand() {
             local state
             _arguments \
                 $opts_help \
-                "($help -f --format=-)"{-f,--format=-}"[Format the output using the given go template]:template: " \
+                "($help -f --format)"{-f,--format=}"[Format the output using the given go template]:template: " \
                 "($help -s --size)"{-s,--size}"[Display total file sizes if the type is container]" \
-                "($help)--type=-[Return JSON for specified type]:type:(image container)" \
+                "($help)--type=[Return JSON for specified type]:type:(image container)" \
                 "($help -)*: :->values" && ret=0
 
             case $state in
@@ -674,20 +674,20 @@ __docker_subcommand() {
         (kill)
             _arguments \
                 $opts_help \
-                "($help -s --signal)"{-s,--signal=-}"[Signal to send]:signal:_signals" \
+                "($help -s --signal)"{-s,--signal=}"[Signal to send]:signal:_signals" \
                 "($help -)*:containers:__docker_runningcontainers" && ret=0
             ;;
         (load)
             _arguments \
                 $opts_help \
-                "($help -i --input)"{-i,--input=-}"[Read from tar archive file]:archive file:_files -g "*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)"" && ret=0
+                "($help -i --input)"{-i,--input=}"[Read from tar archive file]:archive file:_files -g "*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)"" && ret=0
             ;;
         (login)
             _arguments \
                 $opts_help \
-                "($help -e --email)"{-e,--email=-}"[Email]:email: " \
-                "($help -p --password)"{-p,--password=-}"[Password]:password: " \
-                "($help -u --user)"{-u,--user=-}"[Username]:username: " \
+                "($help -e --email)"{-e,--email=}"[Email]:email: " \
+                "($help -p --password)"{-p,--password=}"[Password]:password: " \
+                "($help -u --user)"{-u,--user=}"[Username]:username: " \
                 "($help -)1:server: " && ret=0
             ;;
         (logout)
@@ -699,9 +699,9 @@ __docker_subcommand() {
             _arguments \
                 $opts_help \
                 "($help -f --follow)"{-f,--follow}"[Follow log output]" \
-                "($help -s --since)"{-s,--since=-}"[Show logs since this timestamp]:timestamp: " \
+                "($help -s --since)"{-s,--since=}"[Show logs since this timestamp]:timestamp: " \
                 "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \
-                "($help)--tail=-[Output the last K lines]:lines:(1 10 20 50 all)" \
+                "($help)--tail=[Output the last K lines]:lines:(1 10 20 50 all)" \
                 "($help -)*:containers:__docker_containers" && ret=0
             ;;
         (network)
@@ -736,15 +736,15 @@ __docker_subcommand() {
             _arguments \
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Show all containers]" \
-                "($help)--before=-[Show only container created before...]:containers:__docker_containers" \
-                "($help)*"{-f,--filter=-}"[Filter values]:filter: " \
+                "($help)--before=[Show only container created before...]:containers:__docker_containers" \
+                "($help)*"{-f,--filter=}"[Filter values]:filter: " \
                 "($help)--format[Pretty-print containers using a Go template]:format: " \
                 "($help -l --latest)"{-l,--latest}"[Show only the latest created container]" \
                 "($help)-n[Show n last created containers, include non-running one]:n:(1 5 10 25 50)" \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
                 "($help -s --size)"{-s,--size}"[Display total file sizes]" \
-                "($help)--since=-[Show only containers created since...]:containers:__docker_containers" && ret=0
+                "($help)--since=[Show only containers created since...]:containers:__docker_containers" && ret=0
             ;;
         (pull)
             _arguments \
@@ -766,7 +766,7 @@ __docker_subcommand() {
         (restart|stop)
             _arguments \
                 $opts_help \
-                "($help -t --time=-)"{-t,--time=-}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \
+                "($help -t --time)"{-t,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \
                 "($help -)*:containers:__docker_runningcontainers" && ret=0
             ;;
         (rm)
@@ -792,7 +792,7 @@ __docker_subcommand() {
                 "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \
                 "($help)--rm[Remove intermediate containers when it exits]" \
                 "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \
-                "($help)--stop-signal=-[Signal to kill a container]:signal:_signals" \
+                "($help)--stop-signal=[Signal to kill a container]:signal:_signals" \
                 "($help -): :__docker_images" \
                 "($help -):command: _command_names -e" \
                 "($help -)*::arguments: _normal" && ret=0
@@ -811,7 +811,7 @@ __docker_subcommand() {
         (save)
             _arguments \
                 $opts_help \
-                "($help -o --output)"{-o,--output=-}"[Write to file]:file:_files" \
+                "($help -o --output)"{-o,--output=}"[Write to file]:file:_files" \
                 "($help -)*: :__docker_images" && ret=0
             ;;
         (search)
@@ -819,7 +819,7 @@ __docker_subcommand() {
                 $opts_help \
                 "($help)--automated[Only show automated builds]" \
                 "($help)--no-trunc[Do not truncate output]" \
-                "($help -s --stars)"{-s,--stars=-}"[Only display with at least X stars]:stars:(0 10 100 1000)" \
+                "($help -s --stars)"{-s,--stars=}"[Only display with at least X stars]:stars:(0 10 100 1000)" \
                 "($help -):term: " && ret=0
             ;;
         (start)
@@ -900,12 +900,12 @@ _docker() {
         "(: -)"{-h,--help}"[Print usage]" \
         "($help)--config[Location of client config files]:path:_directories" \
         "($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
-        "($help -H --host)"{-H,--host=-}"[tcp://host:port to bind/connect to]:host: " \
-        "($help -l --log-level)"{-l,--log-level=-}"[Set the logging level]:level:(debug info warn error fatal)" \
+        "($help -H --host)"{-H,--host=}"[tcp://host:port to bind/connect to]:host: " \
+        "($help -l --log-level)"{-l,--log-level=}"[Set the logging level]:level:(debug info warn error fatal)" \
         "($help)--tls[Use TLS]" \
-        "($help)--tlscacert=-[Trust certs signed only by this CA]:PEM file:_files -g "*.(pem|crt)"" \
-        "($help)--tlscert=-[Path to TLS certificate file]:PEM file:_files -g "*.(pem|crt)"" \
-        "($help)--tlskey=-[Path to TLS key file]:Key file:_files -g "*.(pem|key)"" \
+        "($help)--tlscacert=[Trust certs signed only by this CA]:PEM file:_files -g "*.(pem|crt)"" \
+        "($help)--tlscert=[Path to TLS certificate file]:PEM file:_files -g "*.(pem|crt)"" \
+        "($help)--tlskey=[Path to TLS key file]:Key file:_files -g "*.(pem|key)"" \
         "($help)--tlsverify[Use TLS and verify the remote]" \
         "($help)--userland-proxy[Use userland proxy for loopback traffic]" \
         "($help -v --version)"{-v,--version}"[Print version information and quit]" \