chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: PORTING-DBUS1 update
[elogind.git]
/
man
/
systemd.socket.xml
diff --git
a/man/systemd.socket.xml
b/man/systemd.socket.xml
index 8c88d9f8aa37defa70ccc9e796fe8aa9bb8f8e15..d1879fa9ed917739c161f78584fc7ec538e92bde 100644
(file)
--- a/
man/systemd.socket.xml
+++ b/
man/systemd.socket.xml
@@
-213,7
+213,7
@@
traffic on any of the sockets will
trigger service activation, and all
listed sockets will be passed to the
traffic on any of the sockets will
trigger service activation, and all
listed sockets will be passed to the
- service, regardless whether there is
+ service, regardless
of
whether there is
incoming traffic on them or not. If
the empty string is assigned to any of
these options, the list of addresses
incoming traffic on them or not. If
the empty string is assigned to any of
these options, the list of addresses
@@
-225,7
+225,7
@@
it is often desirable to listen on it
before the interface it is configured
on is up and running, and even
it is often desirable to listen on it
before the interface it is configured
on is up and running, and even
- regardless whether it will be up and
+ regardless
of
whether it will be up and
running ever at all. To deal with this
it is recommended to set the
<varname>FreeBind=</varname> option
running ever at all. To deal with this
it is recommended to set the
<varname>FreeBind=</varname> option
@@
-679,8
+679,8
@@
Takes a unit-less value in seconds, or
a time span value such as "5min
20s". Pass 0 to disable the timeout
Takes a unit-less value in seconds, or
a time span value such as "5min
20s". Pass 0 to disable the timeout
- logic. Defaults to
-
90s
.</para></listitem>
+ logic. Defaults to
<varname>TimeoutStartSec=</varname> from the
+
manager configuration file
.</para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>