diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-02-14 15:56:19 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-02-14 15:56:19 +0100 |
commit | 9fccdb0f64d12bc09a71442dd0af2248c1aa3e89 (patch) | |
tree | aca201d5e65bac4bcbe697e6f075378b3c01413a /man/systemd-socket-proxyd.xml | |
parent | 6046278f405b3ebaf84fcf17f6e834c4c4bd6a42 (diff) | |
download | systemd-9fccdb0f64d12bc09a71442dd0af2248c1aa3e89.tar.gz |
man: always place <programlisting> and </programlisting> in a line with actual sources, so that we don't get spurious newlines in the man page output
Diffstat (limited to 'man/systemd-socket-proxyd.xml')
-rw-r--r-- | man/systemd-socket-proxyd.xml | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml index 4aef620051..8061466d8f 100644 --- a/man/systemd-socket-proxyd.xml +++ b/man/systemd-socket-proxyd.xml @@ -113,26 +113,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 +141,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 +157,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 +173,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> |