14 files changed, 84 insertions, 78 deletions
diff --git a/docs/source/markdown/podman-container-exists.1.md b/docs/source/markdown/podman-container-exists.1.md
index 4d988132b..3b4ca33e4 100644
--- a/docs/source/markdown/podman-container-exists.1.md
+++ b/docs/source/markdown/podman-container-exists.1.md
@@ -21,7 +21,7 @@ Print usage statement
 
 Check if an container called `webclient` exists in local storage (the container does actually exist).
 ```
-$ sudo podman container exists webclient
+$ podman container exists webclient
 $ echo $?
 0
 $
@@ -29,7 +29,7 @@ $
 
 Check if an container called `webbackend` exists in local storage (the container does not actually exist).
 ```
-$ sudo podman container exists webbackend
+$ podman container exists webbackend
 $ echo $?
 1
 $
diff --git a/docs/source/markdown/podman-exec.1.md b/docs/source/markdown/podman-exec.1.md
index 8c0106d70..1bd10f9ba 100644
--- a/docs/source/markdown/podman-exec.1.md
+++ b/docs/source/markdown/podman-exec.1.md
@@ -80,28 +80,28 @@ when creating the container.
 The exit code from `podman exec` gives information about why the command within the container failed to run or why it exited.  When `podman exec` exits with a
 non-zero code, the exit codes follow the `chroot` standard, see below:
 
-**_125_** if the error is with Podman **_itself_**
+  **125** The error is with Podman itself
 
     $ podman exec --foo ctrID /bin/sh; echo $?
     Error: unknown flag: --foo
     125
 
-**_126_** if the **_contained command_** cannot be invoked
+  **126** The _contained command_ cannot be invoked
 
     $ podman exec ctrID /etc; echo $?
     Error: container_linux.go:346: starting container process caused "exec: \"/etc\": permission denied": OCI runtime error
     126
 
-**_127_** if the **_contained command_** cannot be found
+  **127** The _contained command_ cannot be found
 
     $ podman exec ctrID foo; echo $?
     Error: container_linux.go:346: starting container process caused "exec: \"foo\": executable file not found in $PATH": OCI runtime error
     127
 
-**_Exit code_** of **_contained command_** otherwise
+  **Exit code** The _contained command_ exit code
 
-    $ podman exec ctrID /bin/sh -c 'exit 3'
-    # 3
+    $ podman exec ctrID /bin/sh -c 'exit 3'; echo $?
+    3
 
 ## EXAMPLES
 
diff --git a/docs/source/markdown/podman-history.1.md b/docs/source/markdown/podman-history.1.md
index 078864faa..1a8f8906c 100644
--- a/docs/source/markdown/podman-history.1.md
+++ b/docs/source/markdown/podman-history.1.md
@@ -29,17 +29,17 @@ Valid placeholders for the Go template are listed below:
 
 ## OPTIONS
 
-**--human**, **-H**
+**--human**, **-H**=*true|false*
 
-Display sizes and dates in human readable format
+Display sizes and dates in human readable format (default *true*).
 
-**--no-trunc**
+**--no-trunc**=*true|false*
 
-Do not truncate the output
+Do not truncate the output (default *false*).
 
-**--quiet**, **-q**
+**--quiet**, **-q**=*true|false*
 
-Print the numeric IDs only
+Print the numeric IDs only (default *false*).
 
 **--format**=*format*
 
diff --git a/docs/source/markdown/podman-image-exists.1.md b/docs/source/markdown/podman-image-exists.1.md
index f6a89e2aa..3b7127b64 100644
--- a/docs/source/markdown/podman-image-exists.1.md
+++ b/docs/source/markdown/podman-image-exists.1.md
@@ -22,7 +22,7 @@ Print usage statement
 
 Check if an image called `webclient` exists in local storage (the image does actually exist).
 ```
-$ sudo podman image exists webclient
+$ podman image exists webclient
 $ echo $?
 0
 $
@@ -30,7 +30,7 @@ $
 
 Check if an image called `webbackend` exists in local storage (the image does not actually exist).
 ```
-$ sudo podman image exists webbackend
+$ podman image exists webbackend
 $ echo $?
 1
 $
diff --git a/docs/source/markdown/podman-inspect.1.md b/docs/source/markdown/podman-inspect.1.md
index ad4d0659e..4998772c3 100644
--- a/docs/source/markdown/podman-inspect.1.md
+++ b/docs/source/markdown/podman-inspect.1.md
@@ -36,7 +36,7 @@ The latest option is not supported on the remote client or when invoked as *podm
 
 **--size**, **-s**
 
