man: revert dynamic paths for split-usr setups

This did not really work out as we had hoped. Trying to do this upstream
introduced several problems that probably makes it better suited as a
downstream patch after all. At any rate, it is not releaseable in the
current state, so we at least need to revert this before the release.

 * by adjusting the path to binaries, but not do the same thing to the
   search path we end up with inconsistent man-pages. Adjusting the search
   path too would be quite messy, and it is not at all obvious that this is
   worth the effort, but at any rate it would have to be done before we
   could ship this.

 * this means that distributed man-pages does not make sense as they depend
   on config options, and for better or worse we are still distributing
   man pages, so that is something that definitely needs sorting out before
   we could ship with this patch.

 * we have long held that split-usr is only minimally supported in order
   to boot, and something we hope will eventually go away. So before we start
   adding even more magic/effort in order to make this work nicely, we should
   probably question if it makes sense at all.

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 3aa5eb185948ec76e36764ca5fcfbe1abd618cae..5b63cfb4c3d63d762d57b5913a740c45b40df75a 100644 (file)
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 

diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml
index b383f6e24d195025205bfee15f49b8e8a3293fb6..bf6ca0bf9e9f6f62a20d73450da529da20834421 100644 (file)
--- a/man/bootchart.conf.xml
+++ b/man/bootchart.conf.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.
@@ -55,17 +52,17 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/bootchart.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/bootchart.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/bootchart.conf</filename></para>
+    <para><filename>/etc/systemd/bootchart.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/bootchart.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/bootchart.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/bootchart.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
     <title>Description</title>
 
     <para>When starting, systemd-bootchart will read the configuration
-    file <filename>&pkgsysconfdir;/bootchart.conf</filename>, followed by
+    file <filename>/etc/systemd/bootchart.conf</filename>, followed by
     the files in the <filename>bootchart.conf.d</filename>
     directories. These configuration files determine logging
     parameters and graph output.</para>
@@ -125,10 +122,10 @@
         <term><varname>Init=[path]</varname></term>
         <listitem><para>Configures bootchart to run a non-standard
         binary instead of
-        <filename>&rootlibexecdir;/systemd</filename>. This option is
+        <filename>/usr/lib/systemd/systemd</filename>. This option is
         only relevant if bootchart was invoked from the kernel command
         line with
-        init=&rootlibexecdir;/systemd-bootchart.</para></listitem>
+        init=/usr/lib/systemd/systemd-bootchart.</para></listitem>
       </varlistentry>
 
       <varlistentry>

diff --git a/man/bootctl.xml b/man/bootctl.xml
index c7c65aa4b23afd9de5b38e373aa4f41208cbdab4..63ad9392ebc7442c24c9087e65b921166940b1a3 100644 (file)
--- a/man/bootctl.xml
+++ b/man/bootctl.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.

diff --git a/man/bootup.xml b/man/bootup.xml
index de34a59a72793bb7ccadb0d3349bd4aca5ac8427..b92057af294dac764b7ec9e6aaf50a5908e689f4 100644 (file)
--- a/man/bootup.xml
+++ b/man/bootup.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.

diff --git a/man/busctl.xml b/man/busctl.xml
index 08303b4dd8401e4529ecb20112758063757187cf..807fc78e8fb137641016582eeb7bd0abff230e70 100644 (file)
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index 4c65c1cf0345a71acf014a583ba32f8d155fa1e1..fd54c59e6bc97106c3a0fdbf6b13a24e8869da29 100644 (file)
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/coredump.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/coredump.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/coredump.conf</filename></para>
+    <para><filename>/etc/systemd/coredump.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/coredump.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/coredump.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/coredump.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml
index 4bd1a7e67f86f5046af719638cb2ed29702befa3..efbc655a76b9ad0ef7da58bb2396270209d82d05 100644 (file)
--- a/man/coredumpctl.xml
+++ b/man/coredumpctl.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.

diff --git a/man/crypttab.xml b/man/crypttab.xml
index d403e71befca8a930bb66f819829f2344c30025c..d4ff760adcb89c7a771ac4f40dec7193c1bb4a7d 100644 (file)
--- a/man/crypttab.xml
+++ b/man/crypttab.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 

diff --git a/man/daemon.xml b/man/daemon.xml
index 38d458e05d7f2e627012c7367fd817f5854a030c..a8bbfc055b62f7f1cff4d0b1f9b37f212bb9244e 100644 (file)
--- a/man/daemon.xml
+++ b/man/daemon.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.

diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml
index f73a3edc06972cf1de213e92d8ebbe685131b33f..3a5627d196c74fe3dc3a5dcb365ac52f8a9145af 100644 (file)
--- a/man/file-hierarchy.xml
+++ b/man/file-hierarchy.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.

diff --git a/man/halt.xml b/man/halt.xml
index f425ebdb8e37577e95543c1501dcff7ac8dc2484..a06dbd0097e5dc257ac380927ee383b89ba2918e 100644 (file)
--- a/man/halt.xml
+++ b/man/halt.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.

diff --git a/man/hostname.xml b/man/hostname.xml
index 34aaca1acdd0efbb460db39a28d3bcdba4cf506c..9688450e1c2bf8180802d2c4ee4a7fb2a9489e35 100644 (file)
--- a/man/hostname.xml
+++ b/man/hostname.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.

diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 93934668cc3d2e52a224d68d7ed9a0045a0e0086..b1f038156d62541571cd9541798243e8614a8e4f 100644 (file)
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.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.

diff --git a/man/hwdb.xml b/man/hwdb.xml
index 8a6e26d089bdcea001e8cbf6f78d53d34b16918d..80939dd95df47d7d5ebbb544b7567ece6af61048 100644 (file)
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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">
 
 <refentry id="hwdb" conditional="ENABLE_HWDB">
   <refentryinfo>
@@ -43,15 +40,16 @@
 
   <refsect1><title>Hardware Database Files</title>
       <para>The hwdb files are read from the files located in the
-      system hwdb directory <filename>&udevlibexecdir;/hwdb.d</filename>
-      and the local administration directory <filename>/etc/udev/hwdb.d</filename>.
+      system hwdb directory <filename>/usr/lib/udev/hwdb.d</filename> and
+      the local administration directory <filename>/etc/udev/hwdb.d</filename>.
       All hwdb 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>
-      take precedence over files with the same name in <filename>&rootprefix;/lib</filename>.
-      This can be used to override a system-supplied hwdb file with a local file if needed;
+      have the highest priority and take precedence over files with the same
+      name in <filename>/usr/lib</filename>. This can be used to override a
+      system-supplied hwdb file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a hwdb file in
-      <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>,
+      <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
       disables the hwdb file entirely. hwdb files must have the extension
       <filename>.hwdb</filename>; other extensions are ignored.</para>
 
@@ -71,7 +69,7 @@
       <para>The content of all hwdb files is read by
       <citerefentry><refentrytitle>systemd-hwdb</refentrytitle><manvolnum>8</manvolnum></citerefentry>
       and compiled to a binary database located at <filename>/etc/udev/hwdb.bin</filename>,
-      or alternatively <filename>&udevlibexecdir;/hwdb.bin</filename> if you want ship the compiled
+      or alternatively <filename>/usr/lib/udev/hwdb.bin</filename> if you want ship the compiled
       database in an immutable image.
       During runtime only the binary database is used.</para>
   </refsect1>

diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
index 948dfa531d547f6c54f8e2e6872cf382566689d8..fc60258d0b9222e91d190a9a3cdb8933711030fb 100644 (file)
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.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.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/journal-remote.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/journald.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/journal-remote.conf</filename></para>
+    <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/journald.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/journalctl.xml b/man/journalctl.xml
index d67d9606be3a678bfe5787e6237438ccf3d56912..08de0ff06849ca99d4c13d79cafc9d29c22cb6ee 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.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.

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index f8eb398abae4351d2417552e693e93c5fd6a9590..d6fe45d40c4720f11b45a3893412a71151c1799b 100644 (file)
--- a/man/journald.conf.xml
+++ b/man/journald.conf.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.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/journald.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/journald.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/journald.conf</filename></para>
+    <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/journald.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 6490123a53b56a1e3ba9898c8a27974f2d62f78f..eb7372702750de2a42a295d02a1d9db2b6722c16 100644 (file)
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.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.

diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index 8891bae71e93d8dfc91c2d76abf023a95fa2dffa..d7e27de758161faba2099ee1149e846b0a68e447 100644 (file)
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/less-variables.xml b/man/less-variables.xml
index e344c62e1a2a88157a71a0cca39dccffa5990d5f..0fb4d7fbcf9fdfe34e85d22dae1cdb47796ce93b 100644 (file)
--- a/man/less-variables.xml
+++ b/man/less-variables.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-                 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+                 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <refsect1>
         <title>Environment</title>

diff --git a/man/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
index 3620f47316a2c85ce8e10af03fd80b478edea36f..272da64cd72a6a4ee5b246e7fe5a7c4cd657d238 100644 (file)
--- a/man/libsystemd-pkgconfig.xml
+++ b/man/libsystemd-pkgconfig.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <refsect1>
   <title>Notes</title>

diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index 8af49af7f294fee17a08206fb08a8d5bffb8a635..2c32d1609415fef92d612d7a6f8137a3f235ed2a 100644 (file)
--- a/man/locale.conf.xml
+++ b/man/locale.conf.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.

diff --git a/man/localectl.xml b/man/localectl.xml
index caf963ae5e535c775273765e77b1951d190f48ba..7def047f629ada9fb9aba0a4f37b63094f3895d4 100644 (file)
--- a/man/localectl.xml
+++ b/man/localectl.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.

diff --git a/man/localtime.xml b/man/localtime.xml
index 1740dde9eb4119f5d51815c948c24443f1e34002..2827da6e93f1834366f2b9be694cc95064813bbe 100644 (file)
--- a/man/localtime.xml
+++ b/man/localtime.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.

