socket-proxyd: rename from saproxy

The thing is a daemon, hence needs a "d" prefix. Also, we tend to not
abbreviate names of background components unnecessarily, since they are
not primary commands people type. Then, the fact that this thing does
socket actviation is mostly in implementationd detail for the proxy.

Also, do some minor indenting clean-ups and other code updates.

1 files changed, 13 insertions, 13 deletions

diff --git a/man/systemd-saproxy.xml b/man/systemd-socket-proxyd.xml
index ff8218c1e..90b3b1c3a 100644
--- a/man/systemd-saproxy.xml
+++ b/man/systemd-socket-proxyd.xml
@@ -20,9 +20,9 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="systemd-saproxy">
+<refentry id="systemd-socket-proxyd">
         <refentryinfo>
-                <title>systemd-saproxy</title>
+                <title>systemd-socket-proxyd</title>
                 <productname>systemd</productname>
                 <authorgroup>
                         <author>
@@ -34,23 +34,23 @@
                 </authorgroup>
         </refentryinfo>
         <refmeta>
-                <refentrytitle>systemd-saproxy</refentrytitle>
+                <refentrytitle>systemd-socket-proxyd</refentrytitle>
                 <manvolnum>1</manvolnum>
         </refmeta>
         <refnamediv>
-                <refname>systemd-saproxy</refname>
+                <refname>systemd-socket-proxyd</refname>
                 <refpurpose>Inherit a socket. Bidirectionally
                 proxy.</refpurpose>
         </refnamediv>
         <refsynopsisdiv>
                 <cmdsynopsis>
-                        <command>systemd-saproxy</command>
+                        <command>systemd-socket-proxyd</command>
                         <arg choice="opt" rep="repeat">OPTIONS</arg>
                         <arg choice="plain"><replaceable>HOSTNAME-OR-IP</replaceable></arg>
                         <arg choice="plain"><replaceable>PORT-OR-SERVICE</replaceable></arg>
                 </cmdsynopsis>
                 <cmdsynopsis>
-                        <command>systemd-saproxy</command>
+                        <command>systemd-socket-proxyd</command>
                         <arg choice="opt" rep="repeat">OPTIONS</arg>
                         <arg choice="plain"><replaceable>UNIX-DOMAIN-SOCKET-PATH</replaceable>
                         </arg>
@@ -59,7 +59,7 @@
         <refsect1>
                 <title>Description</title>
                 <para>
-                <command>systemd-saproxy</command> provides a proxy
+                <command>systemd-socket-proxyd</command> provides a proxy
                 to socket-activate services that do not yet support
                 native socket activation. On behalf of the daemon,
                 the proxy inherits the socket from systemd, accepts
@@ -68,7 +68,7 @@
                 data between the two.</para>
                 <para>This utility's behavior is similar to
                 <citerefentry><refentrytitle>socat</refentrytitle><manvolnum>1</manvolnum> </citerefentry>.
-                The main differences for <command>systemd-saproxy</command>
+                The main differences for <command>systemd-socket-proxyd</command>
                 are support for socket activation with
                 <literal>Accept=false</literal> and an event-driven
                 design that scales better with the number of
@@ -102,7 +102,7 @@
                                         invoked indirectly, for
                                         example with a shell script
                                         rather than with
-                                        <option>ExecStart=/usr/bin/systemd-saproxy</option>
+                                        <option>ExecStart=/usr/bin/systemd-socket-proxyd</option>
                                         </para>
                                 </listitem>
                         </varlistentry>
@@ -137,7 +137,7 @@ After=nginx.service
 Requires=nginx.service
 
 [Service]
-ExecStart=/usr/bin/systemd-saproxy /tmp/nginx.sock
+ExecStart=/usr/bin/systemd-socket-proxyd /tmp/nginx.sock
 PrivateTmp=true
 PrivateNetwork=true]]>
 </programlisting>
@@ -190,14 +190,14 @@ After=syslog.target remote-fs.target nss-lookup.target
 
 [Service]
 ExecStartPre=/usr/sbin/nginx -t
-ExecStart=/usr/bin/saproxy-nginx.sh
+ExecStart=/usr/bin/socket-proxyd-nginx.sh
 PrivateTmp=true
 PrivateNetwork=true]]>
 </programlisting>
                         </example>
                         <example label="shell script">
                                 <title>
-                                /usr/bin/saproxy-nginx.sh</title>
+                                /usr/bin/socket-proxyd-nginx.sh</title>
                                 <programlisting>
 <![CDATA[#!/bin/sh
 /usr/sbin/nginx
@@ -205,7 +205,7 @@ while [ ! -f /tmp/nginx.pid ]
   do
      /usr/bin/inotifywait /tmp/nginx.pid
   done
-/usr/bin/systemd-saproxy --ignore-env localhost 8080]]>
+/usr/bin/systemd-socket-proxyd --ignore-env localhost 8080]]>
 </programlisting>
                         </example>
                         <example label="nginx configuration">