Merge pull request #8336 from TomSweeneyRedHat/dev/tsweeney/podmanman

[CI:DOCS] Touch up Podman description in man page menu
This commit is contained in:
OpenShift Merge Robot
2020-11-14 12:47:30 +01:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@
Commands Commands
======== ========
:doc:`Podman <markdown/podman.1>` (Pod Manager) Global Options :doc:`Podman <markdown/podman.1>` (Pod Manager) Global Options, Environment Variables, Exit Codes, Configuration Files, and more
:doc:`attach <markdown/podman-attach.1>` Attach to a running container :doc:`attach <markdown/podman-attach.1>` Attach to a running container

View File

@ -168,7 +168,7 @@ podman --remote flag, only the global options `--url`, `--identity`, `--log-leve
Connection information can also be managed using the containers.conf file. Connection information can also be managed using the containers.conf file.
## Exit Status ## Exit Codes
The exit code from `podman` gives information about why the container The exit code from `podman` gives information about why the container
failed to run or why it exited. When `podman` commands exit with a non-zero code, failed to run or why it exited. When `podman` commands exit with a non-zero code,
@ -257,7 +257,7 @@ the exit codes follow the `chroot` standard, see below:
| [podman-volume(1)](podman-volume.1.md) | Simple management tool for volumes. | | [podman-volume(1)](podman-volume.1.md) | Simple management tool for volumes. |
| [podman-wait(1)](podman-wait.1.md) | Wait on one or more containers to stop and print their exit codes. | | [podman-wait(1)](podman-wait.1.md) | Wait on one or more containers to stop and print their exit codes. |
## FILES ## CONFIGURATION FILES
**containers.conf** (`/usr/share/containers/containers.conf`, `/etc/containers/containers.conf`, `$HOME/.config/containers/containers.conf`) **containers.conf** (`/usr/share/containers/containers.conf`, `/etc/containers/containers.conf`, `$HOME/.config/containers/containers.conf`)