-Display the total file size if the type is a container
+In addition to normal output, display the total file size if the type is a container.
 
 
 ## EXAMPLE
diff --git a/docs/source/markdown/podman-remote.1.md b/docs/source/markdown/podman-remote.1.md
index bbc54a2a6..eab2405b2 100644
--- a/docs/source/markdown/podman-remote.1.md
+++ b/docs/source/markdown/podman-remote.1.md
@@ -65,27 +65,27 @@ 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,
 the exit codes follow the `chroot` standard, see below:
 
-**_125_** if the error is with podman **_itself_**
+  **125** The error is with podman itself
 
     $ podman run --foo busybox; echo $?
     Error: unknown flag: --foo
-      125
+    125
 
-**_126_** if executing a **_contained command_** and the **_command_** cannot be invoked
+  **126** Executing a _contained command_ and the _command_ cannot be invoked
 
     $ podman run busybox /etc; echo $?
     Error: container_linux.go:346: starting container process caused "exec: \"/etc\": permission denied": OCI runtime error
-      126
+    126
 
-**_127_** if executing a **_contained command_** and the **_command_** cannot be found
+  **127** Executing a _contained command_ and the _command_ cannot be found
     $ podman run busybox foo; echo $?
     Error: container_linux.go:346: starting container process caused "exec: \"foo\": executable file not found in $PATH": OCI runtime error
-      127
+    127
 
-**_Exit code_** of **_contained command_** otherwise
+  **Exit code** _contained command_ exit code
 
-    $ podman run busybox /bin/sh -c 'exit 3'
-    # 3
+    $ podman run busybox /bin/sh -c 'exit 3'; echo $?
+    3
 
 
 ## COMMANDS
diff --git a/docs/source/markdown/podman-rm.1.md b/docs/source/markdown/podman-rm.1.md
index 782feac6f..cddf06e3e 100644
--- a/docs/source/markdown/podman-rm.1.md
+++ b/docs/source/markdown/podman-rm.1.md
@@ -10,13 +10,13 @@ podman\-rm - Remove one or more containers
 
 ## DESCRIPTION
 **podman rm** will remove one or more containers from the host.  The container name or ID can be used.  This does not remove images.
-Running or unusable containers will not be removed without the `-f` option.
+Running or unusable containers will not be removed without the **-f** option.
 
 ## OPTIONS
 
 **--all**, **-a**
 
-Remove all containers.  Can be used in conjunction with -f as well.
+Remove all containers.  Can be used in conjunction with **-f** as well.
 
 **--cidfile**
 
@@ -46,51 +46,54 @@ The latest option is not supported on the remote client.
 **--storage**
 
 Remove the container from the storage library only.
-This is only possible with containers that are not present in libpod (cannot be seen by `podman ps`).
-It is used to remove containers from `podman build` and `buildah`, and orphan containers which were only partially removed by `podman rm`.
+This is only possible with containers that are not present in libpod (cannot be seen by **podman ps**).
+It is used to remove containers from **podman build** and **buildah**, and orphan containers which were only partially removed by **podman rm**.
 The storage option conflicts with the **--all**, **--latest**, and **--volumes** options.
 
 **--volumes**, **-v**
 
 Remove anonymous volumes associated with the container. This does not include named volumes
-created with `podman volume create`, or the `--volume` option of `podman run` and `podman create`.
+created with **podman volume create**, or the **--volume** option of **podman run** and **podman create**.
 
 ## EXAMPLE
 Remove a container by its name *mywebserver*
 ```
-podman rm mywebserver
+$ podman rm mywebserver
 ```
 
 Remove several containers by name and container id.
 ```
-podman rm mywebserver myflaskserver 860a4b23
+$ podman rm mywebserver myflaskserver 860a4b23
 ```
 
 Remove several containers reading their IDs from files.
 ```
-podman rm --cidfile ./cidfile-1 --cidfile /home/user/cidfile-2
+$ podman rm --cidfile ./cidfile-1 --cidfile /home/user/cidfile-2
 ```
 
 Forcibly remove a container by container ID.
 ```
-podman rm -f 860a4b23
+$ podman rm -f 860a4b23
 ```
 
 Remove all containers regardless of its run state.
 ```
-podman rm -f -a
+$ podman rm -f -a
 ```
 
 Forcibly remove the latest container created.
 ```
-podman rm -f --latest
+$ podman rm -f --latest
 ```
 
 ## Exit Status
