summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-03-16 06:46:35 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2019-03-18 12:23:41 -0400
commitd0ee203986b2de559d4b6240bab7dda789bafb73 (patch)
treedf2331c97c8008efcd9d8b592eccfbd783c257d0 /docs
parentea54a1c2f51d3173649277939738ce9b1c392076 (diff)
downloadpodman-d0ee203986b2de559d4b6240bab7dda789bafb73.tar.gz
podman-d0ee203986b2de559d4b6240bab7dda789bafb73.tar.bz2
podman-d0ee203986b2de559d4b6240bab7dda789bafb73.zip
Cleanup messages on podman load
If user does not specify file or redirect for stdin, then throw an error Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-load.1.md18
-rw-r--r--docs/podman-save.1.md5
2 files changed, 12 insertions, 11 deletions
diff --git a/docs/podman-load.1.md b/docs/podman-load.1.md
index 5363f3f1e..8a1660c63 100644
--- a/docs/podman-load.1.md
+++ b/docs/podman-load.1.md
@@ -1,22 +1,24 @@
% podman-load(1)
## NAME
-podman\-load - Load an image from docker archive
+podman\-load - Load an image from a container image archive into container storage
## SYNOPSIS
-**podman load** [ARCHIVE]
+**podman load** [*name*[:*tag*]]
## DESCRIPTION
-**podman load** copies an image from either **docker-archive** or **oci-archive** stored
-on the local machine. **podman load** reads from stdin by default or a file if the **input** flag is set.
-The **quiet** flag suppresses the output when set.
+**podman load** loads an image from either an **oci-archive** or **docker-archive** stored on the local machine into container storage. **podman load** reads from stdin by default or a file if the **input** option is set.
+You can also specify a name for the image if the archive does not contain a named reference, of if you want an additonal name for the local image.
+
+The **quiet** option suppresses the progress output when set.
Note: `:` is a restricted character and cannot be part of the file name.
+
**podman [GLOBAL OPTIONS]**
**podman load [GLOBAL OPTIONS]**
-**podman load [OPTIONS] NAME[:TAG|@DIGEST]**
+**podman load [OPTIONS] NAME[:TAG]**
## OPTIONS
@@ -28,7 +30,7 @@ The remote client requires the use of this option.
**--quiet, -q**
-Suppress the output
+Suppress the progress output
**--signature-policy="PATHNAME"**
@@ -75,7 +77,7 @@ Loaded image: registry.fedoraproject.org/fedora:latest
```
## SEE ALSO
-podman(1), podman-save(1), crio(8)
+podman(1), podman-save(1), podman-tag(1), crio(8)
## HISTORY
July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-save.1.md b/docs/podman-save.1.md
index a0b04d633..75aeda797 100644
--- a/docs/podman-save.1.md
+++ b/docs/podman-save.1.md
@@ -1,14 +1,13 @@
% podman-save(1)
## NAME
-podman\-save - Save an image to docker-archive or oci-archive
+podman\-save - Save an image to a container archive
## SYNOPSIS
**podman save** [*options*] *name*[:*tag*]
## DESCRIPTION
-**podman save** saves an image to either **docker-archive**, **oci-archive**, **oci-dir** (directory
-with oci manifest type), or **docker-dir** (directory with v2s2 manifest type) on the local machine,
+**podman save** saves an image to either **docker-archive**, **oci-archive**, **oci-dir** (directory with oci manifest type), or **docker-dir** (directory with v2s2 manifest type) on the local machine,
default is **docker-archive**. **podman save** writes to STDOUT by default and can be redirected to a
file using the **output** flag. The **quiet** flag suppresses the output when set.
Note: `:` is a restricted character and cannot be part of the file name.