From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sat, 17 Nov 2007 18:13:17 +0000 (+0000)
Subject: Fixes from Openwall patch shadow-4.0.4.1-alt-man.diff:
X-Git-Tag: 4.1.0~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9f2f60c687ec4340469101b27d41c2448270592;p=shadow

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 f93bc50e..85deae61 100644
--- 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 b5c93e11..5b93279e 100644
--- 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 5a985220..4a6dfb23 100644
--- 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>