-**_0_** if all specified containers removed
-**_1_** if one of the specified containers did not exist, and no other failures
-**_2_** if one of the specified containers is paused or running
-**_125_** if the command fails for a reason other than container did not exist or is paused/running
+  **0**   All specified containers removed
+
+  **1**   One of the specified containers did not exist, and no other failures
+
+  **2**   One of the specified containers is paused or running
+
+  **125** The command fails for a reason other than container did not exist or is paused/running
 
 ## SEE ALSO
 podman(1), podman-image-rm(1)
diff --git a/docs/source/markdown/podman-rmi.1.md b/docs/source/markdown/podman-rmi.1.md
index 3c46bc32c..78ef2b157 100644
--- a/docs/source/markdown/podman-rmi.1.md
+++ b/docs/source/markdown/podman-rmi.1.md
@@ -24,27 +24,30 @@ This option will cause podman to remove all containers that are using the image
 
 Remove an image by its short ID
 ```
-podman rmi c0ed59d05ff7
+$ podman rmi c0ed59d05ff7
 ```
 Remove an image and its associated containers.
 ```
-podman rmi --force imageID
+$ podman rmi --force imageID
 ```
 
 Remove multiple images by their shortened IDs.
 ```
-podman rmi c4dfb1609ee2 93fd78260bd1 c0ed59d05ff7
+$ podman rmi c4dfb1609ee2 93fd78260bd1 c0ed59d05ff7
 ```
 
 Remove all images and containers.
 ```
-podman rmi -a -f
+$ podman rmi -a -f
 ```
 ## Exit Status
-**_0_** if all specified images removed
-**_1_** if one of the specified images did not exist, and no other failures
-**_2_** if one of the specified images has child images or is being used by a container
-**_125_** if the command fails for a reason other than an image did not exist or is in use
+  **0**   All specified images removed
+
+  **1**   One of the specified images did not exist, and no other failures
+
+  **2**   One of the specified images has child images or is being used by a container
+
+  **125** The command fails for a reason other than an image did not exist or is in use
 
 ## SEE ALSO
 podman(1)
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index 512a382a6..bf79ea031 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -1022,25 +1022,25 @@ The exit code from `podman run` gives information about why the container
 failed to run or why it exited.  When `podman run` exits with a non-zero code,
 the exit codes follow the `chroot` standard, see below:
 
-**_125_** if the error is with Podman **_itself_**
+  **125** The error is with Podman itself
 
     $ podman run --foo busybox; echo $?
     Error: unknown flag: --foo
     125
 
-**_126_** if the **_contained command_** cannot be invoked
+  **126** The _contained command_ cannot be invoked
 
     $ podman run busybox /etc; echo $?
     Error: container_linux.go:346: starting container process caused "exec: \"/etc\": permission denied": OCI runtime error
     126
 
-**_127_** if the **_contained command_** cannot be found
+  **127** The _contained command_ cannot be found
 
     $ podman run busybox foo; echo $?
     Error: container_linux.go:346: starting container process caused "exec: \"foo\": executable file not found in $PATH": OCI runtime error
     127
 
-**_Exit code_** of **_contained command_** otherwise
+  **Exit code** _contained command_ exit code
 
     $ podman run busybox /bin/sh -c 'exit 3'
     3
diff --git a/docs/source/markdown/podman-stop.1.md b/docs/source/markdown/podman-stop.1.md
index 3b5f17057..7dbf18887 100644
--- a/docs/source/markdown/podman-stop.1.md
+++ b/docs/source/markdown/podman-stop.1.md
@@ -38,27 +38,27 @@ to run containers such as CRI-O, the last started container could be from either
 
 The latest option is not supported on the remote client.
 
-**--timeout**, **--time**, **t**=*time*
+**--timeout**, **--time**, **-t**=*time*
 
 Timeout to wait before forcibly stopping the container
 
-## EXAMPLE
+## EXAMPLES
 
-podman stop mywebserver
+$ podman stop mywebserver
 
-podman stop 860a4b235279
+$ podman stop 860a4b235279
 
-podman stop mywebserver 860a4b235279
+$ podman stop mywebserver 860a4b235279
 
-podman stop --cidfile /home/user/cidfile-1
+$ podman stop --cidfile /home/user/cidfile-1
 
