6 files changed, 24 insertions, 22 deletions
diff --git a/docs/source/markdown/options/device.md b/docs/source/markdown/options/device.md
index 619c70a9b..bd6d7f9d9 100644
--- a/docs/source/markdown/options/device.md
+++ b/docs/source/markdown/options/device.md
@@ -12,3 +12,11 @@ The <<container|pod>> will only store the major and minor numbers of the host de
 Podman may load kernel modules required for using the specified
 device. The devices that Podman will load modules for when necessary are:
 /dev/fuse.
+
+In rootless mode, the new device is bind mounted in the container from the host
+rather than Podman creating it within the container space. Because the bind
+mount retains its SELinux label on SELinux systems, the container can get
+permission denied when accessing the mounted device. Modify SELinux settings to
+allow containers to use all device labels via the following command:
+
+$ sudo setsebool -P  container_use_devices=true
diff --git a/docs/source/markdown/options/env-file.md b/docs/source/markdown/options/env-file.md
new file mode 100644
index 000000000..f08dc09f0
--- /dev/null
+++ b/docs/source/markdown/options/env-file.md
@@ -0,0 +1,3 @@
+#### **--env-file**=*file*
+
+Read in a line-delimited file of environment variables.
diff --git a/docs/source/markdown/options/env.md b/docs/source/markdown/options/env.md
new file mode 100644
index 000000000..ace25138e
--- /dev/null
+++ b/docs/source/markdown/options/env.md
@@ -0,0 +1,5 @@
+#### **--env**, **-e**=*env*
+
+Set environment variables.
+
+This option allows arbitrary environment variables that are available for the process to be launched inside of the container. If an environment variable is specified without a value, Podman will check the host environment for a value and set the variable only if it is set on the host. As a special case, if an environment variable ending in __*__ is specified without a value, Podman will search the host environment for variables starting with the prefix and will add those variables to the container.
diff --git a/docs/source/markdown/podman-create.1.md.in b/docs/source/markdown/podman-create.1.md.in
index 742a32b5a..351124dc4 100644
--- a/docs/source/markdown/podman-create.1.md.in
+++ b/docs/source/markdown/podman-create.1.md.in
@@ -151,17 +151,13 @@ This option cannot be combined with **--network** that is set to **none** or **c
 
 @@option entrypoint
 
-#### **--env**, **-e**=*env*
-
-Set environment variables
-
-This option allows arbitrary environment variables that are available for the process to be launched inside of the container. If an environment variable is specified without a value, Podman will check the host environment for a value and set the variable only if it is set on the host. As a special case, if an environment variable ending in __*__ is specified without a value, Podman will search the host environment for variables starting with the prefix and will add those variables to the container.
+@@option env
 
 See [**Environment**](#environment) note below for precedence and examples.
 
-#### **--env-file**=*file*
+@@option env-file
 
-Read in a line delimited file of environment variables. See **Environment** note below for precedence.
+See [**Environment**](#environment) note below for precedence and examples.
 
 @@option env-host
 
diff --git a/docs/source/markdown/podman-exec.1.md.in b/docs/source/markdown/podman-exec.1.md.in
index 8198c319e..0479f2ee4 100644
--- a/docs/source/markdown/podman-exec.1.md.in
+++ b/docs/source/markdown/podman-exec.1.md.in
@@ -21,15 +21,9 @@ Start the exec session, but do not attach to it. The command will run in the bac
 
 Specify the key sequence for detaching a container. Format is a single character `[a-Z]` or one or more `ctrl-<value>` characters where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`. Specifying "" will disable this feature. The default is *ctrl-p,ctrl-q*.
 
-#### **--env**, **-e**=*env*
+@@option env
 
-Set environment variables.
-
-This option allows arbitrary environment variables that are available for the process to be launched inside of the container. If an environment variable is specified without a value, Podman will check the host environment for a value and set the variable only if it is set on the host. As a special case, if an environment variable ending in __*__ is specified without a value, Podman will search the host environment for variables starting with the prefix and will add those variables to the container.
-
-#### **--env-file**=*file*
-
-Read in a line delimited file of environment variables.
+@@option env-file
 
 @@option interactive
 
diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in
index 1259f0e37..95ee595d9 100644
--- a/docs/source/markdown/podman-run.1.md.in
+++ b/docs/source/markdown/podman-run.1.md.in
@@ -187,17 +187,13 @@ This option cannot be combined with **--network** that is set to **none** or **c
 
 @@option entrypoint
 
-#### **--env**, **-e**=*env*
-
-Set environment variables.
-
-This option allows arbitrary environment variables that are available for the process to be launched inside of the container. If an environment variable is specified without a value, Podman will check the host environment for a value and set the variable only if it is set on the host. As a special case, if an environment variable ending in __*__ is specified without a value, Podman will search the host environment for variables starting with the prefix and will add those variables to the container.
+@@option env
 
 See [**Environment**](#environment) note below for precedence and examples.
 
-#### **--env-file**=*file*
+@@option env-file
 
-Read in a line delimited file of environment variables. See **Environment** note below for precedence.
+See [**Environment**](#environment) note below for precedence and examples.
 
 @@option env-host