Merge pull request #293 from teg/man-revert

man: revert dynamic paths for split-usr setups

1 files changed, 14 insertions, 17 deletions

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 786c7d478a..01c31c5ef5 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -71,20 +68,20 @@
 
     <para>The <filename>.netdev</filename> files are read from the
     files located in the system network directory
-    <filename>&rootlibexecdir;/network</filename>, the volatile
+    <filename>/usr/lib/systemd/network</filename>, the volatile
     runtime network directory
     <filename>/run/systemd/network</filename> and the local
     administration network directory
-    <filename>&pkgsysconfdir;/network</filename>. All configuration files
+    <filename>/etc/systemd/network</filename>. All configuration files
     are collectively sorted and processed in lexical order, regardless
     of the directories in which they live. However, files with
     identical filenames replace each other. Files in
     <filename>/etc</filename> have the highest priority, files in
     <filename>/run</filename> take precedence over files with the same
-    name in <filename>&rootprefix;/lib</filename>. This can be used to
+    name in <filename>/usr/lib</filename>. This can be used to
     override a system-supplied configuration file with a local file if
     needed; a symlink in <filename>/etc</filename> with the same name
-    as a configuration file in <filename>&rootprefix;/lib</filename>, pointing
+    as a configuration file in <filename>/usr/lib</filename>, pointing
     to <filename>/dev/null</filename>, disables the configuration file
     entirely.</para>
 
@@ -845,7 +842,7 @@
   <refsect1>
     <title>Example</title>
     <example>
-      <title>&pkgsysconfdir;/network/bridge.netdev</title>
+      <title>/etc/systemd/network/bridge.netdev</title>
 
       <programlisting>[NetDev]
 Name=bridge0
@@ -853,7 +850,7 @@ Kind=bridge</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/vlan1.netdev</title>
+      <title>/etc/systemd/network/vlan1.netdev</title>
 
       <programlisting>[Match]
 Virtualization=no
@@ -866,7 +863,7 @@ Kind=vlan
 Id=1</programlisting>
     </example>
     <example>
-      <title>&pkgsysconfdir;/network/ipip.netdev</title>
+      <title>/etc/systemd/network/ipip.netdev</title>
       <programlisting>[NetDev]
 Name=ipip-tun
 Kind=ipip
@@ -878,7 +875,7 @@ Remote=192.169.224.239
 TTL=64</programlisting>
     </example>
     <example>
-      <title>&pkgsysconfdir;/network/tap.netdev</title>
+      <title>/etc/systemd/network/tap.netdev</title>
       <programlisting>[NetDev]
 Name=tap-test
 Kind=tap
@@ -888,7 +885,7 @@ MultiQueue=true
 PacketInfo=true</programlisting> </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/sit.netdev</title>
+      <title>/etc/systemd/network/sit.netdev</title>
       <programlisting>[NetDev]
 Name=sit-tun
 Kind=sit
@@ -900,7 +897,7 @@ Remote=10.65.223.239</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/gre.netdev</title>
+      <title>/etc/systemd/network/gre.netdev</title>
       <programlisting>[NetDev]
 Name=gre-tun
 Kind=gre
@@ -912,7 +909,7 @@ Remote=10.65.223.239</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/vti.netdev</title>
+      <title>/etc/systemd/network/vti.netdev</title>
 
       <programlisting>[NetDev]
 Name=vti-tun
@@ -925,7 +922,7 @@ Remote=10.65.223.239</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/veth.netdev</title>
+      <title>/etc/systemd/network/veth.netdev</title>
       <programlisting>[NetDev]
 Name=veth-test
 Kind=veth
@@ -935,7 +932,7 @@ Name=veth-peer</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/dummy.netdev</title>
+      <title>/etc/systemd/network/dummy.netdev</title>
       <programlisting>[NetDev]
 Name=dummy-test
 Kind=dummy