From ba5268d382dec7b731717feec77b6e7d2e6cfdaf Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Sat, 16 Nov 2013 20:49:42 +1000 Subject: [PATCH] re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file --- commands.go | 2 +- docs/sources/commandline/cli.rst | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/commands.go b/commands.go index 5dd76fe187..2457685739 100644 --- a/commands.go +++ b/commands.go @@ -928,7 +928,7 @@ func (cli *DockerCli) CmdKill(args ...string) error { } func (cli *DockerCli) CmdImport(args ...string) error { - cmd := cli.Subcmd("import", "URL|- [REPOSITORY[:TAG]]", "Create a new filesystem image from the contents of a tarball(.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz).") + cmd := cli.Subcmd("import", "URL|- [REPOSITORY[:TAG]]", "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.") if err := cmd.Parse(args); err != nil { return nil diff --git a/docs/sources/commandline/cli.rst b/docs/sources/commandline/cli.rst index e35475ae96..a4eaa820be 100644 --- a/docs/sources/commandline/cli.rst +++ b/docs/sources/commandline/cli.rst @@ -557,7 +557,8 @@ Displaying image hierarchy Usage: docker import URL|- [REPOSITORY[:TAG]] - Create a new filesystem image from the contents of a tarball + 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. At this time, the URL must start with ``http`` and point to a single file archive (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) containing a