diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-31 16:32:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 16:32:59 +0200 |
| commit | 4e3010d4e761fcb3d6de3b38cac1dc5b4371b129 (patch) | |
| tree | 5f5a6a305536a7fa0c67cb3e10cd91da5c997223 /docs/source/markdown/podman-generate-systemd.1.md | |
| parent | 7d4ab3fd8f48c7ded1a226f148e3677a1122c657 (diff) | |
| parent | 3449b27cd1743a1353ea8c4503eec5d126d04b0d (diff) | |
| download | podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.tar.gz podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.tar.bz2 podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.zip | |
Merge pull request #5681 from rhatdan/timeout
Switch to using --time as opposed to --timeout to better match Docker.
Diffstat (limited to 'docs/source/markdown/podman-generate-systemd.1.md')
| -rw-r--r-- | docs/source/markdown/podman-generate-systemd.1.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-generate-systemd.1.md b/docs/source/markdown/podman-generate-systemd.1.md index 27b40bbb6..57ed9a5eb 100644 --- a/docs/source/markdown/podman-generate-systemd.1.md +++ b/docs/source/markdown/podman-generate-systemd.1.md @@ -27,7 +27,7 @@ Use the name of the container for the start, stop, and description in the unit f Create a new container via podman-run instead of starting an existing one. This option relies on container configuration files, which may not map directly to podman CLI flags; please review the generated output carefully before placing in production. Since we use systemd `Type=forking` service, using this option will force the container run with the detached param `-d` -**--timeout**, **-t**=*value* +**--time**, **-t**=*value* Override the default stop timeout for the container with the given value. |