From 43117afa873791553c7be026c9e3e871fe9dfcc5 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Thu, 30 Apr 2015 14:43:14 -0700 Subject: [PATCH] Don't wrap 'cp' help too soon. Minor thing but docker cp --help was: Copy files/folders from a PATH on the container to a HOSTDIR on the host running the command. Use '-' to write the data as a tar file to STDOUT. This changes it to: Copy files/folders from a PATH on the container to a HOSTDIR on the host running the command. Use '-' to write the data as a tar file to STDOUT. The \n made the output look funky. Signed-off-by: Doug Davis Upstream-commit: 68ee5bdf96f1653d73e29329506949a765398a40 Component: engine --- components/engine/api/client/cp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/api/client/cp.go b/components/engine/api/client/cp.go index 392e362929..d195601ba6 100644 --- a/components/engine/api/client/cp.go +++ b/components/engine/api/client/cp.go @@ -16,7 +16,7 @@ import ( // // Usage: docker cp CONTAINER:PATH HOSTDIR func (cli *DockerCli) CmdCp(args ...string) error { - cmd := cli.Subcmd("cp", "CONTAINER:PATH HOSTDIR|-", "Copy files/folders from a PATH on the container to a HOSTDIR on the host\nrunning the command. Use '-' to write the data\nas a tar file to STDOUT.", true) + cmd := cli.Subcmd("cp", "CONTAINER:PATH HOSTDIR|-", "Copy files/folders from a PATH on the container to a HOSTDIR on the host\nrunning the command. Use '-' to write the data as a tar file to STDOUT.", true) cmd.Require(flag.Exact, 2) cmd.ParseFlags(args, true)