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

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

 	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 (eg. \"John Hannibal Smith <hannibal@a-team.com>\")")

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

 	// FIXME: --run is deprecated, it will be replaced with inline Dockerfile commands.

 	flConfig := cmd.String([]string{"#run", "#-run"}, "", "This option is deprecated and will be removed in a future version in favor of inline Dockerfile-compatible commands")

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

@@ -79,7 +79,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s t -l tag -d '

 # commit

 complete -c docker -f -n '__fish_docker_no_subcommand' -a commit -d "Create a new image from a container's changes"

-complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s a -l author -d 'Author (eg. "John Hannibal Smith <hannibal@a-team.com>"'

+complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s a -l author -d 'Author (e.g., "John Hannibal Smith <hannibal@a-team.com>"'

 complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s m -l message -d 'Commit message'

 complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -l run -d 'Config automatically applied when the image is run. (ex: -run=\'{"Cmd": ["cat", "/world"], "PortSpecs": ["22"]}\')'

 complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -a '(__fish_print_docker_containers all)' -d "Container"

new file mode 100755

@@ -0,0 +1,214 @@

+#!/usr/bin/env python

+

+#

+# Sven's quick hack script to update the documentation

+#

+# call with:

+#       ./docs/update.py /usr/bin/docker

+#

+

+import re

+from sys import argv

+import subprocess

+import os

+import os.path

+

+script, docker_cmd = argv

+

+def print_usage(outtext, docker_cmd, command):

+    help = ""

+    try:

+        #print "RUN ", "".join((docker_cmd, " ", command, " --help"))

+        help = subprocess.check_output("".join((docker_cmd, " ", command, " --help")), stderr=subprocess.STDOUT, shell=True)

+    except subprocess.CalledProcessError, e:

+        help = e.output

+    for l in str(help).strip().split("\n"):

+        l = l.rstrip()

+        if l == '':

+            outtext.write("\n")

+        else:

+            # `docker --help` tells the user the path they called it with

+            l = re.sub(docker_cmd, "docker", l)

+            outtext.write("    "+l+"\n")

+    outtext.write("\n")

+

+# TODO: look for an complain about any missing commands

+def update_cli_reference():

+    originalFile = "docs/sources/reference/commandline/cli.md"

+    os.rename(originalFile, originalFile+".bak")

+

+    intext = open(originalFile+".bak", "r")

+    outtext = open(originalFile, "w")

+

+    mode = 'p'

+    space = "    "

+    command = ""

+    # 2 mode line-by line parser

+    for line in intext:

+        if mode=='p':

+            # Prose

+            match = re.match("(    \s*)Usage: docker ([a-z]+)", line)

+            if match:

+                # the begining of a Docker command usage block

+                space = match.group(1)

+                command = match.group(2)

+                mode = 'c'

+            else:

+                match = re.match("(    \s*)Usage of .*docker.*:", line)

+                if match:

+                    # the begining of the Docker --help usage block

+                    space = match.group(1)

+                    command = ""

+                    mode = 'c'

+                else:

+                    outtext.write(line)

+        else:

+            # command usage block

+            match = re.match("("+space+")(.*)|^$", line)

+            #print "CMD ", command

+            if not match:

+                # The end of the current usage block - Shell out to run docker to see the new output

+                print_usage(outtext, docker_cmd, command)

+                outtext.write(line)

+                mode = 'p'

+    if mode == 'c':

+        print_usage(outtext, docker_cmd, command)

+

+def update_man_pages():

+    cmds = []

+    try:

+        help = subprocess.check_output("".join((docker_cmd)), stderr=subprocess.STDOUT, shell=True)

+    except subprocess.CalledProcessError, e:

+        help = e.output

+    for l in str(help).strip().split("\n"):

+        l = l.rstrip()

+        if l != "":

+            match = re.match("    (.*?) .*", l)

+            if match:

+                cmds.append(match.group(1))

+

+    desc_re = re.compile(r".*# DESCRIPTION(.*?)# (OPTIONS|EXAMPLES?).*", re.MULTILINE|re.DOTALL)

