X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-ask-password.xml;h=448df621005bb7693a422549b1dcf28fa673f40c;hp=563f9d5d61cdd0cb3a9d43557730f7311fe97e0e;hb=bf3d3e2bb7ae2d3854be57f28dd1403c8f7e4c3c;hpb=c93350728e822c3da7522664cf0a0e0ee10509fa

diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 563f9d5d6..448df6210 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -21,7 +21,8 @@
   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
@@ -77,7 +78,7 @@
                 asking the user for passwords using Plymouth; a
                 boot-time password agent querying the user directly on
                 the console; an agent requesting password input via a
-                <citerefentry><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <citerefentry project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 message; an agent suitable for running in a GNOME
                 session; a command line agent which can be started
                 temporarily to process queued password requests; a TTY
@@ -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,14 +104,6 @@
                 <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>
 
@@ -133,6 +126,17 @@
                                 </para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--echo</option></term>
+
+                                <listitem><para>Echo the user input
+                                instead of masking it. This is useful
+                                when using
+                                <filename>systemd-ask-password</filename>
+                                to query for usernames.
+                                </para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>--no-tty</option></term>
 
@@ -145,7 +149,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>
@@ -160,6 +164,8 @@
                                 output one password per
                                 line.</para></listitem>
                         </varlistentry>
+
+                        <xi:include href="standard-options.xml" xpointer="help" />
                 </variablelist>
 
         </refsect1>
@@ -167,7 +173,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>
 
@@ -176,8 +182,8 @@
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>plymouth</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                        <citerefentry project='die-net'><refentrytitle>plymouth</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                        <citerefentry project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 </para>
         </refsect1>