diff --git a/man/loginctl.xml b/man/loginctl.xml
index d0529c160ea70a6cfef50ff39758f8cb87a541a4..9dda14d4548df1da386bde21a8317281da380000 100644 (file)
--- a/man/loginctl.xml
+++ b/man/loginctl.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.

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 96ebd6eed070ca9794734368b7dee531f711ec9d..2b79547275caf7f2b470d1113d807f0a7d552e5c 100644 (file)
--- a/man/logind.conf.xml
+++ b/man/logind.conf.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.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/logind.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/logind.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/logind.conf</filename></para>
+    <para><filename>/etc/systemd/logind.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/logind.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/logind.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/logind.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/machine-id.xml b/man/machine-id.xml
index bb7cd7f06092343c4eba479a81de62b1d2d500b8..92d67a3869ac27438ebfd856f4c7b163238d989f 100644 (file)
--- a/man/machine-id.xml
+++ b/man/machine-id.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.

diff --git a/man/machine-info.xml b/man/machine-info.xml
index a6db1e0317f4e36f3fe4dd727b751ba1fea93130..916f1dab663882be2813167696e9e9cd848c0739 100644 (file)
--- a/man/machine-info.xml
+++ b/man/machine-info.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.

diff --git a/man/machinectl.xml b/man/machinectl.xml
index 18ef6a578054bad2e0a94833693c813e88794992..50cbb1bc98c13d7161936cb66db6e8a9423badbe 100644 (file)
--- a/man/machinectl.xml
+++ b/man/machinectl.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.
@@ -588,8 +585,8 @@
         first verified with detached GPG signature file
         <filename>SHA256SUMS.gpg</filename>. The public key for this
         verification step needs to be available in
-        <filename>&rootlibexecdir;/import-pubring.gpg</filename> or
-        <filename>&pkgsysconfdir;/import-pubring.gpg</filename>.</para>
+        <filename>/usr/lib/systemd/import-pubring.gpg</filename> or
+        <filename>/etc/systemd/import-pubring.gpg</filename>.</para>
 
         <para>The container image will be downloaded and stored in a
         read-only subvolume in

diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 82a98be666ca5107ee908880f9b6dc6a4d9444dc..4b722aa12855c6cdcf99500a27174f08c2c2d1c9 100644 (file)
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 

diff --git a/man/networkctl.xml b/man/networkctl.xml
index 402698cb129b231bd4b05a65a7721441bf2398f0..d11d60f2a9e277a60f74bfe610b52ae56fa04359 100644 (file)
--- a/man/networkctl.xml
+++ b/man/networkctl.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml
index 7379213f81b398884d96ca559e766c67444f7206..2d36df6f6f688d33862a6ab951235d25f396aad8 100644 (file)
--- a/man/nss-myhostname.xml
+++ b/man/nss-myhostname.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.

diff --git a/man/nss-mymachines.xml b/man/nss-mymachines.xml
index a3e6c75d1bf984425e8b0b870acdb0ebf05e01dc..eb1ed2592b835f3b80df8e537f7bcb8c0cc93c94 100644 (file)
--- a/man/nss-mymachines.xml
+++ b/man/nss-mymachines.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.

diff --git a/man/os-release.xml b/man/os-release.xml
index 6ce5885812ed3dc6cf2c91e06d606c57aa0d7500..4ca2e597063fc5ce0b9df484b662f00e18e66963 100644 (file)
--- a/man/os-release.xml
+++ b/man/os-release.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.

diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index 6fdbcf91e0f18fee2459f9832d40c1b059ac90e2..b4a3f502b443389d1db889d45347494e4c4c00d8 100644 (file)
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.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.

diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 52329eba56fc151668dc28e09cdaa63dfa4dcd1a..8047a4ea750a00dbf16ac0b797f4f339401028ae 100644 (file)
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.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.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/resolved.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/resolved.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/resolved.conf</filename></para>
+    <para><filename>/etc/systemd/resolved.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/resolved.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/resolved.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/resolved.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/runlevel.xml b/man/runlevel.xml
index f34f9583e8bafdf73c57338c4c35eba41e8b95bb..fc1f52385519f82babf569807b70f27ada153259 100644 (file)
--- a/man/runlevel.xml
+++ b/man/runlevel.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.

diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 686ba0cefe1522db7db52801021d5036184437a6..b7ba363656606d9c6f049e3999e903677d5b66ea 100644 (file)
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.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.

diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index 067d43b4321e089f8f50f3d06ff13f195cbbfb98..ea7972055d0ceac97c31d43c35b59c039d0e3c1e 100644 (file)
--- a/man/sd-id128.xml
+++ b/man/sd-id128.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.

diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index 165284c0ae358c95ef8c627cb0b067ab7346eaf4..9b1a52207fe8c67bb3d009fd7d7b931414027bc0 100644 (file)
--- a/man/sd-journal.xml
+++ b/man/sd-journal.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.

diff --git a/man/sd-login.xml b/man/sd-login.xml
index 4c4e5f0077a8e7e60fd070cdb792bb94ab0fc1c4..328f71164da4b243c080a24f1bfeff74b381be3a 100644 (file)
--- a/man/sd-login.xml
+++ b/man/sd-login.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.

diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index 235e78d08353894119aa86409cb5f6cd5cec7e2d..4dd674b8eadaedb90179620a4f2a11647e9031f0 100644 (file)
--- a/man/sd_booted.xml
+++ b/man/sd_booted.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.

diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index b9e081101b2a4be7ed7c31d80d017be6ba2b283d..13f885cd5db2b21e920cda16156dfacaae840930 100644 (file)
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index 36b6bef04e5a4d034702725201e2d28346e1576d..8c054a59051ea337c30f195fb576f061ea8880f3 100644 (file)
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml
index ae0b1a05c862ec53315e1f9c379871a832609c48..fbf10d019f7ecd504a2c95afb06644c079244c88 100644 (file)
--- a/man/sd_bus_default.xml
+++ b/man/sd_bus_default.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 762f0c0d6da5320ed972853ad41b1728a62b76b8..b8cb339cec63f447fb139df0211ca29e5aa4fed9 100644 (file)
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
index 5025bdfefbcdfdf13a25c9f97e40285992e5fa09..7a4bfa4bc47998ae5166fbbb1bba11895a1dcfe8 100644 (file)
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_message_append_array.xml b/man/sd_bus_message_append_array.xml
index fc5ee2392b273c09b489d6f3044db26c84ed17db..c2adc6f43d39d8f60392b9cb167d1a2fcad23078 100644 (file)
--- a/man/sd_bus_message_append_array.xml
+++ b/man/sd_bus_message_append_array.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_message_append_basic.xml b/man/sd_bus_message_append_basic.xml
index 82c6957122de51990fb5febbd5525b9b4fcecd1a..91eaf875306f2ed3ab0a6129b2eb1e26f5a4fdb0 100644 (file)
--- a/man/sd_bus_message_append_basic.xml
+++ b/man/sd_bus_message_append_basic.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml
index 61c513ad75e2fd7f868734cb1de0488246275efb..9e99999bf3f2eb5d104992136370a88a3edb0c12 100644 (file)
--- a/man/sd_bus_message_append_string_memfd.xml
+++ b/man/sd_bus_message_append_string_memfd.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml
index 57a6864acefccc066fabd6672af96dcee97fa54e..0f77adcc8b2790be5a0048d59cb26c3f2487d860 100644 (file)
--- a/man/sd_bus_message_append_strv.xml
+++ b/man/sd_bus_message_append_strv.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index 7f762a34f7ee1fabbc76eec05eb2759e8ec26435..3328eead3dff2d17e39dd6a0247d8ad9919ad612 100644 (file)
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.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.

diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index c8deecffbbb35dee5baab4de2d1318f97ed062b7..4c2c06e903ede5aaa87f45b83558b01e252a886e 100644 (file)
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.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.

diff --git a/man/sd_bus_negotiate_fds.xml b/man/sd_bus_negotiate_fds.xml
index d31cb57e5f447bd4689b78e08738e02d9b3e0ff8..f988acf41a267ce328106921b6af276f57116175 100644 (file)
--- a/man/sd_bus_negotiate_fds.xml
+++ b/man/sd_bus_negotiate_fds.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index c1d82bbe5347bb219fc6c1abc2b5624d394f901b..5c65b9a2fe505afd9888f673c05474e1003c240a 100644 (file)
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index 41c35bde02262955bd0d366ff18c9faf4c7c094c..21c22a8f7c7261ee2009411e1152dcafcb73fee0 100644 (file)
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index a7dc9fea89cb7dde1ed3fa814aee0db7cc40d8bb..9b0a93d8884d1550d8f9457c7db9bb60d1d1c9e9 100644 (file)
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.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.

diff --git a/man/sd_event_add_child.xml b/man/sd_event_add_child.xml
index 6b53c8422bfb3f2d3fbd4070942f73f187559596..b62d1ee5e149ac14a2793d7505fcdbbdf662f036 100644 (file)
--- a/man/sd_event_add_child.xml
+++ b/man/sd_event_add_child.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_event_add_defer.xml b/man/sd_event_add_defer.xml
index b991b38650f048d0b1a7f29e1a1b65302de70ead..01504bf01e8341af8343b3e2b2074c8cfc790e3e 100644 (file)
--- a/man/sd_event_add_defer.xml
+++ b/man/sd_event_add_defer.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml
index 16414803f4160e117a3465d81a995a0d23ba9db7..1d0942b45cef54c8a73c62044533024f594dc264 100644 (file)
--- a/man/sd_event_add_signal.xml
+++ b/man/sd_event_add_signal.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index 5fc917270c29bb08c3d52837924f12de6bf9ccc2..c5f7aee19d728a1e4844499ed33ee1e2858f2f0d 100644 (file)
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_event_get_fd.xml b/man/sd_event_get_fd.xml
index 1e46665e47048b6d234ac81013865fef623c145a..ecdbe76ec411cfad61825c5303d07d10cb9d90d5 100644 (file)
--- a/man/sd_event_get_fd.xml
+++ b/man/sd_event_get_fd.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml
index 43b5b742f73b9b4fc805cc2f20a56d7a0445924b..e5a440556efff992235f13b25d1b9a9df174b063 100644 (file)
--- a/man/sd_event_new.xml
+++ b/man/sd_event_new.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_event_run.xml b/man/sd_event_run.xml
index 9b50b95459cb1198cec31cd780948a645852d4fb..2eab5684c5f9127c81165b62e12e1bcfaf95e7a3 100644 (file)
--- a/man/sd_event_run.xml
+++ b/man/sd_event_run.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_event_set_name.xml b/man/sd_event_set_name.xml
index eec34d1182f433d1e78ea4ee9342205484a78ed7..72aef897c75ca5e9a087e76b5b7460849c54a069 100644 (file)
--- a/man/sd_event_set_name.xml
+++ b/man/sd_event_set_name.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index 94f8b5ca457edd9e01388df5a9f5dddc43dabd8a..397d52a3e4ab028dbd32254fae62f2f3ecd232df 100644 (file)
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
index 3f2c666c6145a2f6e287ba0a18c9ce09321110e8..4390d36ebe523d546cbc2ec3edecb3f612f9bbe8 100644 (file)
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.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.

diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
index 02fa2da283c74cd7ec17a492a882a7ab4aae47c4..2ad1f8f728b3b54c8820b6e0c81d6a1e644467fd 100644 (file)
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.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.

diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
index c4d7c421069efc6c577849d88575543330797176..ab449d29378cd6c38d9f55db2e55093a23d4d4ac 100644 (file)
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.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.

diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
index 988a646d84c36bdd6aaed75d1490f87e44dc9183..e70c80892e77cb13584d66eb3b900a26f6cec38f 100644 (file)
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.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.

diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index 57dd6afc89bf8c61c7ac1a0d8e92f856663c3f71..627cb87aafb3b962f612f238f4b4dbf1d5efd8ce 100644 (file)
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.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.

diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index fe89cbf75c59f6c4d6ce16ed063ce574514ea88e..420f56356a4d1bc573873aa689fdddc51d503971 100644 (file)
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.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.

diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index 2ff3fc2826d53a108b7f97335b8c1b8a6749e3de..c19eb11b20f8ac69707e0128944166d514084240 100644 (file)
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.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.

diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
index 1d38bac7fbe3e58215176f426aa52fbd3d7a0002..a400d8b1b5e5fa33edd5ce0767c87291f5c75cff 100644 (file)
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.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.

diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
index ae5e638d70c85378ac977ec7e4be1568d6f7dc04..23e7cc65e879546bd08c7cbe7ba66b4362623f47 100644 (file)
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.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.

diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index b395fe01c92ef0e9836b03b433a242a89319ecc0..1afbd7371cd7767412c7d1b0e431d51d6c90d8d4 100644 (file)
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.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.

diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index 51dcb1aeebfcc1e54e8809a9690db262f933c7a6..3a38f733ab781b62874b00f19cdc20be96824f9e 100644 (file)
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.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.

diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
index 921aa77ab6234371d459bed1bd4a5fbe6add778c..607d74666be25b3c5b6d8bf7fa646b990a2adadc 100644 (file)
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.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.

diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
index a89b77907cadb6bb601c19995e504ba1f46afc16..72c804d8345552c351890083a4dce45effe9e026 100644 (file)
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.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.

diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
index 216d9a59c600ae23af556c907217f555e316f455..115fe26661cc1b003be1ef081a15f1d5827b9e28 100644 (file)
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.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.

diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index f6aac75546c0e45e94306c0f0a4cc5e578226a90..fb572802a301c9d4275d9fe82dbf74ab39121da0 100644 (file)
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.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.

diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 6dbf73f9c11622d1992f7b6a01ea8af24fec89d7..0cd0b45b9af312d8b71f753c7199a7b01554769a 100644 (file)
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.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.

diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
index 5c92f8972e4ebb6c0abd3e14dd4037cdf028f338..ac0e5f633f30fcebb4f1d704fa05e0a53811ae14 100644 (file)
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.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.

diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index d4c13c21f8d87039a341808353ffc8119802f42d..d74c2d5bbc6ea26be066ac3ca591f74469ecc52c 100644 (file)
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.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.

diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index ae7990e212ef6bb544d8dde8c4fc0408d0a01f13..2ea7731b483f9f900a653a2dc33a0dd471cfc169 100644 (file)
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.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.

diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index 38e159bb4282e846cf6377a81285fb4ca18ccb7b..9b9705eb2ee5daaea1c3335a23a46d1b93275e04 100644 (file)
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.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.

diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index ef97dae1d04044ed6bd70899aa9a0463050a2df6..a7b47a3207f7635ed7e7670930aa58dccc091ad9 100644 (file)
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.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.

diff --git a/man/sd_machine_get_class.xml b/man/sd_machine_get_class.xml
index 68babd198192f092738f61d327f718652fc0f469..5b881ccea1f63f1743acfc568d695f3a9b0e523b 100644 (file)
--- a/man/sd_machine_get_class.xml
+++ b/man/sd_machine_get_class.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.

diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index d563bcf2aa39a7767002bfe9a09f347f2a14c378..87e59c9cc2a59995da9598b93f4393c198c65269 100644 (file)
--- a/man/sd_notify.xml
+++ b/man/sd_notify.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.

diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml
index 05a396157ad0ebc465a721e355271de90f16626c..b46d47101b62142ccadbe125464d8f3892698d1e 100644 (file)
--- a/man/sd_pid_get_session.xml
+++ b/man/sd_pid_get_session.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.

diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index 74b4ed5fc13681e45765858c3e2f28361afed3f2..3c57ec9ea409f0dad88797bce124252be184e7ae 100644 (file)
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.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.

diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index e3af2b39c9c4a1f317834731939c5672d2ab590a..4ca3a6c15057ae24b715c0de9fbf9316fbc57dd2 100644 (file)
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.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.

diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index 18a3427026b4e480554efd75a7775602d246bbfc..b158f3528cf193e2b3f82ba7b48ca83fb2d1511c 100644 (file)
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.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.

diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
index 41850106e63ce1909e3d036be93ee4fd116f3af2..991431f33bfadee52cb9927e49577bbb52714191 100644 (file)
--- a/man/sd_watchdog_enabled.xml
+++ b/man/sd_watchdog_enabled.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.

diff --git a/man/shutdown.xml b/man/shutdown.xml
index 9bf599b3720966224915428539a188d494425394..a8af387c6767c70697d2d823b8569c04468d2076 100644 (file)
--- a/man/shutdown.xml
+++ b/man/shutdown.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.

diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index 123877a0a5a96bb50faf1905ca4a89ef5bbfd768..004f53f70c8b28e04243c19da2c3f18bee0c200b 100644 (file)
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refsection PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <refsection>
   <refsection id='confd'>
@@ -42,14 +39,14 @@
     <para>Default configuration is defined during compilation, so a
     configuration file is only needed when it is necessary to deviate
     from those defaults. By default the configuration file in
-    <filename>&pkgsysconfdir;/</filename> contains commented out entries
+    <filename>/etc/systemd/</filename> contains commented out entries
     showing the defaults as a guide to the administrator. This file
     can be edited to create local overrides.
     </para>
 
     <para>When packages need to customize the configuration, they can
     install configuration snippets in