+    example_re = re.compile(r".*# EXAMPLES?(.*)# HISTORY.*", re.MULTILINE|re.DOTALL)

+    history_re = re.compile(r".*# HISTORY(.*)", re.MULTILINE|re.DOTALL)

+

+    for command in cmds:

+        print "COMMAND: "+command

+        history = ""

+        description = ""

+        examples = ""

+        if os.path.isfile("docs/man/docker-"+command+".1.md"):

+            intext = open("docs/man/docker-"+command+".1.md", "r")

+            txt = intext.read()

+            intext.close()

+            match = desc_re.match(txt)

+            if match:

+                description = match.group(1)

+            match = example_re.match(txt)

+            if match:

+                examples = match.group(1)

+            match = history_re.match(txt)

+            if match:

+                history = match.group(1).strip()

+        

+        usage = ""

+        usage_description = ""

+        params = {}

+        key_params = {}

+        

+        help = ""

+        try:

+            help = subprocess.check_output("".join((docker_cmd, " ", command, " --help")), stderr=subprocess.STDOUT, shell=True)

+        except subprocess.CalledProcessError, e:

+            help = e.output

+        last_key = ""

+        for l in str(help).split("\n"):

+            l = l.rstrip()

+            if l != "":

+                match = re.match("Usage: docker "+command+"(.*)", l)

+                if match:

+                    usage = match.group(1).strip()

+                else:

+                    #print ">>>>"+l

+                    match = re.match("  (-+)(.*) \s+(.*)", l)

+                    if match:

+                        last_key = match.group(2).rstrip()

+                        #print "    found "+match.group(1)

+                        key_params[last_key] = match.group(1)+last_key

+                        params[last_key] = match.group(3)

+                    else:

+                        if last_key != "":

+                            params[last_key] = params[last_key] + "\n" + l

+                        else:

+                            if usage_description != "":

+                                usage_description = usage_description + "\n"

+                            usage_description = usage_description + l

+        

+        # replace [OPTIONS] with the list of params     

+        options = ""

+        match = re.match("\[OPTIONS\](.*)", usage)

+        if match:

+            usage = match.group(1)

+

+        new_usage = ""

+        # TODO: sort without the `-`'s

+        for key in sorted(params.keys(), key=lambda s: s.lower()):

+            # split on commas, remove --?.*=.*, put in *'s mumble

+            ps = []

+            opts = []

+            for k in key_params[key].split(","):

+                #print "......"+k

+                match = re.match("(-+)([A-Za-z-0-9]*)(?:=(.*))?", k.lstrip())

+                if match:

+                    p = "**"+match.group(1)+match.group(2)+"**"

+                    o = "**"+match.group(1)+match.group(2)+"**"

+                    if match.group(3):

+                        # if ="" then use UPPERCASE(group(2))"

+                        val = match.group(3)

+                        if val == "\"\"":

+                            val = match.group(2).upper()

+                        p = p+"[=*"+val+"*]"

+                        val = match.group(3)

+                        if val in ("true", "false"):

+                            params[key] = params[key].rstrip()

+                            if not params[key].endswith('.'):

+                                params[key] = params[key]+ "."

+                            params[key] = params[key] + " The default is *"+val+"*."

+                            val = "*true*|*false*"

+                        o = o+"="+val

+                    ps.append(p)

+                    opts.append(o)

+                else:

+                    print "nomatch:"+k

+            new_usage = new_usage+ "\n["+"|".join(ps)+"]"

+            options = options + ", ".join(opts) + "\n   "+ params[key]+"\n\n"

+        if new_usage != "":

+            new_usage = new_usage.strip() + "\n"

+        usage = new_usage + usage

+            

+        

+        outtext = open("docs/man/docker-"+command+".1.md", "w")

+        outtext.write("""% DOCKER(1) Docker User Manuals

+% Docker Community

+% JUNE 2014

+# NAME

+""")

+        outtext.write("docker-"+command+" - "+usage_description+"\n\n")

+        outtext.write("# SYNOPSIS\n**docker "+command+"**\n"+usage+"\n\n")

+        if description != "":

+            outtext.write("# DESCRIPTION"+description)

