X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-socket-proxyd.xml;fp=man%2Fsystemd-saproxy.xml;h=90b3b1c3a4f087a2ed36049640c1a3af72e92d93;hp=ff8218c1e2b9cfc37a663e10428dda78e10319d8;hb=96c374d0a536286e18cad64d1b5ebb8f07c90334;hpb=e905a456814eadfb904c49241e3841c1e4a1d119

diff --git a/man/systemd-saproxy.xml b/man/systemd-socket-proxyd.xml
similarity index 92%
rename from man/systemd-saproxy.xml
rename to 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">