X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-ask-password.xml;h=805827efc30ae6e5a92e098fe6d291ee5ac0a460;hp=50aec3403ae4dcbf70ba0f99455007d5a6e9d382;hb=dfdebb1b925332352966804303b2516a6506a429;hpb=7f434cf4c9a72c3291a8603a3e91dd66dde4d640

diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 50aec3403..805827efc 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -8,20 +8,21 @@
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-ask-password">
+<refentry id="systemd-ask-password"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
         <refentryinfo>
                 <title>systemd-ask-password</title>
@@ -60,7 +61,7 @@
                 used to query a system password or passphrase from the
                 user, using a question message specified on the
                 command line. When run from a TTY it will query a
-                password on the TTY and print it to STDOUT. When run
+                password on the TTY and print it to standard output. When run
                 with no TTY or with <option>--no-tty</option> it will
                 query the password system-wide and allow active users
                 to respond via several agents. The latter is
@@ -90,7 +91,7 @@
                 url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">systemd
                 Password Agent Specification</ulink>.</para>
 
-                <para>If a password is queried on a tty the user may
+                <para>If a password is queried on a TTY, the user may
                 press TAB to hide the asterisks normally shown for
                 each character typed. Pressing Backspace as first key
                 achieves the same effect.</para>
@@ -103,19 +104,11 @@
                 <para>The following options are understood:</para>
 
                 <variablelist>
-                        <varlistentry>
-                                <term><option>--h</option></term>
-                                <term><option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
                         <varlistentry>
                                 <term><option>--icon=</option></term>
 
                                 <listitem><para>Specify an icon name
-                                alongside the pasword query, which may
+                                alongside the password query, which may
                                 be used in all agents supporting
                                 graphical display. The icon name
                                 should follow the <ulink
@@ -129,7 +122,8 @@
 
                                 <listitem><para>Specify the query
                                 timeout in seconds. Defaults to
-                                3min.</para></listitem>
+                                90s. A timeout of 0 waits indefinitely.
+                                </para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -144,7 +138,7 @@
                         <varlistentry>
                                 <term><option>--accept-cached</option></term>
 
-                                <listitem><para>If passed accept
+                                <listitem><para>If passed, accept
                                 cached passwords, i.e. passwords
                                 previously typed in.</para></listitem>
                         </varlistentry>
@@ -159,6 +153,8 @@
                                 output one password per
                                 line.</para></listitem>
                         </varlistentry>
+
+                        <xi:include href="standard-options.xml" xpointer="help" />
                 </variablelist>
 
         </refsect1>
@@ -166,7 +162,7 @@
         <refsect1>
                 <title>Exit status</title>
 
-                <para>On success 0 is returned, a non-zero failure
+                <para>On success, 0 is returned, a non-zero failure
                 code otherwise.</para>
         </refsect1>