summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-11 06:54:40 -0700
committerGitHub <noreply@github.com>2019-03-11 06:54:40 -0700
commitb33a00ef96601d7ce2389ac634e86847239d7d2e (patch)
tree549e723fdb55f02335f1f37fa8bf2514ee462b04 /docs
parent349e6911497a95a6a8121524b56704fe680f2b09 (diff)
parent3e3fcd542288bb088863afdad8efdea2461bbe18 (diff)
downloadpodman-b33a00ef96601d7ce2389ac634e86847239d7d2e.tar.gz
podman-b33a00ef96601d7ce2389ac634e86847239d7d2e.tar.bz2
podman-b33a00ef96601d7ce2389ac634e86847239d7d2e.zip
Merge pull request #2606 from TomSweeneyRedHat/dev/tsweeney/builddocfix
Remove --rm and --detach don't coexist note
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-create.1.md3
-rw-r--r--docs/podman-run.1.md3
2 files changed, 2 insertions, 4 deletions
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`.