pwconv.8 man page improvements

Bug-Debian: https://bugs.debian.org/1004418

diff --git a/man/pwconv.8.xml b/man/pwconv.8.xml
index cb712fb6a8c4d9df64924230861a3c1e33f63d2e..c4aedef63829505b0a1cf54d727e466975ab0cea 100644 (file)
--- a/man/pwconv.8.xml
+++ b/man/pwconv.8.xml
@@ -47,7 +47,7 @@
     <refname>pwunconv</refname>
     <refname>grpconv</refname>
     <refname>grpunconv</refname>
-    <refpurpose>convert to and from shadow passwords and groups</refpurpose>
+    <refpurpose>convert between the system's shadowed and plain account files</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv id='synopsis'>
@@ -80,9 +80,9 @@
   <refsect1 id='description'>
     <title>DESCRIPTION</title>
     <para>
-      The <command>pwconv</command> command creates <emphasis
-      remap='I'>shadow</emphasis> from <emphasis remap='I'>passwd</emphasis>
-      and an optionally existing <emphasis remap='I'>shadow</emphasis>.
+      The <command>pwconv</command> command creates <filename>
+      shadow</filename> from <filename>passwd</filename>
+      and an optionally existing <filename>shadow</filename>.
     </para>
     <para condition="tcb">
       <command>pwconv</command> does not work with
@@ -93,12 +93,12 @@
       using <command>tcb_convert</command> (and re-enable
       <option>USE_TCB</option> in <filename>login.defs</filename>.)
     </para>
-
+    
     <para>
-      The <command>pwunconv</command> command creates <emphasis
-      remap='I'>passwd</emphasis> from <emphasis remap='I'>passwd</emphasis>
-      and <emphasis remap='I'>shadow</emphasis> and then removes <emphasis
-      remap='I'>shadow</emphasis>.
+      The <command>pwunconv</command> command creates a plain
+      <filename>passwd</filename> from shadowed <filename>passwd</filename> and
+      <filename>shadow</filename> and then removes
+      <filename>shadow</filename>.
     </para>
     <para condition="tcb">
       <command>pwunconv</command> does not work with
@@ -110,16 +110,16 @@
     </para>
 
     <para>
-      The <command>grpconv</command> command creates <emphasis
-      remap='I'>gshadow</emphasis> from <emphasis remap='I'>group</emphasis>
-      and an optionally existing <emphasis remap='I'>gshadow</emphasis>.
+      The <command>grpconv</command> command creates
+      <filename>gshadow</filename> from <filename>group</filename> and
+      an optionally existing <filename>gshadow</filename>.
     </para>
 
     <para>
-      The <command>grpunconv</command> command creates <emphasis
-      remap='I'>group</emphasis> from <emphasis remap='I'>group</emphasis>
-      and <emphasis remap='I'>gshadow</emphasis> and then removes <emphasis
-      remap='I'>gshadow</emphasis>.
+      The <command>grpunconv</command> command creates plain
+      <filename>group</filename> from shadowed <filename>group</filename> and
+      <filename>gshadow</filename> and then removes
+      <filename>gshadow</filename>.
     </para>
 
     <para>
@@ -132,12 +132,12 @@
     <para>
       Each program acquires the necessary locks before conversion. 
       <command>pwconv</command> and <command>grpconv</command> are similar. 
-      First, entries in the shadowed file which don't exist in the main file
-      are removed. Then, shadowed entries which don't have `x' as the
-      password in the main file are updated. Any missing shadowed entries
-      are added. Finally, passwords in the main file are replaced with `x'. 
+      First, entries in the shadowed file which don't exist in the plain file
+      are removed. Then, entries in the shadowed file which don't have `x' 
+      as the password in plain file are updated. Any missing shadowed entries
+      are added. Finally, passwords in the plain file are replaced with `x'. 
       These programs can be used for initial conversion as well to update
-      the shadowed file if the main file is edited by hand.
+      the shadowed file if the plain file has been edited by hand.
     </para>
 
     <para>
@@ -151,8 +151,8 @@
 
     <para>
       Likewise <command>pwunconv</command> and <command>grpunconv</command>
-      are similar. Passwords in the main file are updated from the shadowed
-      file. Entries which exist in the main file but not in the shadowed
+      are similar. Passwords in the plain file are updated from the shadowed
+      file. Entries which exist in the plain file but not in the shadowed
       file are left alone. Finally, the shadowed file is removed. Some
       password aging information is lost by <command>pwunconv</command>. It
       will convert what it can.
@@ -196,7 +196,7 @@
       entries) may cause these programs to loop forever or fail in other
       strange ways. Please run <command>pwck</command> and
       <command>grpck</command> to correct any such errors before converting
-      to or from shadow passwords or groups.
+      to or from shadowed files.
     </para>
   </refsect1>