Skip to content

Commit

Permalink
Merge pull request #8336 from TomSweeneyRedHat/dev/tsweeney/podmanman
Browse files Browse the repository at this point in the history
[CI:DOCS] Touch up Podman description in man page menu
  • Loading branch information
openshift-merge-robot authored Nov 14, 2020
2 parents 0cba4a5 + 928e3a6 commit 64a7d49
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/source/Commands.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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

Expand Down
4 changes: 2 additions & 2 deletions docs/source/markdown/podman.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## Exit Status
## Exit Codes

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,
Expand Down Expand Up @@ -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-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`)

Expand Down

0 comments on commit 64a7d49

Please sign in to comment.