summaryrefslogtreecommitdiff
path: root/docs/source/markdown
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-25 18:22:50 +0000
committerGitHub <noreply@github.com>2020-09-25 18:22:50 +0000
commitbb8e77d7f42ae361d11161239bd5c7ac6fa5d719 (patch)
treeb5baf2651f434559093921a4948b1924682d3b6a /docs/source/markdown
parent17db9851d05544ef49f8bce0deec452a99aae2a9 (diff)
parent65f2f1a7639eb5bc12e6c522c111be18786870c9 (diff)
downloadpodman-bb8e77d7f42ae361d11161239bd5c7ac6fa5d719.tar.gz
podman-bb8e77d7f42ae361d11161239bd5c7ac6fa5d719.tar.bz2
podman-bb8e77d7f42ae361d11161239bd5c7ac6fa5d719.zip
Merge pull request #7785 from mheon/backports_211
Backports for v2.1.1
Diffstat (limited to 'docs/source/markdown')
-rw-r--r--docs/source/markdown/podman-load.1.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-load.1.md b/docs/source/markdown/podman-load.1.md
index 917f102f6..308a3493b 100644
--- a/docs/source/markdown/podman-load.1.md
+++ b/docs/source/markdown/podman-load.1.md
@@ -9,9 +9,11 @@ podman\-load - Load an image from a container image archive into container stora
**podman image load** [*options*] [*name*[:*tag*]]
## DESCRIPTION
-**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.
+**podman load** loads an image from either an **oci-archive** or a **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 additional name for the local image.
+The local client further supports loading an **oci-dir** or a **docker-dir** as created with **podman save** (1).
+
The **quiet** option suppresses the progress output when set.
Note: `:` is a restricted character and cannot be part of the file name.