summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-18 10:49:34 -0700
committerGitHub <noreply@github.com>2019-03-18 10:49:34 -0700
commit9289ecd478176bc3de29792d500b1383683bfe79 (patch)
tree6a4161f8911140921776d86c64a9cb74b4918ab2 /README.md
parent91b00281e8b785208e1330a5c9679aa63a907eb9 (diff)
parentd0ee203986b2de559d4b6240bab7dda789bafb73 (diff)
downloadpodman-9289ecd478176bc3de29792d500b1383683bfe79.tar.gz
podman-9289ecd478176bc3de29792d500b1383683bfe79.tar.bz2
podman-9289ecd478176bc3de29792d500b1383683bfe79.zip
Merge pull request #2674 from rhatdan/load
Cleanup messages on podman load
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 636a6fa5b..fe78c9d58 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ popularized by Kubernetes. Libpod also contains the Pod Manager tool `(Podman)`
At a high level, the scope of libpod and podman is the following:
-* Support multiple image formats including the existing Docker/OCI image formats.
+* Support multiple image formats including the OCI and Docker image formats.
* Support for multiple means to download images including trust & image verification.
* Container image management (managing image layers, overlay filesystems, etc).
* Full management of container lifecycle