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.

diff --git a/ChangeLog b/ChangeLog
index f93bc50e7307fe99b417edc720dbfc48550c986f..85deae617cfed278987d1d6e8d196dc98e6b2914 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-11-17  Nicolas François  <nicolas.francois@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@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@centraliens.net>
 
        * man/chpasswd.8.xml: Document that chpasswd does not use PAM to

diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index b5c93e117a604efa19f50bde4cb689022b302b24..5b93279ef0e88a8ba990fbd44d8f727013510ba4 100644 (file)
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -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>
+       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, <command>groupadd</command> will deny the group
+       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'>

diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index 5a985220d88a418688ca534303d9a478ce30295c..4a6dfb2325df442608c9e883383a7c11e9f4836e 100644 (file)
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -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>