-    <filename>&rootlibexecdir;/*.conf.d/</filename>. Files in
+    <filename>/usr/lib/systemd/*.conf.d/</filename>. Files in
     <filename>/etc/</filename> are reserved for the local
     administrator, who may use this logic to override the
     configuration files installed by vendor packages. The main

diff --git a/man/standard-options.xml b/man/standard-options.xml
index 5adda7c6700d84bfb653af8be33ef617bcb08203..f21446339254a78df71fec637597d8afa51c569e 100644 (file)
--- a/man/standard-options.xml
+++ b/man/standard-options.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <variablelist>
   <varlistentry id='help'>

diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 841cedba3a8a32b324d8377f97ce9fde2247fe07..8a131791a5969bc22501bd52bf596f2db3fccc1a 100644 (file)
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -1,8 +1,5 @@
 <?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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -130,7 +127,7 @@
       <para><filename>/etc/udev/rules.d/99-bridge.rules</filename>:
       </para>
 
-      <programlisting>ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="&rootlibexecdir;/systemd-sysctl --prefix=/net/bridge"
+      <programlisting>ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/net/bridge"
 </programlisting>
 
       <para><filename>/etc/sysctl.d/bridge.conf</filename>:

diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
index 3aecc40b60372a280d7d0a4c87d22f28670c1463..3b854fd8ecad8018b1cf82b2b116dc171a8c8360 100644 (file)
--- a/man/systemd-activate.xml
+++ b/man/systemd-activate.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>&rootlibexecdir;/systemd-activate</command>
+      <command>/usr/lib/systemd/systemd-activate</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="plain"><replaceable>daemon</replaceable></arg>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
@@ -152,13 +149,13 @@
     <example>
       <title>Run an echo server on port 2000</title>
 
-      <programlisting>$ &rootlibexecdir;/systemd-activate -l 2000 -a cat</programlisting>
+      <programlisting>$ /usr/lib/systemd/systemd-activate -l 2000 -a cat</programlisting>
     </example>
 
     <example>
       <title>Run a socket activated instance of <citerefentry><refentrytitle>systemd-journal-gatewayd</refentrytitle><manvolnum>8</manvolnum></citerefentry></title>
 
-      <programlisting>$ &rootlibexecdir;/systemd-activate -l 19531 &rootlibexecdir;/systemd-journal-gatewayd</programlisting>
+      <programlisting>$ /usr/lib/systemd/systemd-activate -l 19531 /usr/lib/systemd/systemd-journal-gatewayd</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 3509d155d3d38503a1b5a22f3ccfd0f431120f07..198315052f2d4c6a87fe8a6a1053705b7e38aea1 100644 (file)
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.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.

diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml
index 488a8793dd836772c2046d40a7050662e3afc150..479e5f2e5b37be67106da2e0673a6a226ab2115d 100644 (file)
--- a/man/systemd-ask-password-console.service.xml
+++ b/man/systemd-ask-password-console.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 

diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 24021037193f775b2dd643a6024c25cb1f008ec7..877c71af539702d716c35e8bc5d6786634915fec 100644 (file)
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.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.

diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml
index 123576255da9ea4f8a39f95c2d5378d5657304b6..a259f5d583cd79d05af03ae34e6314fdd95ee9ab 100644 (file)
--- a/man/systemd-backlight@.service.xml
+++ b/man/systemd-backlight@.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-backlight@.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-backlight</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-backlight</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-binfmt.service.xml b/man/systemd-binfmt.service.xml
index 8659e63ebc18940ab577ec7cadb9bf91bad09219..66d264389e7e23ce423d087a09f503509154e727 100644 (file)
--- a/man/systemd-binfmt.service.xml
+++ b/man/systemd-binfmt.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-binfmt.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-binfmt</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-binfmt</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml
index ea8a78360102c23d7489ef759072ae0572c1ed0b..538666760a9f9e0f052438ffabdf594f3fbc09d4 100644 (file)
--- a/man/systemd-bootchart.xml
+++ b/man/systemd-bootchart.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.
@@ -63,7 +60,7 @@
       usage, as well as per-process information from a running system.
       Collected results are output as an SVG graph. Normally,
       systemd-bootchart is invoked by the kernel by passing
-      <option>init=<filename>&rootlibexecdir;/systemd-bootchart</filename></option>
+      <option>init=<filename>/usr/lib/systemd/systemd-bootchart</filename></option>
       on the kernel command line. systemd-bootchart will then fork the
       real init off to resume normal system startup, while monitoring
       and logging startup information in the background.
@@ -109,7 +106,7 @@
         <listitem><para>The kernel can invoke
         <command>systemd-bootchart</command> instead of the init
         process. In turn, <command>systemd-bootchart</command> will
-        invoke <command>&rootlibexecdir;/systemd</command>.
+        invoke <command>/usr/lib/systemd/systemd</command>.
         </para></listitem>
       </varlistentry>
 
@@ -131,7 +128,7 @@
     <title>Options</title>
 
     <para>These options can also be set in the
-    <filename>&pkgsysconfdir;/bootchart.conf</filename> file. See
+    <filename>/etc/systemd/bootchart.conf</filename> file. See
     <citerefentry project='man-pages'><refentrytitle>bootchart.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
     </para>
 
@@ -204,7 +201,7 @@
         <term><option>-i</option></term>
         <term><option>--init <replaceable>path</replaceable></option></term>
         <listitem><para>Use this init binary. Defaults to
-        <command>&rootlibexecdir;/systemd</command>.
+        <command>/usr/lib/systemd/systemd</command>.
         </para></listitem>
       </varlistentry>
 

diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
index f7b94cd481612694d2951f5ad7b775dcf9d29f0f..63652b185be76dbc9c9157e90c54c3c5ae0fcb76 100644 (file)
--- a/man/systemd-bus-proxyd.xml
+++ b/man/systemd-bus-proxyd.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>&rootlibexecdir;/systemd-bus-proxyd</command>
+      <command>/usr/lib/systemd/systemd-bus-proxyd</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="opt"><replaceable>PLACEHOLDER</replaceable></arg>
     </cmdsynopsis>

diff --git a/man/systemd-bus-proxyd@.service.xml b/man/systemd-bus-proxyd@.service.xml
index 4ac6ba040c6a7b62b974e4cf0a88266d1b15ce83..e6e0a8e88d67537e3f89be605818d6268fb41e03 100644 (file)
--- a/man/systemd-bus-proxyd@.service.xml
+++ b/man/systemd-bus-proxyd@.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index d51acd7cf8a05945a34b2f2cf22a356ab3b4b8f3..9b1a8809dc461dd9d6e7fb88c5fe50e3702cfc70 100644 (file)
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.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.

diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index d3b2404a76e26c936aa64d0ef456434311091cfb..e8f0368f48dfbe42cb4e63825024fb2b85b1cbbd 100644 (file)
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.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.

diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 969edd055e361c2e3e80cf30627ee667aa6af3e3..d4b041a1f96f9266a86304aa066abbddd8e45d51 100644 (file)
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.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.

diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index d40562b5e12046ebfc198f874d1bf1461bbe9882..5da3857c086f52f7105a66adcdf7297e67c97966 100644 (file)
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.
@@ -52,7 +49,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/systemd-coredump</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-coredump</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index c4747f72d39daf5afb361f156f3c3a391c0854ed..b6270358eae6ea4a3cb3c2ab5d2334e0b2d02f53 100644 (file)
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,7 +46,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-cryptsetup-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-cryptsetup-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-cryptsetup@.service.xml b/man/systemd-cryptsetup@.service.xml
index efc213a917b742a7984e434d53569bcc634c6718..ea524851eb7622567cc5fa6a955025ef7f471e3c 100644 (file)
--- a/man/systemd-cryptsetup@.service.xml
+++ b/man/systemd-cryptsetup@.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-cryptsetup@.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-cryptsetup</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-cryptsetup</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-debug-generator.xml b/man/systemd-debug-generator.xml
index 075ec58e7ed1bea04c0cdd6cb45527ca8255f0f4..5c5e9fc4a1a6e892eef318b2fd9227addd0d4eb5 100644 (file)
--- a/man/systemd-debug-generator.xml
+++ b/man/systemd-debug-generator.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -50,7 +47,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-debug-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-debug-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 69ea0411e6a54e548aec500af73a482214c9b1bf..6a6460ffaaa25857ce16c54d9d9ed7c41766d518 100644 (file)
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.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.

diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 16ac4f309137d5a308fb9db6604ef6c322776e6d..40755a24d0cabd5d38427df66cef1359a8e3b688 100644 (file)
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.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.

diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml
index 1f8194dd6200089c12c90feea630e25277256ba2..23464bcf154997028daaa2c0ae8308cdf9959e9d 100644 (file)
--- a/man/systemd-efi-boot-generator.xml
+++ b/man/systemd-efi-boot-generator.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-efi-boot-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-efi-boot-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-escape.xml b/man/systemd-escape.xml
index 6680bcf963479628c9e8c9df83230e6337399fcc..0c3b2305264bf279c11e8477a8213d9743b7187d 100644 (file)
--- a/man/systemd-escape.xml
+++ b/man/systemd-escape.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.

diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml
index 6ec54bf1c317c5efdca4fa3c05788ed45fb3b790..67289daa26768b1e64d26a9c9307e422280efa68 100644 (file)
--- a/man/systemd-firstboot.xml
+++ b/man/systemd-firstboot.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.

diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
index 7286cd88032051c02d1bc755262d9c485487cda4..e4ffcba1687f8e9d8d92adb086d7411ec93955a6 100644 (file)
--- a/man/systemd-fsck@.service.xml
+++ b/man/systemd-fsck@.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -53,7 +50,7 @@
   <refsynopsisdiv>
     <para><filename>systemd-fsck@.service</filename></para>
     <para><filename>systemd-fsck-root.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-fsck</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-fsck</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
index 383aab70ffcf22642f3bac132218771497efe089..c09ed4b4da2dc143b29412836382987fe0109030 100644 (file)
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,7 +46,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-fstab-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-fstab-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
index 12127d9c2a8240ec8518dd3afaf57d624bf85979..338925964d354cb0f6bcb52293aa2fe2c88e6db7 100644 (file)
--- a/man/systemd-getty-generator.xml
+++ b/man/systemd-getty-generator.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -50,7 +47,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-getty-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-getty-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
index d3e02d6f7b6904ef1be1b795e9548ae13515745d..710c2e065ebb1fc6a6a6fb9a8c8e8f828b7fd8ea 100644 (file)
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -53,7 +50,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-gpt-auto-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-gpt-auto-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml
index 7e83a88fab86381e0669a8b0bfa2068295c400e2..c94e2a182088c35a1a288e7198b7c224f3612555 100644 (file)
--- a/man/systemd-halt.service.xml
+++ b/man/systemd-halt.service.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.
@@ -59,7 +56,7 @@
     <para><filename>systemd-poweroff.service</filename></para>
     <para><filename>systemd-reboot.service</filename></para>
     <para><filename>systemd-kexec.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-shutdown</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-shutdown</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -78,7 +75,7 @@
 
     <para>When these services are run, they ensure that PID 1 is
     replaced by the
-    <filename>&rootlibexecdir;/systemd-shutdown</filename> tool which
+    <filename>/usr/lib/systemd/systemd-shutdown</filename> tool which
     is then responsible for the actual shutdown. Before shutting down,
     this binary will try to unmount all remaining file systems,
     disable all remaining swap devices, detach all remaining storage
@@ -93,7 +90,7 @@
     <para>Immediately before executing the actual system
     halt/poweroff/reboot/kexec <filename>systemd-shutdown</filename>
     will run all executables in
-    <filename>&rootlibexecdir;/system-shutdown/</filename> and pass
+    <filename>/usr/lib/systemd/system-shutdown/</filename> and pass
     one arguments to them: either <literal>halt</literal>,
     <literal>poweroff</literal>, <literal>reboot</literal> or
     <literal>kexec</literal>, depending on the chosen action. All

diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml
index 52837bc3f03aec70bf1660b81138c27d4e7a88d2..d811b9b551bdeff4428dfc2f1e4b4a7a371788a4 100644 (file)
--- a/man/systemd-hibernate-resume-generator.xml
+++ b/man/systemd-hibernate-resume-generator.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,7 +46,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-hibernate-resume-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-hibernate-resume-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-hibernate-resume@.service.xml b/man/systemd-hibernate-resume@.service.xml
index bca08b5fd5df5361f21acfa06da6d593d51220f5..7d008274478d868c29199c3ba562047c93261b19 100644 (file)
--- a/man/systemd-hibernate-resume@.service.xml
+++ b/man/systemd-hibernate-resume@.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-hibernate-resume@.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-hibernate-resume</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-hibernate-resume</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml
index 2db1d035b158b9cd9b1769be6681b050d42be23b..6990d41b020079321d687bc8cd707d629bb70227 100644 (file)
--- a/man/systemd-hostnamed.service.xml
+++ b/man/systemd-hostnamed.service.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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-hostnamed.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-hostnamed</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-hostnamed</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-hwdb.xml b/man/systemd-hwdb.xml
index 9a58776af2985ca6e3343413b3a3ff30e6e1028c..f1a14025b00ce1bdbea4205a373c8657fa159f95 100644 (file)
--- a/man/systemd-hwdb.xml
+++ b/man/systemd-hwdb.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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">
 
 <refentry id="systemd-hwdb" conditional="ENABLE_HWDB">
   <refentryinfo>
@@ -60,7 +57,7 @@
       <varlistentry>
         <term><option>--usr</option></term>
         <listitem>
-          <para>Generate in &udevlibexecdir; instead of /etc/udev.</para>
+          <para>Generate in /usr/lib/udev instead of /etc/udev.</para>
         </listitem>
       </varlistentry>
       <varlistentry>

diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index 6ff07210d39e5474779aec41ade87fc7a6102aa6..9d85908f97cdaf5ccc0f06f94f68b65eb6897e0a 100644 (file)
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.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.

diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml
index 95288d068f1bf80ad966d463d9ed3b6619af4973..5c7f9a4a163f811913d967e225f047de04245ecf 100644 (file)
--- a/man/systemd-initctl.service.xml
+++ b/man/systemd-initctl.service.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.
@@ -55,7 +52,7 @@
   <refsynopsisdiv>
     <para><filename>systemd-initctl.service</filename></para>
     <para><filename>systemd-initctl.socket</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-initctl</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-initctl</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
index f7588794cd094c487224c4de4df27f7848b834c5..6df2248578f8155268096e269de43feb99f984ef 100644 (file)
--- a/man/systemd-journal-gatewayd.service.xml
+++ b/man/systemd-journal-gatewayd.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.
@@ -57,7 +54,7 @@
     <para><filename>systemd-journal-gatewayd.service</filename></para>
     <para><filename>systemd-journal-gatewayd.socket</filename></para>
     <cmdsynopsis>
-      <command>&rootlibexecdir;/systemd-journal-gatewayd</command>
+      <command>/usr/lib/systemd/systemd-journal-gatewayd</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
     </cmdsynopsis>
   </refsynopsisdiv>

diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml
index 596479edb1a4a54ed929b9fe5cdb849995b76122..ebaca2657f48859be0c446811bbe6d4e84d81a1a 100644 (file)
--- a/man/systemd-journal-remote.xml
+++ b/man/systemd-journal-remote.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/systemd-journal-upload.xml b/man/systemd-journal-upload.xml
index 5398ff42e256d65be0a3e414a0b94b1a70b94f47..597f2a2d3e8ffa5f7c24c380367f55b166c67ef7 100644 (file)
--- a/man/systemd-journal-upload.xml
+++ b/man/systemd-journal-upload.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.
@@ -246,8 +243,8 @@ openssl ca -batch -config ca.conf -notext -in $CLIENT.csr -out $CLIENT.pem
       <varname>TrustedCertificateFile=</varname>,
       <varname>ServerCertificateFile=</varname>,
       <varname>ServerKeyFile=</varname>, in
-      <filename>&pkgsysconfdir;/journal-remote.conf</filename> and
-      <filename>&pkgsysconfdir;/journal-upload.conf</filename>
+      <filename>/etc/systemd/journal-remote.conf</filename> and
+      <filename>/etc/systemd/journal-upload.conf</filename>
       respectively. The default locations can be queried by using
       <command>systemd-journal-remote --help</command> and
       <command>systemd-journal-upload --help</command>.</para>

diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index ead1eee3fb66811ac41ff352cde6d9b82c6adf98..8280d6c874e2d3b3c83f7f0a9aebc6a5c56edd37 100644 (file)
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.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.
@@ -57,7 +54,7 @@
     <para><filename>systemd-journald.service</filename></para>
     <para><filename>systemd-journald.socket</filename></para>
     <para><filename>systemd-journald-dev-log.socket</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-journald</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-journald</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -202,7 +199,7 @@
 
     <variablelist>
       <varlistentry>
-        <term><filename>&pkgsysconfdir;/journald.conf</filename></term>
+        <term><filename>/etc/systemd/journald.conf</filename></term>
 
         <listitem><para>Configure
         <command>systemd-journald</command>

diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
index 1628054a3be7f10a23a3b5d97b15366a1a4ab73b..06aa78c0e42327e9530974f191df1f7d4a5e2611 100644 (file)
--- a/man/systemd-localed.service.xml
+++ b/man/systemd-localed.service.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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-localed.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-localed</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-localed</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
index 1416d884cef8438a560bb67f1dcd5d5eb9ba350e..5733e42cd1afd5f2a15368f88703460cc8038f99 100644 (file)
--- a/man/systemd-logind.service.xml
+++ b/man/systemd-logind.service.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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-logind.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-logind</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-logind</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-machine-id-commit.service.xml b/man/systemd-machine-id-commit.service.xml
index 7bda76c4e55e91653e1d0e3b4eb6f2dbe664d98c..7c8fc0874e767ea3a030fd449f07ed904aa22646 100644 (file)
--- a/man/systemd-machine-id-commit.service.xml
+++ b/man/systemd-machine-id-commit.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -50,7 +47,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-machine-id-commit.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-machine-id-commit</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-machine-id-commit</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-machine-id-commit.xml b/man/systemd-machine-id-commit.xml
index 0ebbfe7f076b062b0ad33282267c8baabdf6af72..cfb1722063df37f5e1ac69c032631aab02b6df7d 100644 (file)
--- a/man/systemd-machine-id-commit.xml
+++ b/man/systemd-machine-id-commit.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.

diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 5a84a3b36c555bf7f8430c79d0b6fed2dc5871ba..182717f5242e686ea4c222ba83d4ef82a5eedf25 100644 (file)
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.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.

diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml
index a62e42c35b93158ee854c8fa3cb852d6b9a4cf8e..999aeee1c6def564615a00fe1688c62f0353e24c 100644 (file)
--- a/man/systemd-machined.service.xml
+++ b/man/systemd-machined.service.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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-machined.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-machined</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-machined</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-modules-load.service.xml b/man/systemd-modules-load.service.xml
index dc9e2a855476d740f359afb3ab5bb7bc761adf29..dacd083baddbf0938386403205e84743af2b62a7 100644 (file)
--- a/man/systemd-modules-load.service.xml
+++ b/man/systemd-modules-load.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-modules-load.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-modules-load</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-modules-load</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-networkd-wait-online.service.xml b/man/systemd-networkd-wait-online.service.xml
index 157671d6b2589fca8d7b3bcced670c7d1878ed8a..f53b337daab7d57d70c215c690c68de772adeef6 100644 (file)
--- a/man/systemd-networkd-wait-online.service.xml
+++ b/man/systemd-networkd-wait-online.service.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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-networkd-wait-online.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-networkd-wait-online</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-networkd-wait-online</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 1eef5b745bdf98771dbe6fcf29f6a77228d1bbca..0bfe5519bc497d1adfc3da6d9df47ca3dfc5d1bd 100644 (file)
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-networkd.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-networkd</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-networkd</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -78,10 +75,10 @@
 
   <refsect1><title>Configuration Files</title>
     <para>The configuration files are read from the files located in the
-    system network directory <filename>&rootlibexecdir;/network</filename>,
+    system network directory <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>.</para>
+    network directory <filename>/etc/systemd/network</filename>.</para>
 
     <para>Networks are configured in <filename>.network</filename>
     files, see

diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
index 11584731178ed134336735e2a96c030443879972..06d5ae53199047b129e0e64a7eecb78ea14f4199 100644 (file)
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.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.

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 218c7291e043b68c5c86a42b2abc380e9c255abf..06285edc0bb3cf3de809a4a9331ced1e38ae3eb8 100644 (file)
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.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.

diff --git a/man/systemd-path.xml b/man/systemd-path.xml
index 185a0cc901452b910a6f68ef67b8dd7e9f6680e1..dfc75ee0ff44cb759b990a7f70f57b3de5f19c2b 100644 (file)
--- a/man/systemd-path.xml
+++ b/man/systemd-path.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.

diff --git a/man/systemd-quotacheck.service.xml b/man/systemd-quotacheck.service.xml
index 7673635a681efe2a661518f535715c3116707fb3..9d4976274ed9f6eeafe059084e535e2df0986622 100644 (file)
--- a/man/systemd-quotacheck.service.xml
+++ b/man/systemd-quotacheck.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-quotacheck.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-quotacheck</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-quotacheck</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml
index 580c3518c302400392ce13c83daf11cf85655abd..8c836688fecc467cd2c133c80b15223f7b2681a4 100644 (file)
--- a/man/systemd-random-seed.service.xml
+++ b/man/systemd-random-seed.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-random-seed.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-random-seed</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-random-seed</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml
index c8c3d16157360f27c4d1b4d0ab9505b2b039c8c8..9bc07fcdda10420037f52b23882128fe15ed1d1e 100644 (file)
--- a/man/systemd-remount-fs.service.xml
+++ b/man/systemd-remount-fs.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-remount-fs.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-remount-fs</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-remount-fs</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index 892ebff7adf395a4b1fe3d45463870db3343415f..89ec5f8b19773a7a2b340c20363a69209f7e2cb1 100644 (file)
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-resolved.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-resolved</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-resolved</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-rfkill@.service.xml b/man/systemd-rfkill@.service.xml
index befe001f29b9d395e0c304894e84652b900e3eea..709b09d8188cd898ce3177791d63695a4f4e12c1 100644 (file)
--- a/man/systemd-rfkill@.service.xml
+++ b/man/systemd-rfkill@.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-rfkill@.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-rfkill</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-rfkill</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index ddd08e5b514c2d5fb536d9d1630900dff909baff..71b365c8eb21482ce01c3c0076e7490a4ffb5b3e 100644 (file)
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index c5d26d0649c50ee569fbe9a9259d3499c3b5d5fd..9a379ecb94bfccb2cb7515f27bbcf047e0d7dcf1 100644 (file)
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/sleep.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/sleep.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/sleep.conf</filename></para>
+    <para><filename>/etc/systemd/sleep.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/sleep.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/sleep.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/sleep.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -122,7 +119,7 @@
 
     <para>The following options can be configured in the
     <literal>[Sleep]</literal> section of
-    <filename>&pkgsysconfdir;/sleep.conf</filename> or a
+    <filename>/etc/systemd/sleep.conf</filename> or a
     <filename>sleep.conf.d</filename> file:</para>
 
     <variablelist class='systemd-directives'>

diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml
index dc3baefe3840d5a926c664e7790b19f73813ca07..ae4217b910eb079b89d92af95fa3d6be73a78f36 100644 (file)
--- a/man/systemd-socket-proxyd.xml
+++ b/man/systemd-socket-proxyd.xml
@@ -1,10 +1,7 @@
 <?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.
 
@@ -116,7 +113,7 @@ Requires=nginx.service
 After=nginx.service
 
 [Service]
-ExecStart=]]>&rootlibexecdir;<![CDATA[/systemd-socket-proxyd /tmp/nginx.sock
+ExecStart=/usr/lib/systemd/systemd-socket-proxyd /tmp/nginx.sock
 PrivateTmp=yes
 PrivateNetwork=yes]]></programlisting>
       </example>
@@ -159,7 +156,7 @@ After=nginx.service
 JoinsNamespaceOf=nginx.service
 
 [Service]
-ExecStart=]]>&rootlibexecdir;<![CDATA[/systemd-socket-proxyd 127.0.0.1:8080
+ExecStart=/usr/lib/systemd/systemd-socket-proxyd 127.0.0.1:8080
 PrivateTmp=yes
 PrivateNetwork=yes]]></programlisting>
       </example>

diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 2722d1840a91f5fb1d83e742092f687f999bfb8f..a8beb86f4da7f1c0ab582675e0013be160b6c00e 100644 (file)
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.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.
@@ -59,7 +56,7 @@
     <para><filename>systemd-suspend.service</filename></para>
     <para><filename>systemd-hibernate.service</filename></para>
     <para><filename>systemd-hybrid-sleep.service</filename></para>
-    <para><filename>&rootlibexecdir;/system-sleep</filename></para>
+    <para><filename>/usr/lib/systemd/system-sleep</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -78,7 +75,7 @@
     <para>Immediately before entering system suspend and/or
     hibernation <filename>systemd-suspend.service</filename> (and the
     other mentioned units, respectively) will run all executables in
-    <filename>&rootlibexecdir;/system-sleep/</filename> and pass two
+    <filename>/usr/lib/systemd/system-sleep/</filename> and pass two
     arguments to them. The first argument will be
     <literal>pre</literal>, the second either
     <literal>suspend</literal>, <literal>hibernate</literal>, or
@@ -90,7 +87,7 @@
     until all executables have finished.</para>
 
     <para>Note that scripts or binaries dropped in
-    <filename>&rootlibexecdir;/system-sleep/</filename> are intended
+    <filename>/usr/lib/systemd/system-sleep/</filename> are intended
     for local use only and should be considered hacks. If applications
     want to be notified of system suspend/hibernation and resume,
     there are much nicer interfaces available.</para>
@@ -107,7 +104,7 @@
     <literal>mem</literal> into <filename>/sys/power/state</filename>,
     to trigger the actual system suspend. What exactly is written
     where can be configured in the <literal>[Sleep]</literal> section
-    of <filename>&pkgsysconfdir;/sleep.conf</filename> or a
+    of <filename>/etc/systemd/sleep.conf</filename> or a
     <filename>sleep.conf.d</filename> file. See
     <citerefentry><refentrytitle>systemd-sleep.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
     </para>

diff --git a/man/systemd-sysctl.service.xml b/man/systemd-sysctl.service.xml
index f7da4cd71a1a67231d3c1cbce0170a0e63851b9e..d4c1a7ebe397a407631bbd129fbd2c6be1b97e8d 100644 (file)
--- a/man/systemd-sysctl.service.xml
+++ b/man/systemd-sysctl.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-sysctl.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-sysctl</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-sysctl</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-system-update-generator.xml b/man/systemd-system-update-generator.xml
index 5c593b390634f345428041b9b90cdac3be1262a5..e7fc95c7422d815a7affbbdbec22b71638e50f66 100644 (file)
--- a/man/systemd-system-update-generator.xml
+++ b/man/systemd-system-update-generator.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,7 +46,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-system-update-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-system-update-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 5aa5da47063405c4769a3ce8d733e268e456d515..c06accd791ed20ad56c0694c2c158f0e21dc0242 100644 (file)
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.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.
@@ -54,14 +51,14 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/system.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/system.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/system.conf</filename></para>
+    <para><filename>/etc/systemd/system.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/system.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/system.conf.d/*.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/user.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/user.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/system.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/user.conf</filename></para>
+    <para><filename>/etc/systemd/user.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/user.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/user.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/user.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-sysusers.xml b/man/systemd-sysusers.xml
index cbe4f2f9cb56131db2c69d502c8330cd7325ed6e..a0c0f996ac0574cca14a7d98ce75e2347df6cfba 100644 (file)
--- a/man/systemd-sysusers.xml
+++ b/man/systemd-sysusers.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.

diff --git a/man/systemd-sysv-generator.xml b/man/systemd-sysv-generator.xml
index e7592d6692aef3d211a8fe67f0ac396571673e10..f2d56cbcd290ae3daa379a9fc8a84683db573200 100644 (file)
--- a/man/systemd-sysv-generator.xml
+++ b/man/systemd-sysv-generator.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,7 +46,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&rootlibexecdir;/system-generators/systemd-sysv-generator</filename></para>
+    <para><filename>/usr/lib/systemd/system-generators/systemd-sysv-generator</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml
index 3598490d141b16a3e381ff13f9f7cb9e98aff09d..e44163aefba8a517f03ac1ca61967818333db1f5 100644 (file)
--- a/man/systemd-timedated.service.xml
+++ b/man/systemd-timedated.service.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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-timedated.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-timedated</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-timedated</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-timesyncd.service.xml b/man/systemd-timesyncd.service.xml
index a1b364534bcdda9181b63636a700b3619ba7f191..ac1af2d136a032b5c56368c65d041fa17ad99ca0 100644 (file)
--- a/man/systemd-timesyncd.service.xml
+++ b/man/systemd-timesyncd.service.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.
@@ -53,7 +50,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-timesyncd.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-timesyncd</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-timesyncd</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index f12f997f93582405884e6f3ece2ae6eb7c8c7851..ceec06f840e4b30133526c3a697f471c37d7bbdf 100644 (file)
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.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.

diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml
index dac3a3c02c0da07dd9117bb46fbd3b2359b4dd34..2876fab644190c2dfdb194ebbab2c1b582c92897 100644 (file)
--- a/man/systemd-tty-ask-password-agent.xml
+++ b/man/systemd-tty-ask-password-agent.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.

diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 7a4b62aaf136f99c67edb3320141f9169710f43d..b19b04d7cb0115fba8c3c4b49a5869ee5d8e21a2 100644 (file)
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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">
 
 <refentry id="systemd-udevd.service"
           xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -40,7 +37,7 @@
     <para><filename>systemd-udevd-kernel.socket</filename></para>
 
     <cmdsynopsis>
-      <command>&rootlibexecdir;/systemd-udevd</command>
+      <command>/usr/lib/systemd/systemd-udevd</command>
       <arg><option>--daemon</option></arg>
       <arg><option>--debug</option></arg>
       <arg><option>--children-max=</option></arg>

diff --git a/man/systemd-update-done.service.xml b/man/systemd-update-done.service.xml
index 3f121582e92739d8e4f016a5b59c0fa28ad3ae74..d65f17541839d9608c23fd1a1eafad154d354e55 100644 (file)
--- a/man/systemd-update-done.service.xml
+++ b/man/systemd-update-done.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-update-done.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-update-done</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-update-done</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-update-utmp.service.xml b/man/systemd-update-utmp.service.xml
index 285691849f33e5bae66d2069cdf20db62dd477bd..c8a9cb7c909140c3dc8d5ba6130c7b1e144ae5b2 100644 (file)
--- a/man/systemd-update-utmp.service.xml
+++ b/man/systemd-update-utmp.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -54,7 +51,7 @@
   <refsynopsisdiv>
     <para><filename>systemd-update-utmp.service</filename></para>
     <para><filename>systemd-update-utmp-runlevel.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-update-utmp</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml
index 620648cfe845f229764d4e9376498a73fe9ad283..e75ef11c4eb02dc2875ea922dc3c8bc70e03c7b5 100644 (file)
--- a/man/systemd-user-sessions.service.xml
+++ b/man/systemd-user-sessions.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-user-sessions.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-user-sessions</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-user-sessions</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml
index 6c6d8e2af092fe2ea95f64474b1f3c5f38f66e40..7c6ed089978d3e015085a9b1982f02850d677a0e 100644 (file)
--- a/man/systemd-vconsole-setup.service.xml
+++ b/man/systemd-vconsole-setup.service.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -51,7 +48,7 @@
 
   <refsynopsisdiv>
     <para><filename>systemd-vconsole-setup.service</filename></para>
-    <para><filename>&rootlibexecdir;/systemd-vconsole-setup</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-vconsole-setup</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index 18c10d00f50575cb01d4d681ff78bfcbec9ec5cd..9561590c5c89cc51e27a8c3ff76075a59ee7bcdb 100644 (file)
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.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.

diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index 96a20d14d127ac6919edf1b4a5a2a4e8b75935c8..ac6deafb182e521825f4a8ff9bc396b83f7f93c4 100644 (file)
--- a/man/systemd.device.xml
+++ b/man/systemd.device.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.

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index ea53722f0fab97652e544d4a248186d844a5aa81..64877720bcc14c2fd0e7981e4849fabf43c67e0a 100644 (file)
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1,8 +1,5 @@
 <!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.

diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index 5ce0592a6e62adb6cd910deb84a888f4b9e3009d..2285e91812ad92ea12eeac421db1b94bca284055 100644 (file)
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -59,14 +59,14 @@
 
     <para>
       <literallayout><filename>/run/systemd/system-generators/*</filename>
-<filename>&pkgsysconfdir;/system-generators/*</filename>
+<filename>/etc/systemd/system-generators/*</filename>
 <filename>/usr/local/lib/systemd/system-generators/*</filename>
 <filename>&systemgeneratordir;/*</filename></literallayout>
     </para>
 
     <para>
       <literallayout><filename>/run/systemd/user-generators/*</filename>
-<filename>&pkgsysconfdir;/user-generators/*</filename>
+<filename>/etc/systemd/user-generators/*</filename>
 <filename>/usr/local/lib/systemd/user-generators/*</filename>
 <filename>&usergeneratordir;/*</filename></literallayout>
     </para>

diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index 2cb010c0bee728b8bd96664c61e843cb656be5fa..a101006a7e2b2ff59fe76a7017669a11f69d450b 100644 (file)
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.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.

diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
index c51cf81320332371c123283c07baca18ca49686c..1292f4f51317e05b3693270c7e9966a6eca6affd 100644 (file)
--- a/man/systemd.kill.xml
+++ b/man/systemd.kill.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.

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 723364f4d16e46f56e19e0305323665764c69ae0..d9b1879c5981833c8a03f6c9ce9d7b7a89fbe310 100644 (file)
--- a/man/systemd.link.xml
+++ b/man/systemd.link.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.
@@ -59,21 +56,21 @@
     <command>net_setup_link</command> udev builtin.</para>
 
     <para>The link files are read from the files located in the system
-    network directory <filename>&rootlibexecdir;/network</filename>,
+    network directory <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>. Link files must have
+    <filename>/etc/systemd/network</filename>. Link files must have
     the extension <filename>.link</filename>; other extensions are
     ignored. All link 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 link file with a local file if needed;
     a symlink in <filename>/etc</filename> with the same name as a
-    link file in <filename>&rootprefix;/lib</filename>, pointing to
+    link file in <filename>/usr/lib</filename>, pointing to
     <filename>/dev/null</filename>, disables the link file
     entirely.</para>
 
@@ -387,7 +384,7 @@
   <refsect1>
     <title>Example</title>
     <example>
-      <title>&pkgsysconfdir;/network/wireless.link</title>
+      <title>/etc/systemd/network/wireless.link</title>
 
       <programlisting>[Match]
 MACAddress=12:34:56:78:9a:bc

diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index f22c86adc17be32ab4292f791e5b7409b842e101..ffffc56936c2b86f406747ee8988c8f46df06193 100644 (file)
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.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.

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 786c7d478a9314aca36ce585d4837f715bac6418..01c31c5ef52764082aefc48fc7d1f76e2a7181b9 100644 (file)
--- 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

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 54fef4c9c499e9d8de072a76b19891f33f9c3ac3..1a2699a47f1379802727106b206c62ec14405a5e 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.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.
@@ -67,20 +64,20 @@
 
     <para>The <filename>.network</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>
 
@@ -687,7 +684,7 @@
   <refsect1>
     <title>Example</title>
     <example>
-      <title>&pkgsysconfdir;/network/50-static.network</title>
+      <title>/etc/systemd/network/50-static.network</title>
 
       <programlisting>[Match]
 Name=enp2s0
@@ -698,7 +695,7 @@ Gateway=192.168.0.1</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/80-dhcp.network</title>
+      <title>/etc/systemd/network/80-dhcp.network</title>
 
       <programlisting>[Match]
 Name=en*
@@ -708,7 +705,7 @@ DHCP=yes</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/bridge-static.network</title>
+      <title>/etc/systemd/network/bridge-static.network</title>
 
       <programlisting>[Match]
 Name=bridge0
@@ -720,7 +717,7 @@ DNS=192.168.0.1</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/bridge-slave-interface.network</title>
+      <title>/etc/systemd/network/bridge-slave-interface.network</title>
 
       <programlisting>[Match]
 Name=enp2s0
@@ -729,7 +726,7 @@ Name=enp2s0
 Bridge=bridge0</programlisting>
     </example>
     <example>
-      <title>&pkgsysconfdir;/network/ipip.network</title>
+      <title>/etc/systemd/network/ipip.network</title>
 
       <programlisting>[Match]
 Name=em1
@@ -739,7 +736,7 @@ Tunnel=ipip-tun</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/sit.network</title>
+      <title>/etc/systemd/network/sit.network</title>
 
       <programlisting>[Match]
 Name=em1
@@ -749,7 +746,7 @@ Tunnel=sit-tun</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/gre.network</title>
+      <title>/etc/systemd/network/gre.network</title>
 
       <programlisting>[Match]
 Name=em1
@@ -759,7 +756,7 @@ Tunnel=gre-tun</programlisting>
     </example>
 
     <example>
-      <title>&pkgsysconfdir;/network/vti.network</title>
+      <title>/etc/systemd/network/vti.network</title>
 
       <programlisting>[Match]
 Name=em1

diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index 03b626b560218be6ce83e418e0b32241dd35f999..d02bc92ae608c7b2ae0e3d3b239ce7ded9a22a2e 100644 (file)
--- a/man/systemd.path.xml
+++ b/man/systemd.path.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.

diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 4667f9d616ddc5c45912c409c4064b982a83de69..2f9add8d6ca7b38dff36f09c29e0b35e8f6b842e 100644 (file)
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 
@@ -49,12 +46,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/system-preset/*.preset</filename></para>
+    <para><filename>/etc/systemd/system-preset/*.preset</filename></para>
     <para><filename>/run/systemd/system-preset/*.preset</filename></para>
-    <para><filename>&rootlibexecdir;/system-preset/*.preset</filename></para>
-    <para><filename>&pkgsysconfdir;/user-preset/*.preset</filename></para>
+    <para><filename>/usr/lib/systemd/system-preset/*.preset</filename></para>
+    <para><filename>/etc/systemd/user-preset/*.preset</filename></para>
     <para><filename>/run/systemd/user-preset/*.preset</filename></para>
-    <para><filename>&rootlibexecdir;/user-preset/*.preset</filename></para>
+    <para><filename>/usr/lib/systemd/user-preset/*.preset</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -128,7 +125,7 @@
     <para>If the administrator wants to disable a preset file supplied
     by the vendor, the recommended way is to place a symlink to
     <filename>/dev/null</filename> in
-    <filename>&pkgsysconfdir;/system-preset/</filename> bearing the same
+    <filename>/etc/systemd/system-preset/</filename> bearing the same
     filename.</para>
   </refsect1>
 
@@ -136,7 +133,7 @@
     <title>Example</title>
 
     <example>
-      <title>Default off example <filename>&rootlibexecdir;/system-preset/99-default.preset</filename>:</title>
+      <title>Default off example <filename>/usr/lib/systemd/system-preset/99-default.preset</filename>:</title>
 
       <programlisting>disable *</programlisting>
     </example>
@@ -147,7 +144,7 @@
     suchlike.</para>
 
     <example>
-      <title>A GNOME spin example <filename>&rootlibexecdir;/system-preset/50-gnome.preset</filename>:</title>
+      <title>A GNOME spin example <filename>/usr/lib/systemd/system-preset/50-gnome.preset</filename>:</title>
 
       <programlisting>enable gdm.service
 enable colord.service
@@ -165,7 +162,7 @@ enable avahi-daemon.*</programlisting>
     example like the one from the first example above.</para>
 
     <example>
-      <title>Administrator policy <filename>&pkgsysconfdir;/system-preset/00-lennart.preset</filename>:</title>
+      <title>Administrator policy <filename>/etc/systemd/system-preset/00-lennart.preset</filename>:</title>
 
       <programlisting>enable httpd.service
 enable sshd.service

diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 82e21c69063c2175b297ef86367374f6238ab31b..8f4e7a3f163c610e1ba40780389e18565a561471 100644 (file)
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml
index f137cb7391622c6e78985b97b70c8af7d7b2cf3f..fd65a851e244f2324c7d5ec2f31210806b423a76 100644 (file)
--- a/man/systemd.scope.xml
+++ b/man/systemd.scope.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index e26196323df0b68415ab01af91f574513ae88387..191adcda52e2b4df40e5a4b3c5baa7660591e5b2 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.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.

diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index c443528ab1cdd22b4b05bb9ae3ea402ca07b6dd1..a50132733599098589425a3929ec433cde10cb8e 100644 (file)
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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.

diff --git a/man/systemd.snapshot.xml b/man/systemd.snapshot.xml
index 4c1f40e8144a95061d5b7b52684c140abae75749..96069c324ae8e128e048b90cf931385fd1da22c3 100644 (file)
--- a/man/systemd.snapshot.xml
+++ b/man/systemd.snapshot.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.

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 1d0fa1bd167f68b15abe5eabaa4552377dbea348..1e9778bc2a94c8587b2d8406ec0e03111f300ee1 100644 (file)
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.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.

diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 8db3050b5884b83fd0e886f3fd8f12dc94e0cb36..cf76aaf607eb1fddb4ebf00e9198983f96e3e70d 100644 (file)
--- a/man/systemd.special.xml
+++ b/man/systemd.special.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.

diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 4f3f371ae33676f9a3610c33b591672fdb3df5a4..d9a39577d502e46bd425dc4e2308c08cac55fe13 100644 (file)
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.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.

diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index 884177e9fa1dab8b980507c55b4ed9f5d57aa5cc..e790e9b77a91cd63caf011b85fb7a2d5057916db 100644 (file)
--- a/man/systemd.target.xml
+++ b/man/systemd.target.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.

diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index 570a20e5cfa041541be3477ab70b160d90b97595..da0729725d13022a395a4f3a19f3f612eae4dca9 100644 (file)
--- a/man/systemd.time.xml
+++ b/man/systemd.time.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.

diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 5f7e80425e257c24d3091e6112ab242b27fab1f0..20890f22700ab20165dd04a09bf8cb7454829162 100644 (file)
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.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.

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 8286cf3f78cbdb9ae2279ba05f79bb58eedd289e..0aa1eeac772b4b7f3a7c505a6fce06b1c9dd2691 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -64,20 +64,20 @@
     <filename><replaceable>slice</replaceable>.slice</filename>,
     <filename><replaceable>scope</replaceable>.scope</filename></para>
 
-    <para><literallayout><filename>&pkgsysconfdir;/system/*</filename>
+    <para><literallayout><filename>/etc/systemd/system/*</filename>
 <filename>/run/systemd/system/*</filename>
-<filename>&rootlibexecdir;/system/*</filename>
+<filename>/usr/lib/systemd/system/*</filename>
 <filename>...</filename>
     </literallayout></para>
 
     <para><literallayout><filename>$XDG_CONFIG_HOME/systemd/user/*</filename>
 <filename>$HOME/.config/systemd/user/*</filename>
-<filename>&pkgsysconfdir;/user/*</filename>
+<filename>/etc/systemd/user/*</filename>
 <filename>$XDG_RUNTIME_DIR/systemd/user/*</filename>
 <filename>/run/systemd/user/*</filename>
 <filename>$XDG_DATA_HOME/systemd/user/*</filename>
 <filename>$HOME/.local/share/systemd/user/*</filename>
-<filename>&rootlibexecdir;/user/*</filename>
+<filename>/usr/lib/systemd/user/*</filename>
 <filename>...</filename>
     </literallayout></para>
   </refsynopsisdiv>
@@ -287,7 +287,7 @@
         </thead>
         <tbody>
           <row>
-      <entry><filename>&pkgsysconfdir;/system</filename></entry>
+      <entry><filename>/etc/systemd/system</filename></entry>
       <entry>Local configuration</entry>
           </row>
           <row>
@@ -295,7 +295,7 @@
       <entry>Runtime units</entry>
           </row>
           <row>
-      <entry><filename>&rootlibexecdir;/system</filename></entry>
+      <entry><filename>/usr/lib/systemd/system</filename></entry>
       <entry>Units of installed packages</entry>
           </row>
         </tbody>
@@ -326,7 +326,7 @@
       <entry>User configuration (only used when $XDG_CONFIG_HOME is not set)</entry>
           </row>
           <row>
-      <entry><filename>&pkgsysconfdir;/user</filename></entry>
+      <entry><filename>/etc/systemd/user</filename></entry>
       <entry>Local configuration</entry>
           </row>
           <row>
@@ -346,7 +346,7 @@
       <entry>Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is not set)</entry>
           </row>
           <row>
-      <entry><filename>&rootlibexecdir;/user</filename></entry>
+      <entry><filename>/usr/lib/systemd/user</filename></entry>
       <entry>Units of packages that have been installed system-wide</entry>
           </row>
         </tbody>
@@ -1296,7 +1296,7 @@ ExecStart=/usr/sbin/foo-daemon
 
       <para>After running <command>systemctl enable</command>, a
       symlink
-      <filename>&pkgsysconfdir;/system/multi-user.target.wants/foo.service</filename>
+      <filename>/etc/systemd/system/multi-user.target.wants/foo.service</filename>
       linking to the actual unit will be created. It tells systemd to
       pull in the unit when starting
       <filename>multi-user.target</filename>. The inverse
@@ -1309,11 +1309,11 @@ ExecStart=/usr/sbin/foo-daemon
 
       <para>There are two methods of overriding vendor settings in
       unit files: copying the unit file from
-      <filename>&rootlibexecdir;/system</filename> to
-      <filename>&pkgsysconfdir;/system</filename> and modifying the
+      <filename>/usr/lib/systemd/system</filename> to
+      <filename>/etc/systemd/system</filename> and modifying the
       chosen settings. Alternatively, one can create a directory named
       <filename><replaceable>unit</replaceable>.d/</filename> within
-      <filename>&pkgsysconfdir;/system</filename> and place a drop-in
+      <filename>/etc/systemd/system</filename> and place a drop-in
       file <filename><replaceable>name</replaceable>.conf</filename>
       there that only changes the specific settings one is interested
       in. Note that multiple such drop-in files are read if
@@ -1343,7 +1343,7 @@ ExecStart=/usr/sbin/foo-daemon
       load paths for further details.</para>
 
       <para>Suppose there is a vendor-supplied unit
-      <filename>&rootlibexecdir;/system/httpd.service</filename> with
+      <filename>/usr/lib/systemd/system/httpd.service</filename> with
       the following contents:</para>
 
       <programlisting>[Unit]
@@ -1375,7 +1375,7 @@ WantedBy=multi-user.target</programlisting>
       the niceness of the service to its default value of 0.</para>
 
       <para>The first possibility is to copy the unit file to
-      <filename>&pkgsysconfdir;/system/httpd.service</filename> and
+      <filename>/etc/systemd/system/httpd.service</filename> and
       change the chosen settings:</para>
 
       <programlisting>[Unit]
@@ -1395,7 +1395,7 @@ WantedBy=multi-user.target</programlisting>
 
       <para>Alternatively, the administrator could create a drop-in
       file
-      <filename>&pkgsysconfdir;/system/httpd.service.d/local.conf</filename>
+      <filename>/etc/systemd/system/httpd.service.d/local.conf</filename>
       with the following contents:</para>
 
       <programlisting>[Unit]

diff --git a/man/systemd.xml b/man/systemd.xml
index 5fa65a363162173d2c6366b4e636d256231ede9d..4556d56969c9632c64d592781a93dd39af7f6edf 100644 (file)
--- a/man/systemd.xml
+++ b/man/systemd.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.
@@ -441,7 +438,7 @@
         by <command>pkg-config systemd
         --variable=systemdsystemunitdir</command>. Other directories
         checked are <filename>/usr/local/lib/systemd/system</filename>
-        and <filename>&rootlibexecdir;/system</filename>. User
+        and <filename>/usr/lib/systemd/system</filename>. User
         configuration always takes precedence. <command>pkg-config
         systemd --variable=systemdsystemconfdir</command> returns the
         path of the system configuration directory. Packages should

diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml
index 3085f3dd01c8cd4b42b9d46469dd7ea135ede7c2..99aa07a1ccb1f9d76822aab145b8e233ad940805 100644 (file)
--- a/man/sysusers.d.xml
+++ b/man/sysusers.d.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 

diff --git a/man/telinit.xml b/man/telinit.xml
index ec7e8eace48e2e52a5722eabb2481ea4651de9fa..02d31fbd464e0250d546c7478b110cbd2c385bc0 100644 (file)
--- a/man/telinit.xml
+++ b/man/telinit.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.

diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index d7bd052eff719331b4efe95a93d23c362b8d3abf..2d42b41d5e9c1df455fbe80b8cb4604950ee7c88 100644 (file)
--- a/man/timedatectl.xml
+++ b/man/timedatectl.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.
@@ -213,13 +210,13 @@ Password: ********
 
     <programlisting>$ systemctl status systemd-timesyncd.service
 ● systemd-timesyncd.service - Network Time Synchronization
-   Loaded: loaded (&rootlibexecdir;/system/systemd-timesyncd.service; enabled)
+   Loaded: loaded (/usr/lib/systemd/system/systemd-timesyncd.service; enabled)
    Active: active (running) since Mo 2015-03-30 14:20:38 CEST; 5s ago
      Docs: man:systemd-timesyncd.service(8)
  Main PID: 595 (systemd-timesyn)
    Status: "Using Time Server 216.239.38.15:123 (time4.google.com)."
    CGroup: /system.slice/systemd-timesyncd.service
-           └─595 &rootlibexecdir;/systemd-timesyncd
+           └─595 /usr/lib/systemd/systemd-timesyncd
 ...</programlisting>
     </para>
   </refsect1>

diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
index ee054f9ef106fe4d712e8edce928a033a5e8120c..c883685c97e0599d56687eb3f1146c31f26eaf48 100644 (file)
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.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.
@@ -52,10 +49,10 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>&pkgsysconfdir;/timesyncd.conf</filename></para>
-    <para><filename>&pkgsysconfdir;/timesyncd.conf.d/*.conf</filename></para>
+    <para><filename>/etc/systemd/timesyncd.conf</filename></para>
+    <para><filename>/etc/systemd/timesyncd.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/timesyncd.conf.d/*.conf</filename></para>
-    <para><filename>&rootlibexecdir;/timesyncd.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/timesyncd.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index c37de652296fc693f72c989787e0cb322badd3f1..8d3ed37ae3f628cba2ef25d513e7c777f1668b36 100644 (file)
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.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;
-]>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   This file is part of systemd.
 

diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index a10cc3cebee9dc4a37b718d36cde5ba49a6d88a2..e104e53f5db5cd03437be1deb2ca698d7e36eacd 100644 (file)
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!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.

diff --git a/man/udev.xml b/man/udev.xml
index 70f4f59c08748d6dda22251f0831a564c56ad8e1..4c2e13ee7bb65d92cfaba169f3075a572ba5b952 100644 (file)
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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">
 
 <refentry id="udev">
   <refentryinfo>
@@ -58,17 +55,17 @@
 
   <refsect1><title>Rules Files</title>
       <para>The udev rules are read from the files located in the
-      system rules directory <filename>&udevlibexecdir;/rules.d</filename>,
+      system rules directory <filename>/usr/lib/udev/rules.d</filename>,
       the volatile runtime directory <filename>/run/udev/rules.d</filename>
       and the local administration directory <filename>/etc/udev/rules.d</filename>.
       All rules 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
+      over files with the same name in <filename>/usr/lib</filename>. This can be
       used to override a system-supplied rules file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a rules file in
-      <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>,
+      <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
       disables the rules file entirely. Rule files must have the extension
       <filename>.rules</filename>; other extensions are ignored.</para>
 
@@ -424,7 +421,7 @@
                 <listitem>
                   <para>Execute an external program specified as the assigned
                   value. If no absolute path is given, the program is expected
-                  to live in <filename>&udevlibexecdir;</filename>; otherwise, the
+                  to live in <filename>/usr/lib/udev</filename>; otherwise, the
                   absolute path must be specified.</para>
                   <para>This is the default if no <replaceable>type</replaceable>
                   is specified.</para>

diff --git a/man/udevadm.xml b/man/udevadm.xml
index c7ef7279c9abc3771f6686f2423f6380c9897fb5..8ef9e23aa2a6cc940941b22bc9072a2ff56cc9e3 100644 (file)
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!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">
 
 <refentry id="udevadm">
   <refentryinfo>

diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 1e415ddd4cf62b3abc4a677187d26a0884a37a02..8616c5424954e91137decd1b72acf17fc03ad214 100644 (file)
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
 <variablelist>
   <varlistentry id='user'>

diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index 1c3bdd2e54a9606a8d37d3f2d2e028a3b860a4c0..27196d44e9140795eba54252b642d820aeb96ce6 100644 (file)
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.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.