man: clarify a few things

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index ee4d3937565b97c6f35649170212f6f8c2ab56f8..3bd058f00bb81a88177c24dbd179f0a55b054f2e 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -223,7 +223,11 @@
                                 daemon. Use of this option is
                                 recommended for services where
                                 <varname>Type=</varname> is set to
                                 daemon. Use of this option is
                                 recommended for services where
                                 <varname>Type=</varname> is set to

-                                <option>forking</option>.</para>
+                                <option>forking</option>. systemd will
+                                read the PID of the main process of
+                                the daemon after start-up of the
+                                service. systemd will not write to the
+                                file configured here.</para>

                                 </listitem>
                         </varlistentry>
 
                                 </listitem>
                         </varlistentry>
 

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 1aea2f89b158d5cc97324726b2bf8275a0842600..3b7581c54512b613e4bbdfd1de1c7f3e264474f5 100644 (file)
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -113,6 +113,17 @@
                 <para>Socket units may be used to implement on-demand
                 starting of services, as well as parallelized starting
                 of services.</para>
                 <para>Socket units may be used to implement on-demand
                 starting of services, as well as parallelized starting
                 of services.</para>

+
+                <para>Note that the daemon software configured for
+                socket activation with socket units needs to be able
+                to accept sockets from systemd, either via systemd's
+                native socket passing interface (see
+                <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+                for details) or via the traditional
+                <citerefentry><refentrytitle>inetd</refentrytitle><manvolnum>8</manvolnum></citerefentry>-style
+                socket passing (i.e. sockets passed in via STDIN and
+                STDOUT, using <varname>StandardInput=socket</varname>
+                in the service file).</para>

         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>