New upstream version 4.9upstream/4.9

1 files changed, 9 insertions, 3 deletions

diff --git a/man/newuidmap.1.xml b/man/newuidmap.1.xml
index faa2373d..09e65d80 100644
--- a/man/newuidmap.1.xml
+++ b/man/newuidmap.1.xml
@@ -87,8 +87,14 @@
   <refsect1 id='description'>
     <title>DESCRIPTION</title>
     <para>
-      The <command>newuidmap</command> sets <filename>/proc/[pid]/uid_map</filename> based on its
-      command line arguments and the uids allowed in <filename>/etc/subuid</filename>.
+      The <command>newuidmap</command> sets <filename>/proc/[pid]/uid_map</filename>
+      based on its command line arguments and the uids allowed. Subuid
+      delegation can either be managed via <filename>/etc/subuid</filename> or
+      through the configured NSS subid module. These options are mutually
+      exclusive.
+    </para>
+
+    <para>
       Note that the root user is not exempted from the requirement for a valid
       <filename>/etc/subuid</filename> entry.
     </para>
@@ -127,7 +133,7 @@
       <command>newuidmap</command> verifies that the caller is the owner
       of the process indicated by <option>pid</option> and that for each
       of the above sets, each of the UIDs in the range [loweruid,
-      loweruid+count] is allowed to the caller according to
+      loweruid+count) is allowed to the caller according to
       <filename>/etc/subuid</filename> before setting
       <filename>/proc/[pid]/uid_map</filename>.
     </para>