From 3e3fcd542288bb088863afdad8efdea2461bbe18 Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Mon, 11 Mar 2019 09:32:34 -0400 Subject: Remove --rm and --detach don't coexist note Signed-off-by: TomSweeneyRedHat With later changes of Podman, you can now use both the --rm and --detach in a single run command. This PR removes the documentation in the man pages saying this is not allowed. Fixes: #2601 --- docs/podman-create.1.md | 3 +-- docs/podman-run.1.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 342ef59c3..4de79b07e 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -164,8 +164,7 @@ Detached mode: run the container in the background and print the new container I At any time you can run **podman ps** in the other shell to view a list of the running containers. You can reattach to a -detached container with **podman attach**. If you choose to run a container in -the detached mode, then you cannot use the **-rm** option. +detached container with **podman attach**. When attached in the tty mode, you can detach from the container (and leave it running) using a configurable key sequence. The default sequence is `CTRL-p CTRL-q`. diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index bbf10a2ce..b5fa0ed4c 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -170,8 +170,7 @@ Detached mode: run the container in the background and print the new container I At any time you can run **podman ps** in the other shell to view a list of the running containers. You can reattach to a -detached container with **podman attach**. If you choose to run a container in -the detached mode, then you cannot use the **-rm** option. +detached container with **podman attach**. When attached in the tty mode, you can detach from the container (and leave it running) using a configurable key sequence. The default sequence is `CTRL-p CTRL-q`. -- cgit v1.2.3-54-g00ecf