chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use /var/run/dbus/system_bus_socket for the D-Bus socket
[elogind.git]
/
man
/
systemd-ask-password.xml
diff --git
a/man/systemd-ask-password.xml
b/man/systemd-ask-password.xml
index 7b0b9ab80930e89bbc74b11063cb8eae22506643..805827efc30ae6e5a92e098fe6d291ee5ac0a460 100644
(file)
--- 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/>.
-->
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>
<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
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
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>
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>
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>
<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>
<varlistentry>
<term><option>--icon=</option></term>
@@
-129,7
+122,8
@@
<listitem><para>Specify the query
timeout in seconds. Defaults to
<listitem><para>Specify the query
timeout in seconds. Defaults to
- 90s.</para></listitem>
+ 90s. A timeout of 0 waits indefinitely.
+ </para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>
@@
-144,7
+138,7
@@
<varlistentry>
<term><option>--accept-cached</option></term>
<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>
cached passwords, i.e. passwords
previously typed in.</para></listitem>
</varlistentry>
@@
-159,6
+153,8
@@
output one password per
line.</para></listitem>
</varlistentry>
output one password per
line.</para></listitem>
</varlistentry>
+
+ <xi:include href="standard-options.xml" xpointer="help" />
</variablelist>
</refsect1>
</variablelist>
</refsect1>
@@
-166,7
+162,7
@@
<refsect1>
<title>Exit status</title>
<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>
code otherwise.</para>
</refsect1>