10 files changed, 76 insertions, 54 deletions
diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md
index fac8296ad..0f3bfa0d3 100644
--- a/docs/source/markdown/podman-build.1.md
+++ b/docs/source/markdown/podman-build.1.md
@@ -633,11 +633,11 @@ $ podman build .
 
 $ podman build -f Containerfile.simple .
 
-$ cat ~/Dockerfile | podman build -f - .
+$ cat $HOME/Dockerfile | podman build -f - .
 
 $ podman build -f Dockerfile.simple -f Containerfile.notsosimple .
 
-$ podman build -f Dockerfile.in ~
+$ podman build -f Dockerfile.in $HOME
 
 $ podman build -t imageName .
 
@@ -649,7 +649,7 @@ $ podman build --runtime-flag log-format=json .
 
 $ podman build --runtime-flag debug .
 
-$ podman build --authfile /tmp/auths/myauths.json --cert-dir ~/auth --tls-verify=true --creds=username:password -t imageName -f Dockerfile.simple .
+$ podman build --authfile /tmp/auths/myauths.json --cert-dir $HOME/auth --tls-verify=true --creds=username:password -t imageName -f Dockerfile.simple .
 
 $ podman build --memory 40m --cpu-period 10000 --cpu-quota 50000 --ulimit nofile=1024:1028 -t imageName .
 
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-pull.1.md b/docs/source/markdown/podman-pull.1.md
index de9688f5e..a22d2db42 100644
--- a/docs/source/markdown/podman-pull.1.md
+++ b/docs/source/markdown/podman-pull.1.md
@@ -69,6 +69,10 @@ The [username[:password]] to use to authenticate with the registry if required.
 If one or both values are not supplied, a command line prompt will appear and the
 value can be entered.  The password is entered without echo.
 
+**--override-arch**=ARCH
+
+Override the machine's default architecture of the image to be pulled. For example, `arm`.
+
 **--quiet**, **-q**
 
 Suppress output information when pulling images
@@ -134,6 +138,18 @@ Writing manifest to image destination
 Storing signatures
 03290064078cb797f3e0a530e78c20c13dd22a3dd3adf84a5da2127b48df0438
 ```
+
+```
+$ podman pull --override-arch=arm arm32v7/debian:stretch
+Trying to pull docker.io/arm32v7/debian:stretch...
+Getting image source signatures
+Copying blob b531ae4a3925 done
+Copying config 3cba58dad5 done
+Writing manifest to image destination
+Storing signatures
+3cba58dad5d9b35e755b48b634acb3fdd185ab1c996ac11510cc72c17780e13c
+```
+
 ## FILES
 
 **registries.conf** (`/etc/containers/registries.conf`)
diff --git a/docs/source/markdown/podman-remote.1.md b/docs/source/markdown/podman-remote.1.md
index bbc54a2a6..a7297f3f2 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
@@ -135,7 +135,7 @@ the exit codes follow the `chroot` standard, see below:
 
 ## FILES
 
-**podman-remote.conf** (`~/.config/containers/podman-remote.conf`)
+**podman-remote.conf** (`$HOME/.config/containers/podman-remote.conf`)
 
     The podman-remote.conf file is the default configuration file for the podman
     remote client.  It is in the TOML format.  It is primarily used to keep track
diff --git a/docs/source/markdown/podman-rm.1.md b/docs/source/markdown/podman-rm.1.md
index 753b2ee1c..cddf06e3e 100644
--- a/docs/source/markdown/podman-rm.1.md
+++ b/docs/source/markdown/podman-rm.1.md
@@ -87,10 +87,13 @@ $ 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 f4d946617..78ef2b157 100644
--- a/docs/source/markdown/podman-rmi.1.md
+++ b/docs/source/markdown/podman-rmi.1.md
@@ -41,10 +41,13 @@ Remove all images and containers.
 $ 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.1.md b/docs/source/markdown/podman.1.md
index 6e0eff045..fc069a7b0 100644
--- a/docs/source/markdown/podman.1.md
+++ b/docs/source/markdown/podman.1.md
@@ -108,7 +108,7 @@ Storage driver option, Default storage driver options are configured in /etc/con
 
 Output logging information to syslog as well as the console.
 
-On remote clients, logging is directed to the file ~/.config/containers/podman.log
+On remote clients, logging is directed to the file $HOME/.config/containers/podman.log
 
 **--tmpdir**
 
@@ -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
@@ -266,9 +266,9 @@ Currently the slirp4netns package is required to be installed to create a networ
 
 ### **NOTE:** Unsupported file systems in rootless mode
 
-The Overlay file system (OverlayFS) is not supported in rootless mode.  The fuse-overlayfs package is a tool that provides the functionality of OverlayFS in user namespace that allows mounting file systems in rootless environments.  It is recommended to install the fuse-overlayfs package and to enable it by adding `mount_program = "/usr/bin/fuse-overlayfs"` under `[storage.options]` in the `~/.config/containers/storage.conf` file.
+The Overlay file system (OverlayFS) is not supported in rootless mode.  The fuse-overlayfs package is a tool that provides the functionality of OverlayFS in user namespace that allows mounting file systems in rootless environments.  It is recommended to install the fuse-overlayfs package and to enable it by adding `mount_program = "/usr/bin/fuse-overlayfs"` under `[storage.options]` in the `$HOME/.config/containers/storage.conf` file.
 
-The Network File System (NFS) and other distributed file systems (for example: Lustre, Spectrum Scale, the General Parallel File System (GPFS)) are not supported when running in rootless mode as these file systems do not understand user namespace.  However, rootless Podman can make use of an NFS Homedir by modifying the `~/.config/containers/storage.conf` to have the `graphroot` option point to a directory stored on local (Non NFS) storage.
+The Network File System (NFS) and other distributed file systems (for example: Lustre, Spectrum Scale, the General Parallel File System (GPFS)) are not supported when running in rootless mode as these file systems do not understand user namespace.  However, rootless Podman can make use of an NFS Homedir by modifying the `$HOME/.config/containers/storage.conf` to have the `graphroot` option point to a directory stored on local (Non NFS) storage.
 
 For more information, please refer to the [Podman Troubleshooting Page](https://github.com/containers/libpod/blob/master/troubleshooting.md).
 
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