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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-22 21:42:48 +0000 (Tue, 22 Jan 2008)
New Revision: 1730

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/grpck.8.xml
Log:
* man/grpck.8.xml: Conditionally include the parts mentioning the
  gshadow file (based on SHADOWGRP).
* man/grpck.8.xml: Add reference to the gshadow(5) manpage
 (conditionally included).


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-22 21:15:58 UTC (rev 1729)
+++ upstream/trunk/ChangeLog	2008-01-22 21:42:48 UTC (rev 1730)
@@ -2,6 +2,10 @@
 
 	* man/grpck.8.xml: Fix typo. Remove "the" from "All entries in the
 	<filename></filename> are checked [...]"
+	* man/grpck.8.xml: Conditionally include the parts mentioning the
+	gshadow file (based on SHADOWGRP).
+	* man/grpck.8.xml: Add reference to the gshadow(5) manpage
+	(conditionally included).
 
 2008-01-22  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/man/grpck.8.xml
===================================================================
--- upstream/trunk/man/grpck.8.xml	2008-01-22 21:15:58 UTC (rev 1729)
+++ upstream/trunk/man/grpck.8.xml	2008-01-22 21:42:48 UTC (rev 1730)
@@ -41,7 +41,8 @@
     <para>
       The <command>grpck</command> command verifies the integrity of the
       system authentication information. All entries in
-      <filename>/etc/group</filename> and <filename>/etc/gshadow</filename>
+      <filename>/etc/group</filename> <phrase condition="gshadow">and
+      <filename>/etc/gshadow</filename></phrase>
       are checked to see that the entry has the proper format and valid data
       in each field. The user is prompted to delete entries that are
       improperly formatted or which have other uncorrectable errors.
@@ -100,18 +101,23 @@
 	<term><option>-s</option></term>
 	<listitem>
 	  <para>
-	    Sort entries in <filename>/etc/group</filename> and
-	    <filename>/etc/gshadow</filename> by GID.
+	    Sort entries in <filename>/etc/group</filename>
+	    <phrase condition="gshadow">and
+	    <filename>/etc/gshadow</filename></phrase>
+	    by GID.
 	  </para>
 	</listitem>
       </varlistentry>
     </variablelist>
     <para>
-      By default, <command>grpck</command> operates on the files
-      <filename>/etc/group</filename> and <filename>/etc/gshadow</filename>. 
+      By default, <command>grpck</command> operates on
+      <filename>/etc/group</filename><phrase condition="gshadow"> and
+      <filename>/etc/gshadow</filename></phrase>.
       The user may select alternate files with the <emphasis
-      remap='I'>group</emphasis> and <emphasis remap='I'>shadow</emphasis>
-      parameters.
+      remap='I'>group</emphasis>
+      <phrase condition="no_gshadow">parameter.</phrase>
+      <phrase condition="gshadow">and <emphasis remap='I'>shadow</emphasis>
+      parameters.</phrase>
     </para>
   </refsect1>
 
@@ -136,7 +142,7 @@
 	  <para>Group account information.</para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="gshadow">
 	<term><filename>/etc/gshadow</filename></term>
 	<listitem>
 	  <para>Secure group account information.</para>
@@ -157,6 +163,9 @@
       <citerefentry>
 	<refentrytitle>group</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
+      <citerefentry condition="gshadow">
+	<refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>,
+      </citerefentry>
       <citerefentry>
 	<refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,