[systemd-commits] man/systemd.socket.xml

[Lennart Poettering]

 man/systemd.socket.xml |   27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 3c86d34cf1e381ade10dcc41c655c98b2d489c8d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 20 23:25:23 2013 +0200

    man: document that shutdown() is only sometimes OK on sockets passed in via socket activation

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index f1e7d40..040305c 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -374,23 +374,30 @@
                                 and only one service unit is spawned
                                 for all connections (also see
                                 above). This value is ignored for
-                                datagram sockets and FIFOs where
-                                a single service unit unconditionally
+                                datagram sockets and FIFOs where a
+                                single service unit unconditionally
                                 handles all incoming traffic. Defaults
                                 to <option>false</option>. For
                                 performance reasons, it is recommended
                                 to write new daemons only in a way
                                 that is suitable for
-                                <option>Accept=false</option>. A daemon
-                                listening on an AF_UNIX socket may, but does not need to, call
+                                <option>Accept=false</option>. A
+                                daemon listening on an AF_UNIX socket
+                                may, but does not need to, call
                                 <citerefentry><refentrytitle>close</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-                                or
+                                on the received socket before
+                                exiting. However, it must not unlink
+                                the socket from a filesystem. It
+                                should note invoke
                                 <citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-                                on the received socket before exiting. However,
-                                it must not unlink the socket from a
-                                filesystem. This option is mostly useful
-                                to allow daemons designed for usage with
-                                <citerefentry><refentrytitle>inetd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                                on sockets it got with
+                                <varname>Accept=false</varname>, but
+                                it may do so for sockets it got with
+                                <varname>Accept=true</varname> set.
+                                Setting <varname>Accept=true</varname>
+                                is mostly useful to allow daemons
+                                designed for usage with
+                                <citerefentry><refentrytitle>inetd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                                 to work unmodified with systemd socket
                                 activation.</para></listitem>
                         </varlistentry>