X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-socket-proxyd.xml;h=ab80a2b4ba17de823b538d037260907fc419d52d;hp=095af311f6643f1924241e38a2cacd5df93314ce;hb=849958d1ba3533c953fad46d4d41c0ec6e48316d;hpb=34c7dc47d3beb9aebc8f5e4a8698b3c9acff0048

diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml
index 095af311f..ab80a2b4b 100644
--- a/man/systemd-socket-proxyd.xml
+++ b/man/systemd-socket-proxyd.xml
@@ -20,7 +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-socket-proxyd">
+<refentry id="systemd-socket-proxyd"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
+
         <refentryinfo>
                 <title>systemd-socket-proxyd</title>
                 <productname>systemd</productname>
@@ -35,7 +37,7 @@
         </refentryinfo>
         <refmeta>
                 <refentrytitle>systemd-socket-proxyd</refentrytitle>
-                <manvolnum>1</manvolnum>
+                <manvolnum>8</manvolnum>
         </refmeta>
         <refnamediv>
                 <refname>systemd-socket-proxyd</refname>
@@ -83,21 +85,8 @@
                 <title>Options</title>
                 <para>The following options are understood:</para>
                 <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option></term>
-                                <term><option>--help</option></term>
-                                <listitem>
-                                        <para>Prints a short help
-                                        text and exits.</para>
-                                </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><option>--version</option></term>
-                                <listitem>
-                                        <para>Prints a version
-                                        string and exits.</para>
-                                </listitem>
-                        </varlistentry>
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
                 </variablelist>
         </refsect1>
         <refsect1>
@@ -113,26 +102,22 @@
                         and no namespace isolation.</para>
                         <example>
                                 <title>proxy-to-nginx.socket</title>
-                                <programlisting>
-<![CDATA[[Socket]
+                                <programlisting><![CDATA[[Socket]
 ListenStream=80
 
 [Install]
-WantedBy=sockets.target]]>
-</programlisting>
+WantedBy=sockets.target]]></programlisting>
                         </example>
                         <example>
                                 <title>proxy-to-nginx.service</title>
-                                <programlisting>
-<![CDATA[[Unit]
+                                <programlisting><![CDATA[[Unit]
 Requires=nginx.service
 After=nginx.service
 
 [Service]
 ExecStart=/usr/lib/systemd/systemd-socket-proxyd /tmp/nginx.sock
 PrivateTmp=yes
-PrivateNetwork=yes]]>
-</programlisting>
+PrivateNetwork=yes]]></programlisting>
                         </example>
                         <example>
                                 <title>nginx.conf</title>
@@ -145,11 +130,9 @@ server {
                         </example>
                         <example>
                                 <title>Enabling the proxy</title>
-                                <programlisting>
-<![CDATA[# systemctl enable proxy-to-nginx.socket
+                                <programlisting><![CDATA[# systemctl enable proxy-to-nginx.socket
 # systemctl start proxy-to-nginx.socket
-$ curl http://localhost:80/]]>
-</programlisting>
+$ curl http://localhost:80/]]></programlisting>
                         </example>
                 </refsect2>
                 <refsect2>
@@ -163,18 +146,15 @@ $ curl http://localhost:80/]]>
                         too.</para>
                         <example>
                                 <title>proxy-to-nginx.socket</title>
-                                <programlisting>
-<![CDATA[[Socket]
+                                <programlisting><![CDATA[[Socket]
 ListenStream=80
 
 [Install]
-WantedBy=sockets.target]]>
-</programlisting>
+WantedBy=sockets.target]]></programlisting>
                         </example>
                         <example>
                                 <title>proxy-to-nginx.service</title>
-                                <programlisting>
-<![CDATA[[Unit]
+                                <programlisting><![CDATA[[Unit]
 Requires=nginx.service
 After=nginx.service
 JoinsNamespaceOf=nginx.service
@@ -182,26 +162,21 @@ JoinsNamespaceOf=nginx.service
 [Service]
 ExecStart=/usr/lib/systemd/systemd-socket-proxyd 127.0.0.1:8080
 PrivateTmp=yes
-PrivateNetwork=yes]]>
-</programlisting>
+PrivateNetwork=yes]]></programlisting>
                         </example>
                         <example>
                                 <title>nginx.conf</title>
-                                <programlisting>
-<![CDATA[[...]
+                                <programlisting><![CDATA[[...]
 server {
     listen       8080;
     listen       unix:/tmp/nginx.sock;
-    [...]]]>
-</programlisting>
+    [...]]]></programlisting>
                         </example>
                         <example>
                                 <title>Enabling the proxy</title>
-                                <programlisting>
-<![CDATA[# systemctl enable proxy-to-nginx.socket
+                                <programlisting><![CDATA[# systemctl enable proxy-to-nginx.socket
 # systemctl start proxy-to-nginx.socket
-$ curl http://localhost:80/]]>
-</programlisting>
+$ curl http://localhost:80/]]></programlisting>
                         </example>
                 </refsect2>
         </refsect1>