+        if options == "":

+            options = "There are no available options.\n\n"

+        outtext.write("# OPTIONS\n"+options)

+        if examples != "":

+           outtext.write("# EXAMPLES"+examples)

+        outtext.write("# HISTORY\n")

+        if history != "":

+           outtext.write(history+"\n")

+        recent_history_re = re.compile(".*June 2014.*", re.MULTILINE|re.DOTALL)

+        if not recent_history_re.match(history):

+            outtext.write("June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>\n")

+        outtext.close()

+

+# main

+update_cli_reference()

+update_man_pages()

@@ -1,11 +1,14 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

 docker-attach - Attach to a running container

 # SYNOPSIS

-**docker attach** **--no-stdin**[=*false*] **--sig-proxy**[=*true*] CONTAINER

+**docker attach**

+[**--no-stdin**[=*false*]]

+[**--sig-proxy**[=*true*]]

+ CONTAINER

 # DESCRIPTION

 If you **docker run** a container in detached mode (**-d**), you can reattach to

@@ -19,11 +22,10 @@ the client.

 # OPTIONS

 **--no-stdin**=*true*|*false*

-When set to true, do not attach to stdin. The default is *false*.

+   Do not attach STDIN. The default is *false*.

-**--sig-proxy**=*true*|*false*:

-When set to true, proxify received signals to the process (even in non-tty

-mode). SIGCHLD is not proxied. The default is *true*.

+**--sig-proxy**=*true*|*false*

+   Proxify all received signals to the process (even in non-TTY mode). SIGCHLD is not proxied. The default is *true*.

 # EXAMPLES

@@ -56,3 +58,4 @@ attach** command:

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,12 +1,17 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

-docker-build - Build an image from a Dockerfile source at PATH

+docker-build - Build a new image from the source code at PATH

 # SYNOPSIS

-**docker build** [**--no-cache**[=*false*]] [**-q**|**--quiet**[=*false*]]

- [**--rm**] [**-t**|**--tag**=TAG] PATH | URL | -

+**docker build**

+[**--force-rm**[=*false*]]

+[**--no-cache**[=*false*]]

+[**-q**|**--quiet**[=*false*]]

+[**--rm**[=*true*]]

+[**-t**|**--tag**[=*TAG*]]

+ PATH | URL | -

 # DESCRIPTION

 This will read the Dockerfile from the directory specified in **PATH**.

@@ -25,22 +30,20 @@ When a Git repository is set as the **URL**, the repository is used

 as context.

 # OPTIONS

+**--force-rm**=*true*|*false*

+   Always remove intermediate containers, even after unsuccessful builds. The default is *false*.

+

+**--no-cache**=*true*|*false*

+   Do not use cache when building the image. The default is *false*.

 **-q**, **--quiet**=*true*|*false*

-   When set to true, suppress verbose build output. Default is *false*.

+   Suppress the verbose output generated by the containers. The default is *false*.

 **--rm**=*true*|*false*

-   When true, remove intermediate containers that are created during the

-build process. The default is true.

+   Remove intermediate containers after a successful build. The default is *true*.

-**-t**, **--tag**=*tag*

-   The name to be applied to the resulting image on successful completion of

-the build. `tag` in this context means the entire image name including the 

-optional TAG after the ':'.

-

-**--no-cache**=*true*|*false*

-   When set to true, do not use a cache when building the image. The

-default is *false*.

+**-t**, **--tag**=""

+   Repository name (and optionally a tag) to be applied to the resulting image in case of success

 # EXAMPLES

@@ -115,3 +118,4 @@ Note: You can set an arbitrary Git repository via the `git://` schema.

 # HISTORY

 March 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,22 +1,23 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

-docker-commit - Create a new image from the changes to an existing

-container

+docker-commit - Create a new image from a container's changes

 # SYNOPSIS

-**docker commit** **-a**|**--author**[=""] **-m**|**--message**[=""]

-CONTAINER [REPOSITORY[:TAG]]

+**docker commit**

+[**-a**|**--author**[=*AUTHOR*]]

+[**-m**|**--message**[=*MESSAGE*]]

