summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-14 12:47:30 +0100
committerGitHub <noreply@github.com>2020-11-14 12:47:30 +0100
commit64a7d492264a071ec31d627fbf4201854567d25a (patch)
treed38c3fef8a43f44f06487f5b2594774b34202cb1
parent0cba4a581a0365806249be51736e2463ec1fed68 (diff)
parent928e3a65a975793f3a5542bde4dd556fb0a7fa69 (diff)
downloadpodman-64a7d492264a071ec31d627fbf4201854567d25a.tar.gz
podman-64a7d492264a071ec31d627fbf4201854567d25a.tar.bz2
podman-64a7d492264a071ec31d627fbf4201854567d25a.zip
Merge pull request #8336 from TomSweeneyRedHat/dev/tsweeney/podmanman
[CI:DOCS] Touch up Podman description in man page menu
-rw-r--r--docs/source/Commands.rst2
-rw-r--r--docs/source/markdown/podman.1.md4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/source/Commands.rst b/docs/source/Commands.rst
index 881dcb4b6..cd5d894da 100644
--- a/docs/source/Commands.rst
+++ b/docs/source/Commands.rst
@@ -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
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md
index 87867bf35..1954ca2aa 100644
--- a/docs/source/markdown/podman.1.md
+++ b/docs/source/markdown/podman.1.md
@@ -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,
@@ -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`)