-podman stop --cidfile /home/user/cidfile-1 --cidfile ./cidfile-2
+$ podman stop --cidfile /home/user/cidfile-1 --cidfile ./cidfile-2
 
-podman stop --timeout 2 860a4b235279
+$ podman stop --timeout 2 860a4b235279
 
-podman stop -a
+$ podman stop -a
 
-podman stop --latest
+$ podman stop --latest
 
 ## SEE ALSO
 podman(1), podman-rm(1)
diff --git a/docs/source/markdown/podman-system-df.1.md b/docs/source/markdown/podman-system-df.1.md
index d0b1755ee..3ddb685fc 100644
--- a/docs/source/markdown/podman-system-df.1.md
+++ b/docs/source/markdown/podman-system-df.1.md
@@ -18,7 +18,7 @@ Pretty-print images using a Go template
 Show detailed information on space usage
 
 ## EXAMPLE
-
+```
 $ podman system df
 TYPE            TOTAL   ACTIVE   SIZE    RECLAIMABLE
 Images          6       2        281MB   168MB (59%)
@@ -49,7 +49,7 @@ $ podman system df --format "{{.Type}}\t{{.Total}}"
 Images          1
 Containers      5
 Local Volumes   1
-
+```
 ## SEE ALSO
 podman-system(1)
 
diff --git a/docs/source/markdown/podman-system-prune.1.md b/docs/source/markdown/podman-system-prune.1.md
index e6297dc0b..9c6ef5d8b 100644
--- a/docs/source/markdown/podman-system-prune.1.md
+++ b/docs/source/markdown/podman-system-prune.1.md
@@ -9,9 +9,9 @@ podman\-system\-prune - Remove all unused container, image and volume data
 ## DESCRIPTION
 **podman system prune** removes all unused containers (both dangling and unreferenced), pods and optionally, volumes from local storage.
 
-With the `all` option, you can delete all unused images.  Unused images are dangling images as well as any image that does not have any containers based on it.
+With the **--all** option, you can delete all unused images.  Unused images are dangling images as well as any image that does not have any containers based on it.
 
-By default, volumes are not removed to prevent important data from being deleted if there is currently no container using the volume. Use the --volumes flag when running the command to prune volumes as well.
+By default, volumes are not removed to prevent important data from being deleted if there is currently no container using the volume. Use the **--volumes** flag when running the command to prune volumes as well.
 
 ## OPTIONS
 **--all**, **-a**
@@ -28,7 +28,7 @@ Print usage statement
 
 **--volumes**
 
-Prune volumes not used by at least one container
+Prune volumes currently unused by any container
 
 ## SEE ALSO
 podman(1), podman-image-prune(1), podman-container-prune(1), podman-pod-prune(1), podman-volume-prune(1)
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md
index 6e0eff045..acb546ddd 100644
--- a/docs/source/markdown/podman.1.md
+++ b/docs/source/markdown/podman.1.md
@@ -126,27 +126,27 @@ 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,
 the exit codes follow the `chroot` standard, see below:
 
-**_125_** if the error is with podman **_itself_**
+  **125** The error is with podman **_itself_**
 
     $ podman run --foo busybox; echo $?
     Error: unknown flag: --foo
-      125
+    125
 
-**_126_** if executing a **_contained command_** and the **_command_** cannot be invoked
+  **126** Executing a _contained command_ and the _command_ cannot be invoked
 
     $ podman run busybox /etc; echo $?
     Error: container_linux.go:346: starting container process caused "exec: \"/etc\": permission denied": OCI runtime error
-      126
+    126
 
-**_127_** if executing a **_contained command_** and the **_command_** cannot be found
+  **127** Executing a _contained command_ and the _command_ cannot be found
     $ podman run busybox foo; echo $?
     Error: container_linux.go:346: starting container process caused "exec: \"foo\": executable file not found in $PATH": OCI runtime error
-      127
+    127
 
-**_Exit code_** of **_contained command_** otherwise
+  **Exit code** _contained command_ exit code
 
-    $ podman run busybox /bin/sh -c 'exit 3'
-    # 3
+    $ podman run busybox /bin/sh -c 'exit 3'; echo $?
+    3
 
 
 ## COMMANDS
diff --git a/docs/source/network.rst b/docs/source/network.rst
index d96e00a7d..e7848c90e 100644
--- a/docs/source/network.rst
+++ b/docs/source/network.rst
@@ -1,5 +1,5 @@
 Network
-=====
+=======
 
 :doc:`create <markdown/podman-network-create.1>` network create