[Pkg-shadow-commits] r1379 - in upstream/trunk: . man

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-17 18:13:17 +0000 (Sat, 17 Nov 2007)
New Revision: 1379

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/groupadd.8.xml
   upstream/trunk/man/useradd.8.xml
Log:
Fixes from Openwall patch shadow-4.0.4.1-alt-man.diff:
 * man/useradd.8.xml: Indicate that the NIS caveats is also valid
   for any external database as LDAP.
 * man/groupadd.8.xml: Likewise.
 * man/groupadd.8.xml: Reorder and reformat the caveats bullets.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-17 17:47:02 UTC (rev 1378)
+++ upstream/trunk/ChangeLog	2007-11-17 18:13:17 UTC (rev 1379)
@@ -1,5 +1,21 @@
 2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
 
+	Fixes from Openwall patch shadow-4.0.4.1-alt-man.diff:
+	* man/useradd.8.xml: Indicate that the NIS caveats is also valid
+	for any external database as LDAP.
+	* man/groupadd.8.xml: Likewise.
+	* man/groupadd.8.xml: Reorder and reformat the caveats bullets.
+
+2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* NEWS: Applied Debian patch 409_man_generate_from_PO to
+	automatically generate the translated manpages from the POs.
+	* man/Makefile.am: Replace the individual rules for the generation
+	of the manpages (from XML) by a generic Makefile rule an
+	dependencies for the linked manpages.
+
+2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* man/chpasswd.8.xml: Document that chpasswd does not use PAM to
 	update the passwords. This fixes http://bugs.debian.org/396726.
 	Debian patch 411_chpasswd_document_no_pam.

Modified: upstream/trunk/man/groupadd.8.xml
===================================================================
--- upstream/trunk/man/groupadd.8.xml	2007-11-17 17:47:02 UTC (rev 1378)
+++ upstream/trunk/man/groupadd.8.xml	2007-11-17 18:13:17 UTC (rev 1379)
@@ -136,16 +136,23 @@
 
    <refsect1 id='caveats'>
      <title>CAVEATS</title>
-     <para>Groupnames must begin with a lower case letter or an underscore, and 
-       only lower case letters, underscores, dashes, and dollar signs may 
-       follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]
+     <para>
+       Groupnames must begin with a lower case letter or an underscore,
+       and only lower case letters, underscores, dashes, and dollar signs
+       may follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]
      </para>
      <para>
-       If the groupname already exists in an external group database
-       such as NIS, <command>groupadd</command> will deny the group
+       Groupnames may only be up to 16 characters long.
+     </para>
+     <para>
+       You may not add a NIS or LDAP group. This must be performed on the
+       corresponding server.
+     </para>
+     <para>
+       If the groupname already exists in an external group database such
+       as NIS or LDAP, <command>groupadd</command> will deny the group
        creation request.
      </para>
-     <para>Groupnames may only be up to 16 characters long.</para>
    </refsect1>
 
   <refsect1 id='exit_values'>

Modified: upstream/trunk/man/useradd.8.xml
===================================================================
--- upstream/trunk/man/useradd.8.xml	2007-11-17 17:47:02 UTC (rev 1378)
+++ upstream/trunk/man/useradd.8.xml	2007-11-17 18:13:17 UTC (rev 1379)
@@ -350,13 +350,13 @@
   <refsect1 id='caveats'>
     <title>CAVEATS</title>
     <para>
-      You may not add a user to a NIS group. This must be performed on the
-      NIS server.
+      You may not add a user to a NIS or LDAP group. This must be
+      performed on the corresponding server.
     </para>
 
     <para>
       Similarly, if the username already exists in an external user
-      database such as NIS, <command>useradd</command> will deny
+      database such as NIS or LDAP, <command>useradd</command> will deny
       the user account creation request.
     </para>