8 files changed, 58 insertions, 54 deletions
diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md
index 6c8f239a6..fac8296ad 100644
--- a/docs/source/markdown/podman-build.1.md
+++ b/docs/source/markdown/podman-build.1.md
@@ -176,6 +176,10 @@ value can be entered.  The password is entered without echo.
 
 Add a host device to the container. The format is `<device-on-host>[:<device-on-container>][:<permissions>]` (e.g. --device=/dev/sdc:/dev/xvdc:rwm)
 
+Note: if the user only has access rights via a group then accessing the device
+from inside a rootless container will fail. The `crun` runtime offers a
+workaround for this by adding the option `--annotation io.crun.keep_original_groups=1`.
+
 **--disable-compression, -D**
 
 Don't compress filesystem layers when building the image unless it is required
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md
index 82d2e8f6a..85aa81553 100644
--- a/docs/source/markdown/podman-create.1.md
+++ b/docs/source/markdown/podman-create.1.md
@@ -204,6 +204,10 @@ Specify the key sequence for detaching a container. Format is a single character
 
 Add a host device to the container. The format is `<device-on-host>[:<device-on-container>][:<permissions>]` (e.g. --device=/dev/sdc:/dev/xvdc:rwm)
 
+Note: if the user only has access rights via a group then accessing the device
+from inside a rootless container will fail. The `crun` runtime offers a
+workaround for this by adding the option `--annotation io.crun.keep_original_groups=1`.
+
 **--device-read-bps**=*path*
 
 Limit read rate (bytes per second) from a device (e.g. --device-read-bps=/dev/sda:1mb)
diff --git a/docs/source/markdown/podman-exec.1.md b/docs/source/markdown/podman-exec.1.md
index 9624425dc..d46427c91 100644
--- a/docs/source/markdown/podman-exec.1.md
+++ b/docs/source/markdown/podman-exec.1.md
@@ -22,6 +22,10 @@ Specify the key sequence for detaching a container. Format is a single character
 You may specify arbitrary environment variables that are available for the
 command to be executed.
 
+**--env-file**=*file*
+
+Read in a line delimited file of environment variables.
+
 **--interactive**, **-i**=*true|false*
 
 When set to true, keep stdin open even if not attached. The default is *false*.
diff --git a/docs/source/markdown/podman-info.1.md b/docs/source/markdown/podman-info.1.md
index 9721755ef..b539f1d3c 100644
--- a/docs/source/markdown/podman-info.1.md
+++ b/docs/source/markdown/podman-info.1.md
@@ -53,13 +53,26 @@ host:
   os: linux
   uptime: 218h 49m 33.66s (Approximately 9.08 days)
 registries:
-  blocked: null
-  insecure: null
-  search:
-  - quay.io
-  - registry.fedoraproject.org
-  - docker.io
-  - registry.redhat.io
+  docker.io:
+    Blocked: true
+    Insecure: true
+    Location: docker.io
+    MirrorByDigestOnly: false
+    Mirrors:
+    - Insecure: true
+      Location: example2.io/example/ubi8-minimal
+    Prefix: docker.io
+  redhat.com:
+    Blocked: false
+    Insecure: false
+    Location: registry.access.redhat.com/ubi8
+    MirrorByDigestOnly: true
+    Mirrors:
+    - Insecure: false
+      Location: example.io/example/ubi8-minimal
+    - Insecure: true
+      Location: example3.io/example/ubi8-minimal
+    Prefix: redhat.com
 store:
   ConfigFile: /etc/containers/storage.conf
   ContainerStore:
diff --git a/docs/source/markdown/podman-network-create.1.md b/docs/source/markdown/podman-network-create.1.md
index c281d50d9..2eca93adb 100644
--- a/docs/source/markdown/podman-network-create.1.md
+++ b/docs/source/markdown/podman-network-create.1.md
@@ -7,8 +7,10 @@ podman\-network-create - Create a Podman CNI network
 **podman network create**  [*options*] name
 
 ## DESCRIPTION
-Create a CNI-network configuration for use with Podman. At the time of this writing, the only network
-type that can be created is a *bridge* network.
+Create a CNI-network configuration for use with Podman. By default, Podman creates a bridge connection. A
+*Macvlan* connection can be created with the *macvlan* option. In the case of *Macvlan* connections, the
+CNI *dhcp* plugin needs to be activated or the container image must have a DHCP client to interact
+with the host network's DHCP server.
 
 If no options are provided, Podman will assign a free subnet and name for your network.
 
@@ -38,6 +40,11 @@ Restrict external access of this network
 Allocate container IP from a range.  The range must be a complete subnet and in CIDR notation.  The *ip-range* option
 must be used with a *subnet* option.
 
