[svn-upgrade] Integrating new upstream version, shadow (4.0.18)

man/chsh.1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <refentry id='chsh.1'>
-  <!-- $Id: chsh.1.xml,v 1.21 2006/05/20 12:11:38 kloczek Exp $ -->
+  <!-- $Id: chsh.1.xml,v 1.22 2006/07/14 16:32:02 kloczek Exp $ -->
   <refmeta>
     <refentrytitle>chsh</refentrytitle>
     <manvolnum>1</manvolnum>
@@ -14,8 +14,11 @@
   <refsynopsisdiv id='synopsis'>
     <cmdsynopsis>
       <command>chsh</command>
-      <arg choice='opt'>-s <replaceable>login_shell</replaceable></arg>
-      <arg choice='opt'><replaceable>user</replaceable>
+      <arg choice='opt'>
+	<replaceable>options</replaceable>
+      </arg>
+      <arg choice='opt'>
+        <replaceable>LOGIN</replaceable>
       </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -29,6 +32,43 @@
       the login shell for any account.
     </para>
 
+  </refsect1>
+
+  <refsect1 id='options'>
+    <title>OPTIONS</title>
+    <para>
+      The options which apply to the <command>chsh</command> command are:
+    </para>
+    <variablelist remap='IP'>
+      <varlistentry>
+	<term><option>-h</option>, <option>--help</option></term>
+	<listitem>
+	  <para>Display help message and exit.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term>
+	  <option>-s</option>, <option>--shell</option> <replaceable>SHELL</replaceable>
+	</term>
+        <listitem>                                                                                                                   
+	  <para>
+	    The name of the user's new login shell. Setting this field to
+	    blank causes the system to select the default login shell.
+	  </para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+    <para>
+      If the <option>-s</option> option is not selected,
+      <command>chsh</command> operates in an interactive fashion, prompting
+      the user with the current login shell. Enter the new value to change
+      the shell, or leave the line blank to use the current one. The current
+      shell is displayed between a pair of <emphasis>[ ]</emphasis> marks.
+    </para>
+  </refsect1>
+
+  <refsect1 id='note'>
+    <title>NOTE</title>
     <para>
       The only restriction placed on the login shell is that the command
       name must be listed in <filename>/etc/shells</filename>, unless the
@@ -41,17 +81,6 @@
     </para>
   </refsect1>
 
-  <refsect1 id='options'>
-    <title>OPTIONS</title>
-    <para>
-      If the <option>-s</option> option is not selected,
-      <command>chsh</command> operates in an interactive fashion, prompting
-      the user with the current login shell. Enter the new value to change
-      the shell, or leave the line blank to use the current one. The current
-      shell is displayed between a pair of <emphasis>[ ]</emphasis> marks.
-    </para>
-  </refsect1>
-
   <refsect1 id='files'>
     <title>FILES</title>
     <variablelist>