From 461d69522f686711ef1d42a910bc4404081609b3 Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Mon, 19 May 2008 20:53:12 +0000
Subject: [PATCH] 	* NEWS, man/groupadd.8.xml: Document the -r, --system
 option. 	* NEWS, man/newusers.8.xml: Document the -r, --system option. 
 * NEWS, man/newusers.8.xml: Document the -c, --crypt-method and 	-s,
 --sha-rounds options.

---
 ChangeLog          |  4 +++
 NEWS               |  5 +++-
 man/groupadd.8.xml | 16 ++++++++++++
 man/newusers.8.xml | 62 ++++++++++++++++++++++++++++++++++++++++++++++
 man/useradd.8.xml  |  5 ++--
 5 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ecfa1510..4b01f1c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 2008-05-19  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* NEWS, man/useradd.8.xml: Document the -r, --system option.
+	* NEWS, man/groupadd.8.xml: Document the -r, --system option.
+	* NEWS, man/newusers.8.xml: Document the -r, --system option.
+	* NEWS, man/newusers.8.xml: Document the -c, --crypt-method and
+	-s, --sha-rounds options.
 
 2008-05-18  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/NEWS b/NEWS
index f0e78535..db1ee125 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,10 @@ shadow-4.1.1 -> shadow-4.1.2						UNRELEASED
   * Resume properly after ^Z.
 
 *** documentation:
-- Document the -r, --system option in the useradd manpage.
+- Document the -r, --system option in the useradd, groupadd, and newusers
+  manpages.
+- Document the -c, --crypt-method and -s, --sha-rounds options in the
+  newusers manpage.
 
 shadow-4.1.0 -> shadow-4.1.1						02-04-2008
 
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index cc295838..92b335ce 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -126,6 +126,22 @@
 	  </para>
 	</listitem>
       </varlistentry>
+      <varlistentry>
+	<term>
+	  <option>-r</option>, <option>--system</option>
+	</term>
+	<listitem>
+	  <para>
+	    Create a system group.
+	  </para>
+	  <para>
+	    The numeric identifiers of new system groups are choosen in
+	    the <option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option>
+	    range, defined in <filename>login.defs</filename>, instead of
+	    <option>GID_MIN</option>-<option>GID_MAX</option>.
+	  </para>
+	</listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
diff --git a/man/newusers.8.xml b/man/newusers.8.xml
index afc608ea..5b7486c8 100644
--- a/man/newusers.8.xml
+++ b/man/newusers.8.xml
@@ -94,6 +94,68 @@
     </para>
   </refsect1>
 
+  <refsect1 id='options'>
+    <title>OPTIONS</title>
+    <para>The options which apply to the <command>newusers</command> command are:
+    </para>
+    <variablelist remap='IP'>
+      <varlistentry>
+	<term><option>-c</option>, <option>--crypt-method</option></term>
+	<listitem>
+	  <para>Use the specified method to encrypt the passwords.</para>
+	  <para>
+	    The available methods are DES, MD5, NONE, and SHA256 or SHA512
+	    if your libc support these methods.
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term>
+	  <option>-r</option>, <option>--system</option>
+	</term>
+	<listitem>
+	  <para>
+	    Create a system account.
+	  </para>
+	  <para>
+	    System users will be created with no aging information in
+	    <filename>/etc/shadow</filename>, and their numeric
+	    identifiers are choosen in the
+	    <option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option>
+	    range, defined in <filename>login.defs</filename>, instead of
+	    <option>UID_MIN</option>-<option>UID_MAX</option> (and their
+	    <option>GID</option> counterparts for the creation of groups).
+	  </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry condition="sha_crypt">
+	<term><option>-s</option>, <option>--sha-rounds</option></term>
+	<listitem>
+	  <para>
+	    Use the specified number of rounds to encrypt the passwords.
+	  </para>
+	  <para>
+	    The value 0 means that the system will choose the default
+	    number of rounds for the crypt method (5000).
+	  </para>
+	  <para>
+	    A minimal value of 1000 and a maximal value of 999,999,999
+	    will be enforced.
+	  </para>
+	  <para>
+	    You can only use this option with the SHA256 or SHA512
+	    crypt method.
+	  </para>
+	  <para>
+	    By default, the number of rounds is defined by the
+	    SHA_CRYPT_MIN_ROUNDS and SHA_CRYPT_MAX_ROUNDS variables in
+	    <filename>/etc/login.defs</filename>.
+	  </para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
   <refsect1 id='caveats'>
     <title>CAVEATS</title>
     <para>
diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index f82afe9f..07c66008 100644
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -291,9 +291,10 @@
 	  </para>
 	  <para>
 	    System users will be created with no aging information in
-	    <filename>/etc/shadow</filename>, and will use the
+	    <filename>/etc/shadow</filename>, and their numeric
+	    identifiers are choosen in the
 	    <option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option>
-	    range for their user's ID instead of
+	    range, defined in <filename>login.defs</filename>, instead of
 	    <option>UID_MIN</option>-<option>UID_MAX</option> (and their
 	    <option>GID</option> counterparts for the creation of groups).
 	  </para>