Merge pull request #2606 from TomSweeneyRedHat/dev/tsweeney/builddocfix

Remove --rm and --detach don't coexist note
This commit is contained in:
OpenShift Merge Robot 2019-03-11 06:54:40 -07:00 committed by GitHub
commit b33a00ef96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View File

@ -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 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 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 detached container with **podman attach**.
the detached mode, then you cannot use the **-rm** option.
When attached in the tty mode, you can detach from the container (and leave it 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`. running) using a configurable key sequence. The default sequence is `CTRL-p CTRL-q`.

View File

@ -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 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 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 detached container with **podman attach**.
the detached mode, then you cannot use the **-rm** option.
When attached in the tty mode, you can detach from the container (and leave it 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`. running) using a configurable key sequence. The default sequence is `CTRL-p CTRL-q`.