summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2014-07-29 15:18:27 +0200
committerKay Sievers <kay@vrfy.org>2014-07-29 15:18:27 +0200
commitdd5eddd28a74a49607a8fffcaf960040dba98479 (patch)
treec2f6f64a9db3c6a2223d119faffae48a1f998d5b /man
parent9719859c07aa13539ed2cd4b31972cd30f678543 (diff)
udev: unify event timeout handling
Diffstat (limited to 'man')
-rw-r--r--man/systemd-udevd.service.xml7
-rw-r--r--man/udev.xml7
2 files changed, 3 insertions, 11 deletions
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 8de43b1fd9..3053dc722f 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -99,9 +99,8 @@
<varlistentry>
<term><option>--event-timeout=</option></term>
<listitem>
- <para>Wait for the event to finish up to the given
- number of seconds. After this time the event will
- be terminated. Default is 30.</para>
+ <para>Set the number of seconds to wait for events to finish. After
+ this time the event will be terminated. The default is 30 seconds.</para>
</listitem>
</varlistentry>
@@ -171,7 +170,7 @@
<listitem>
<para>Wait for events to finish up to the given number
of seconds. This option might be useful if events are
- terminated due to a timeout in large configurations.</para>
+ terminated due to kernel drivers taking too long to initialize.</para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/man/udev.xml b/man/udev.xml
index 4e5f8f00aa..123c073492 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -516,13 +516,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><option>event_timeout=</option></term>
- <listitem>
- <para>Number of seconds an event waits for operations to finish before
- giving up and terminating itself.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term><option>string_escape=<replaceable>none|replace</replaceable></option></term>
<listitem>
<para>Usually control and other possibly unsafe characters are replaced