+**--macvlan**
+
+Create a *Macvlan* based connection rather than a classic bridge.  You must pass an interface name from the host for the
+Macvlan connection.
+
 **--subnet**
 
 The subnet in CIDR notation.
@@ -68,6 +75,12 @@ Create a network that uses a *192.168.55.0/24** subnet and has an IP address ran
 /etc/cni/net.d/cni-podman-5.conflist
 ```
 
+Create a Macvlan based network using the host interface eth0
+```
+# podman network create --macvlan eth0 newnet
+/etc/cni/net.d/newnet.conflist
+```
+
 ## SEE ALSO
 podman(1), podman-network(1), podman-network-inspect(1)
 
diff --git a/docs/source/markdown/podman-pod-top.1.md b/docs/source/markdown/podman-pod-top.1.md
index 48f10055a..6a1fa8c42 100644
--- a/docs/source/markdown/podman-pod-top.1.md
+++ b/docs/source/markdown/podman-pod-top.1.md
@@ -23,53 +23,11 @@ The latest option is not supported on the remote client.
 
 ## FORMAT DESCRIPTORS
 
-The following descriptors are supported in addition to the AIX format descriptors mentioned in ps (1):
-
-**args**, **capbnd**, **capeff**, **capinh**, **capprm**, **comm**, **etime**, **group**, **hgroup**, **hpid**, **huser**, **label**, **nice**, **pcpu**, **pgid**, **pid**, **ppid**, **rgroup**, **ruser**, **seccomp**, **state**, **time**, **tty**, **user**, **vsz**
-
-**capbnd**
-
-  Set of bounding capabilities. See capabilities (7) for more information.
-
-**capeff**
-
-  Set of effective capabilities. See capabilities (7) for more information.
-
-**capinh**
-
-  Set of inheritable capabilities. See capabilities (7) for more information.
-
-**capprm**
-
-  Set of permitted capabilities. See capabilities (7) for more information.
-
-**hgroup**
-
-  The corresponding effective group of a container process on the host.
-
-**hpid**
-
-  The corresponding host PID of a container process.
-
-**huser**
-
-  The corresponding effective user of a container process on the host.
-
-**label**
-
-  Current security attributes of the process.
-
-**seccomp**
-
-  Seccomp mode of the process (i.e., disabled, strict or filter). See seccomp (2) for more information.
-
-**state**
-
-  Process state codes (e.g, **R** for *running*, **S** for *sleeping*). See proc(5) for more information.
+Please refer to podman-top(1) for a full list of available descriptors.
 
 ## EXAMPLES
 
-By default, `podman-top` prints data similar to `ps -ef`:
+By default, `podman-pod-top` prints data similar to `ps -ef`:
 
 ```
 $ podman pod top b031293491cc
@@ -88,7 +46,7 @@ PID   SECCOMP   COMMAND   %CPU
 ```
 
 ## SEE ALSO
-podman-pod(1), ps(1), seccomp(2), proc(5), capabilities(7)
+podman-pod(1), podman-top(1), ps(1), seccomp(2), proc(5), capabilities(7)
 
 ## HISTORY
 August 2018, Originally compiled by Peter Hunt <pehunt@redhat.com>
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index e1177cb34..e8744de35 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -210,6 +210,10 @@ Specify the key sequence for detaching a container. Format is a single character
 
 Add a host device to the container. The format is `<device-on-host>[:<device-on-container>][:<permissions>]` (e.g. --device=/dev/sdc:/dev/xvdc:rwm)
 
+Note: if the user only has access rights via a group then accessing the device
+from inside a rootless container will fail. The `crun` runtime offers a
+workaround for this by adding the option `--annotation io.crun.keep_original_groups=1`.
+
 **--device-read-bps**=*path*
 
 Limit read rate (bytes per second) from a device (e.g. --device-read-bps=/dev/sda:1mb)
diff --git a/docs/source/markdown/podman-top.1.md b/docs/source/markdown/podman-top.1.md
index 1410aa651..6a04ab91a 100644
--- a/docs/source/markdown/podman-top.1.md
+++ b/docs/source/markdown/podman-top.1.md
@@ -70,6 +70,10 @@ The following descriptors are supported in addition to the AIX format descriptor
 
   Process state codes (e.g, **R** for *running*, **S** for *sleeping*). See proc(5) for more information.
 
+**stime**
+
+  Process start time (e.g, "2019-12-09 10:50:36 +0100 CET).
+
 ## EXAMPLES
 
 By default, `podman-top` prints data similar to `ps -ef`: