diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-24 05:39:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 05:39:06 -0400 |
| commit | 63626e9b583da3929e8ed1020deed97c14bd2206 (patch) | |
| tree | 388ceb110776ff3d0778e0f71cc705262e77d25d /docs/source | |
| parent | fc34f35e3f984c8a76136227168b3f8b65b15101 (diff) | |
| parent | 7d83f9b6cc05322a698af9f3118d6d5d3ba3301e (diff) | |
| download | podman-63626e9b583da3929e8ed1020deed97c14bd2206.tar.gz podman-63626e9b583da3929e8ed1020deed97c14bd2206.tar.bz2 podman-63626e9b583da3929e8ed1020deed97c14bd2206.zip | |
Merge pull request #10766 from Procyhon/13062021_manpage
[CI:DOCS] Follow-up to PR 10676
Diffstat (limited to 'docs/source')
| -rw-r--r-- | docs/source/markdown/podman-container-prune.1.md | 3 | ||||
| -rw-r--r-- | docs/source/markdown/podman-container-restore.1.md | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docs/source/markdown/podman-container-prune.1.md b/docs/source/markdown/podman-container-prune.1.md index 06014897f..0f679ceff 100644 --- a/docs/source/markdown/podman-container-prune.1.md +++ b/docs/source/markdown/podman-container-prune.1.md @@ -21,7 +21,7 @@ Supported filters: | Filter | Description | | :----------------: | --------------------------------------------------------------------------- | | *until* | Only remove containers and images created before given timestamp. | -| *label* | Only remove containers and images, with (or without, in case label!=[...] is used) the specified labels. | +| *label* | Only remove containers and images, with (or without, in the case of label!=[...] is used) the specified labels. | The `until` *filter* can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. 10m, 1h30m) computed relative to the machine’s time. @@ -60,7 +60,6 @@ ed0c6468b8e1cb641b4621d1fe30cb477e1fefc5c0bceb66feaf2f7cb50e5962 6ac6c8f0067b7a4682e6b8e18902665b57d1a0e07e885d9abcd382232a543ccd fff1c5b6c3631746055ec40598ce8ecaa4b82aef122f9e3a85b03b55c0d06c23 602d343cd47e7cb3dfc808282a9900a3e4555747787ec6723bb68cedab8384d5 - ``` Remove all stopped containers from local storage created within last 10 minutes diff --git a/docs/source/markdown/podman-container-restore.1.md b/docs/source/markdown/podman-container-restore.1.md index 21021b952..36eb650e5 100644 --- a/docs/source/markdown/podman-container-restore.1.md +++ b/docs/source/markdown/podman-container-restore.1.md @@ -31,7 +31,7 @@ The default is **false**. #### **--latest**, **-l** -Instead of providing the *container ID* or *name*, use the last created *container*. If other methods than Podman are used to run *containers* such as `CRI-O`, the last started *container* could be from either of those methods.\ +Instead of providing the *container ID* or *name*, use the last created *container*. If other tools than Podman are used to run *containers* such as `CRI-O`, the last started *container* could be from either tool.\ The default is **false**.\ *IMPORTANT: This OPTION is not available with the remote Podman client. This OPTION does not need a container name or ID as input argument.* |