+ CONTAINER [REPOSITORY[:TAG]]

 # DESCRIPTION

 Using an existing container's name or ID you can create a new image.

 # OPTIONS

-**-a, --author**=""

-   Author name. (e.g., "John Hannibal Smith <hannibal@a-team.com>"

+**-a**, **--author**=""

+   Author (e.g., "John Hannibal Smith <hannibal@a-team.com>")

-**-m, --message**=""

+**-m**, **--message**=""

    Commit message

 **-p, --pause**=true

@@ -35,3 +36,4 @@ create a new image run docker ps to find the container's ID and then run:

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and in

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,18 +1,22 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

 docker-cp - Copy files/folders from the PATH to the HOSTPATH

 # SYNOPSIS

-**docker cp** CONTAINER:PATH HOSTPATH

+**docker cp**

+CONTAINER:PATH HOSTPATH

 # DESCRIPTION

 Copy files/folders from a container's filesystem to the host

 path. Paths are relative to the root of the filesystem. Files

 can be copied from a running or stopped container.

-# EXAMPLE

+# OPTIONS

+There are no available options.

+

+# EXAMPLES

 An important shell script file, created in a bash shell, is copied from

 the exited container to the current dir on the host:

@@ -21,4 +25,4 @@ the exited container to the current dir on the host:

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

-

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,18 +1,22 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

 docker-diff - Inspect changes on a container's filesystem

 # SYNOPSIS

-**docker diff** CONTAINER

+**docker diff**

+CONTAINER

 # DESCRIPTION

 Inspect changes on a container's filesystem. You can use the full or

 shortened container ID or the container name set using

 **docker run --name** option.

-# EXAMPLE

+# OPTIONS

+There are no available options.

+

+# EXAMPLES

 Inspect the changes to on a nginx container:

     # docker diff 1fdfd1f54c1b

@@ -40,5 +44,4 @@ Inspect the changes to on a nginx container:

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

-

-

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

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

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

 docker-events - Get real time events from the server

-**docker events** **--since**=""|*epoch-time*

+# SYNOPSIS

+**docker events**

+[**--since**[=*SINCE*]]

+[**--until**[=*UNTIL*]]

+

 # DESCRIPTION

 Get event information from the Docker daemon. Information can include historical

@@ -12,8 +16,10 @@ information and real-time information.

 # OPTIONS

 **--since**=""

-Show previously created events and then stream. This can be in either

-seconds since epoch, or date string.

+   Show all events created since timestamp

+

+**--until**=""

+   Stream events until this timestamp

 # EXAMPLES

@@ -44,3 +50,4 @@ Again the output container IDs have been shortened for the purposes of this docu

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,19 +1,22 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

-docker-export - Export the contents of a filesystem as a tar archive to

-STDOUT.

+docker-export - Export the contents of a filesystem as a tar archive to STDOUT

 # SYNOPSIS

-**docker export** CONTAINER

+**docker export**

+CONTAINER

 # DESCRIPTION

 Export the contents of a container's filesystem using the full or shortened

 container ID or container name. The output is exported to STDOUT and can be

 redirected to a tar file.

-# EXAMPLE

+# OPTIONS

+There are no available options.

+

+# EXAMPLES

 Export the contents of the container called angry_bell to a tar file

 called test.tar:

@@ -24,3 +27,4 @@ called test.tar:

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,11 +1,13 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

 docker-history - Show the history of an image

 # SYNOPSIS

-**docker history** **--no-trunc**[=*false*] [**-q**|**--quiet**[=*false*]]

+**docker history**

+[**--no-trunc**[=*false*]]

+[**-q**|**--quiet**[=*false*]]

  IMAGE

 # DESCRIPTION

@@ -13,14 +15,13 @@ docker-history - Show the history of an image

 Show the history of when and how an image was created.

 # OPTIONS

-

 **--no-trunc**=*true*|*false*

-   When true don't truncate output. Default is false

+   Don't truncate output. The default is *false*.

-**-q**, **--quiet=*true*|*false*

-   When true only show numeric IDs. Default is false.

+**-q**, **--quiet**=*true*|*false*

+   Only show numeric IDs. The default is *false*.

-# EXAMPLE

+# EXAMPLES

     $ sudo docker history fedora

     IMAGE          CREATED          CREATED BY                                      SIZE

     105182bb5e8b   5 days ago       /bin/sh -c #(nop) ADD file:71356d2ad59aa3119d   372.7 MB

@@ -30,3 +31,4 @@ Show the history of when and how an image was created.

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,17 +1,16 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

-docker-images - List the images in the local repository

+docker-images - List images

 # SYNOPSIS

 **docker images**

-[**-a**|**--all**=*false*]

-[**--no-trunc**[=*false*]

-[**-q**|**--quiet**[=*false*]

-[**-t**|**--tree**=*false*]

-[**-v**|**--viz**=*false*]

-[NAME]

+[**-a**|**--all**[=*false*]]

+[**-f**|**--filter**[=*[]*]]

+[**--no-trunc**[=*false*]]

+[**-q**|**--quiet**[=*false*]]

+ [NAME]

 # DESCRIPTION

 This command lists the images stored in the local Docker repository.

@@ -30,26 +29,17 @@ called fedora. It may be tagged with 18, 19, or 20, etc. to manage different

 versions.

 # OPTIONS

-

 **-a**, **--all**=*true*|*false*

-   When set to true, also include all intermediate images in the list. The

-default is false.

+   Show all images (by default filter out the intermediate image layers). The default is *false*.

+

+**-f**, **--filter**=[]

+   Provide filter values (i.e. 'dangling=true')

 **--no-trunc**=*true*|*false*

-   When set to true, list the full image ID and not the truncated ID. The

-default is false.

+   Don't truncate output. The default is *false*.

 **-q**, **--quiet**=*true*|*false*

-   When set to true, list the complete image ID as part of the output. The

-default is false.

-

-**-t**, **--tree**=*true*|*false*

-   When set to true, list the images in a tree dependency tree (hierarchy)

-format. The default is false.

-

-**-v**, **--viz**=*true*|*false*

-   When set to true, list the graph in graphviz format. The default is

-*false*.

+   Only show numeric IDs. The default is *false*.

 # EXAMPLES

@@ -97,3 +87,4 @@ tools.

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,17 +1,20 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

-docker-import - Create an empty filesystem image and import the contents

-of the tarball into it.

+docker-import - Create an empty filesystem image and import the contents of the tarball (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) into it, then optionally tag it.

 # SYNOPSIS

-**docker import** URL|- [REPOSITORY[:TAG]]

+**docker import**

+URL|- [REPOSITORY[:TAG]]

 # DESCRIPTION

 Create a new filesystem image from the contents of a tarball (`.tar`,

 `.tar.gz`, `.tgz`, `.bzip`, `.tar.xz`, `.txz`) into it, then optionally tag it.

+# OPTIONS

+There are no available options.

+

 # EXAMPLES

 ## Import from a remote location

@@ -37,3 +40,4 @@ Import to docker via pipe and stdin:

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,12 +1,13 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

-docker-info - Display system wide information

+docker-info - Display system-wide information

 # SYNOPSIS

 **docker info**

+

 # DESCRIPTION

 This command displays system wide information regarding the Docker installation.

 Information displayed includes the number of containers and images, pool name,

@@ -44,3 +45,4 @@ Here is a sample output:

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,12 +1,13 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

-docker-inspect - Return low-level information on a container/image

+docker-inspect - Return low-level information on a container or image

 # SYNOPSIS

-**docker inspect** [**-f**|**--format**="" CONTAINER|IMAGE

-[CONTAINER|IMAGE...]

+**docker inspect**

+[**-f**|**--format**[=*FORMAT*]]

+CONTAINER|IMAGE [CONTAINER|IMAGE...]

 # DESCRIPTION

@@ -17,8 +18,7 @@ each result.

 # OPTIONS

 **-f**, **--format**=""

-   The text/template package of Go describes all the details of the

-format. See examples section

+   Format the output using the given go template.

 # EXAMPLES

@@ -224,6 +224,6 @@ Use an image's ID or name (e.g., repository/name[:tag]) to get information

     }]

 # HISTORY

-

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,11 +1,13 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

-docker-kill - Kill a running container (send SIGKILL, or specified signal)

+docker-kill - Kill a running container using SIGKILL or a specified signal

 # SYNOPSIS

-**docker kill** **--signal**[=*"KILL"*] CONTAINER [CONTAINER...]

+**docker kill**

+[**-s**|**--signal**[=*"KILL"*]]

+ CONTAINER [CONTAINER...]

 # DESCRIPTION

@@ -13,9 +15,10 @@ The main process inside each container specified will be sent SIGKILL,

  or any signal specified with option --signal.

 # OPTIONS

-**-s**, **--signal**=*"KILL"*

+**-s**, **--signal**="KILL"

    Signal to send to the container

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

  based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,11 +1,13 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

 docker-load - Load an image from a tar archive on STDIN

 # SYNOPSIS

-**docker load**  **--input**=""

+**docker load**

+[**-i**|**--input**[=*INPUT*]]

+

 # DESCRIPTION

@@ -13,11 +15,10 @@ Loads a tarred repository from a file or the standard input stream.

 Restores both images and tags.

 # OPTIONS

-

 **-i**, **--input**=""

    Read from a tar archive file, instead of STDIN

-# EXAMPLE

+# EXAMPLES

     $ sudo docker images

     REPOSITORY          TAG                 IMAGE ID            CREATED             VIRTUAL SIZE

@@ -34,3 +35,4 @@ Restores both images and tags.

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,12 +1,15 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

-docker-login - Register or Login to a docker registry server.

+docker-login - Register or log in to a Docker registry server, if no server is specified "https://index.docker.io/v1/" is the default.

 # SYNOPSIS

-**docker login** [**-e**|**-email**=""] [**-p**|**--password**=""]

- [**-u**|**--username**=""] [SERVER]

+**docker login**

+[**-e**|**--email**[=*EMAIL*]]

+[**-p**|**--password**[=*PASSWORD*]]

+[**-u**|**--username**[=*USERNAME*]]

+ [SERVER]

 # DESCRIPTION

 Register or Login to a docker registry server, if no server is

@@ -15,7 +18,7 @@ login to a private registry you can specify this by adding the server name.

 # OPTIONS

 **-e**, **--email**=""

-   Email address

+   Email

 **-p**, **--password**=""

    Password

@@ -23,7 +26,7 @@ login to a private registry you can specify this by adding the server name.

 **-u**, **--username**=""

    Username

-# EXAMPLE

+# EXAMPLES

 ## Login to a local registry

@@ -32,4 +35,4 @@ login to a private registry you can specify this by adding the server name.

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

-

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

@@ -1,11 +1,14 @@

 % DOCKER(1) Docker User Manuals

-% William Henry

-% APRIL 2014

+% Docker Community

+% JUNE 2014

 # NAME

 docker-logs - Fetch the logs of a container

 # SYNOPSIS

-**docker logs** **--follow**[=*false*] CONTAINER

+**docker logs**

+[**-f**|**--follow**[=*false*]]

+[**-t**|**--timestamps**[=*false*]]

+CONTAINER

 # DESCRIPTION

 The **docker logs** command batch-retrieves whatever logs are present for

@@ -18,9 +21,13 @@ The **docker logs --follow** command combines commands **docker logs** and

 then continue streaming new output from the container’s stdout and stderr.

 # OPTIONS

-**-f, --follow**=*true*|*false*

-   When *true*, follow log output. The default is false.

+**-f**, **--follow**=*true*|*false*

+   Follow log output. The default is *false*.

+

+**-t**, **--timestamps**=*true*|*false*

+   Show timestamps. The default is *false*.

 # HISTORY

 April 2014, Originally compiled by William Henry (whenry at redhat dot com)

 based on docker.io source material and internal work.

+June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>

new file mode 100644

@@ -0,0 +1,15 @@

+% DOCKER(1) Docker User Manuals

+% Docker Community

+% JUNE 2014

+# NAME

+docker-pause - Pause all processes within a container

+

+# SYNOPSIS

+**docker pause**