From c384cf54c2480bb3d71dae40a8f0874c855cacef Mon Sep 17 00:00:00 2001 From: Trent Ogren Date: Mon, 9 Jun 2014 13:33:55 -0500 Subject: [PATCH 1/2] Add missing parenthesis in docs for -author switch Docker-DCO-1.1-Signed-off-by: Trent Ogren (github: misfo) Docker-DCO-1.1-Signed-off-by: Trent Ogren (github: SvenDowideit) Upstream-commit: 3fcb0d880aad65690cac304c30f72d0688a801d2 Component: engine --- components/engine/api/client/commands.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/api/client/commands.go b/components/engine/api/client/commands.go index 46a465f69a..83bf09a7ee 100644 --- a/components/engine/api/client/commands.go +++ b/components/engine/api/client/commands.go @@ -1520,7 +1520,7 @@ 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([]string{"m", "-message"}, "", "Commit message") - flAuthor := cmd.String([]string{"a", "#author", "-author"}, "", "Author (eg. \"John Hannibal Smith \"") + flAuthor := cmd.String([]string{"a", "#author", "-author"}, "", "Author (eg. \"John Hannibal Smith \")") // 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 { From 51f8aff176cef99abb288289f50901550e4f11cd Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 25 Jun 2014 16:50:35 -0700 Subject: [PATCH 2/2] Add the missing paren to the documentation for docker commit too Docker-DCO-1.1-Signed-off-by: Sven Dowideit (github: SvenDowideit) Upstream-commit: 389916bf9ae62ded0e497512da22faba75d0cf2d Component: engine --- components/engine/docs/sources/reference/commandline/cli.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/docs/sources/reference/commandline/cli.md b/components/engine/docs/sources/reference/commandline/cli.md index 47dd0a992d..1b67b216f4 100644 --- a/components/engine/docs/sources/reference/commandline/cli.md +++ b/components/engine/docs/sources/reference/commandline/cli.md @@ -306,7 +306,7 @@ schema. Create a new image from a container's changes - -a, --author="" Author (eg. "John Hannibal Smith " + -a, --author="" Author (eg. "John Hannibal Smith ") -m, --message="" Commit message It can be useful to commit a container's file changes or settings into a