valeriyvdovin / rpms / systemd

Forked from rpms/systemd 4 years ago
Clone

Blame SOURCES/0102-man-fix-a-bunch-of-links.patch

803fb7
From a0def1365a2c50f7e1d4ec14c104bfe5cbd8bf8a Mon Sep 17 00:00:00 2001
803fb7
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
803fb7
Date: Fri, 13 Mar 2015 21:22:39 -0500
803fb7
Subject: [PATCH] man: fix a bunch of links
803fb7
803fb7
All hail linkchecker!
803fb7
803fb7
(cherry picked from commit 3ba3a79df4ae094d1008c04a9af8d1ff970124c4)
803fb7
803fb7
Conflicts:
803fb7
	man/systemd-efi-boot-generator.xml
803fb7
---
803fb7
 man/busctl.xml                             |  4 ++--
803fb7
 man/crypttab.xml                           | 20 +++++++++----------
803fb7
 man/file-hierarchy.xml                     |  2 +-
803fb7
 man/kernel-command-line.xml                |  2 +-
803fb7
 man/locale.conf.xml                        |  8 ++++----
803fb7
 man/localectl.xml                          |  8 ++++----
803fb7
 man/logind.conf.xml                        |  2 +-
803fb7
 man/machine-id.xml                         |  4 ++--
803fb7
 man/modules-load.d.xml                     |  2 +-
803fb7
 man/os-release.xml                         |  2 +-
803fb7
 man/sd_bus_message_append.xml              |  2 +-
803fb7
 man/sd_bus_open_user.xml                   |  2 +-
803fb7
 man/sd_event_add_signal.xml                |  4 ++--
803fb7
 man/sd_journal_get_catalog.xml             |  2 +-
803fb7
 man/sd_journal_get_cursor.xml              |  2 +-
803fb7
 man/sd_journal_print.xml                   | 14 ++++++-------
803fb7
 man/sysctl.d.xml                           |  8 ++++----
803fb7
 man/systemctl.xml                          |  6 +++---
803fb7
 man/systemd-activate.xml                   |  2 +-
803fb7
 man/systemd-analyze.xml                    |  4 ++--
803fb7
 man/systemd-cat.xml                        |  2 +-
803fb7
 man/systemd-cryptsetup-generator.xml       |  2 +-
803fb7
 man/systemd-cryptsetup@.service.xml        |  2 +-
803fb7
 man/systemd-efi-boot-generator.xml         |  4 ++--
803fb7
 man/systemd-firstboot.xml                  | 14 ++++++-------
803fb7
 man/systemd-fstab-generator.xml            |  4 ++--
803fb7
 man/systemd-gpt-auto-generator.xml         |  8 ++++----
803fb7
 man/systemd-hibernate-resume-generator.xml |  2 +-
803fb7
 man/systemd-journald.service.xml           |  2 +-
803fb7
 man/systemd-localed.service.xml            |  8 ++++----
803fb7
 man/systemd-nspawn.xml                     |  4 ++--
803fb7
 man/systemd-quotacheck.service.xml         |  2 +-
803fb7
 man/systemd-remount-fs.service.xml         |  6 +++---
803fb7
 man/systemd-socket-proxyd.xml              |  8 ++++----
803fb7
 man/systemd-sysctl.service.xml             |  8 ++++----
803fb7
 man/systemd-system.conf.xml                |  2 +-
803fb7
 man/systemd-update-utmp.service.xml        |  2 +-
803fb7
 man/systemd-vconsole-setup.service.xml     |  8 ++++----
803fb7
 man/systemd.automount.xml                  |  6 +++---
803fb7
 man/systemd.exec.xml                       | 16 +++++++--------
803fb7
 man/systemd.generator.xml                  |  2 +-
803fb7
 man/systemd.journal-fields.xml             |  2 +-
803fb7
 man/systemd.kill.xml                       |  4 ++--
803fb7
 man/systemd.mount.xml                      | 14 ++++++-------
803fb7
 man/systemd.network.xml                    |  8 ++++----
803fb7
 man/systemd.path.xml                       |  4 ++--
803fb7
 man/systemd.socket.xml                     | 32 +++++++++++++++---------------
803fb7
 man/systemd.swap.xml                       | 10 +++++-----
803fb7
 man/systemd.unit.xml                       |  4 ++--
803fb7
 man/systemd.xml                            |  6 +++---
803fb7
 man/vconsole.conf.xml                      |  6 +++---
803fb7
 51 files changed, 151 insertions(+), 151 deletions(-)
803fb7
803fb7
diff --git a/man/busctl.xml b/man/busctl.xml
803fb7
index 251233bb9..cc1844b0a 100644
803fb7
--- a/man/busctl.xml
803fb7
+++ b/man/busctl.xml
803fb7
@@ -288,7 +288,7 @@
803fb7
         url="http://wiki.wireshark.org/Development/LibpcapFileFormat">Libpcap
803fb7
         File Format</ulink> description. Make sure to redirect the
803fb7
         output to STDOUT to a file. Tools like
803fb7
-        <citerefentry><refentrytitle>wireshark</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>wireshark</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
         may be used to dissect and view the generated
803fb7
         files.</para></listitem>
803fb7
       </varlistentry>
803fb7
@@ -472,7 +472,7 @@ o "/org/freedesktop/systemd1/job/42684"</programlisting>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>wireshark</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+      <citerefentry project='die-net'><refentrytitle>wireshark</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 </refentry>
803fb7
diff --git a/man/crypttab.xml b/man/crypttab.xml
803fb7
index aeacc5797..3e249ad23 100644
803fb7
--- a/man/crypttab.xml
803fb7
+++ b/man/crypttab.xml
803fb7
@@ -75,7 +75,7 @@
803fb7
 
803fb7
     <para>Setting up encrypted block devices using this file supports
803fb7
     three encryption modes: LUKS, TrueCrypt and plain. See
803fb7
-    <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+    <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     for more information about each mode. When no mode is specified in
803fb7
     the options field and the block device contains a LUKS signature,
803fb7
     it is opened as a LUKS device; otherwise, it is assumed to be in
803fb7
@@ -117,7 +117,7 @@
803fb7
         <term><option>cipher=</option></term>
803fb7
 
803fb7
         <listitem><para>Specifies the cipher to use. See
803fb7
-        <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for possible values and the default value of this option. A
803fb7
         cipher with unpredictable IV values, such as
803fb7
         <literal>aes-cbc-essiv:sha256</literal>, is
803fb7
@@ -129,7 +129,7 @@
803fb7
 
803fb7
         <listitem><para>Specifies the hash to use for password
803fb7
         hashing. See
803fb7
-        <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for possible values and the default value of this
803fb7
         option.</para></listitem>
803fb7
       </varlistentry>
803fb7
@@ -140,7 +140,7 @@
803fb7
         <listitem><para>Use a detached (separated) metadata device or
803fb7
         file where the LUKS header is stored. This option is only
803fb7
         relevant for LUKS devices. See
803fb7
-        <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for possible values and the default value of this
803fb7
         option.</para></listitem>
803fb7
       </varlistentry>
803fb7
@@ -150,7 +150,7 @@
803fb7
 
803fb7
         <listitem><para>Specifies the number of bytes to skip at the
803fb7
         start of the key file. See
803fb7
-        <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for possible values and the default value of this
803fb7
         option.</para></listitem>
803fb7
       </varlistentry>
803fb7
@@ -160,7 +160,7 @@
803fb7
 
803fb7
         <listitem><para>Specifies the maximum number of bytes to read
803fb7
         from the key file. See
803fb7
-        <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for possible values and the default value of this option. This
803fb7
         option is ignored in plain encryption mode, as the key file
803fb7
         size is then given by the key size.</para></listitem>
803fb7
@@ -174,7 +174,7 @@
803fb7
         given passphrase or key, but another would, the setup of the
803fb7
         device will fail regardless. This option implies
803fb7
         <option>luks</option>. See
803fb7
-        <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for possible values. The default is to try all key slots in
803fb7
         sequential order.</para></listitem>
803fb7
       </varlistentry>
803fb7
@@ -221,7 +221,7 @@
803fb7
         <term><option>size=</option></term>
803fb7
 
803fb7
         <listitem><para>Specifies the key size in bits. See
803fb7
-        <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for possible values and the default value of this
803fb7
         option.</para></listitem>
803fb7
       </varlistentry>
803fb7
@@ -278,7 +278,7 @@
803fb7
         volume provided in the second field. Please note that there is
803fb7
         no protection for the hidden volume if the outer volume is
803fb7
         mounted instead. See
803fb7
-        <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for more information on this limitation.</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -383,7 +383,7 @@ hidden     /mnt/tc_hidden  /dev/null    tcrypt-hidden,tcrypt-keyfile=/etc/keyfil
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry project='man-pages'><refentrytitle>mkswap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry project='man-pages'><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     </para>
803fb7
diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml
803fb7
index e9c894f5c..364e13079 100644
803fb7
--- a/man/file-hierarchy.xml
803fb7
+++ b/man/file-hierarchy.xml
803fb7
@@ -397,7 +397,7 @@
803fb7
         <term><filename>/dev/shm</filename></term>
803fb7
         <listitem><para>Place for POSIX shared memory segments, as
803fb7
         created via
803fb7
-        <citerefentry><refentrytitle>shm_open</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
+        <citerefentry project='die-net'><refentrytitle>shm_open</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
         This directory is flushed on boot, and is a
803fb7
         <literal>tmpfs</literal> file system. Since all users have
803fb7
         write access to this directory, special care should be taken
803fb7
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
803fb7
index 3741cf9cc..919bd1374 100644
803fb7
--- a/man/kernel-command-line.xml
803fb7
+++ b/man/kernel-command-line.xml
803fb7
@@ -336,7 +336,7 @@
803fb7
         <listitem>
803fb7
           <para>Enables resume from hibernation using the specified
803fb7
           device. All
803fb7
-          <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>-like
803fb7
+          <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>-like
803fb7
           paths are supported. For details, see
803fb7
           <citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
803fb7
         </listitem>
803fb7
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
803fb7
index 48c0006db..2c32d1609 100644
803fb7
--- a/man/locale.conf.xml
803fb7
+++ b/man/locale.conf.xml
803fb7
@@ -91,7 +91,7 @@
803fb7
     might be checked for locale configuration as well, however only as
803fb7
     fallback.</para>
803fb7
 
803fb7
-    <para><citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+    <para><citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     may be used to alter the settings in this file during runtime from
803fb7
     the command line. Use
803fb7
     <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
@@ -121,7 +121,7 @@
803fb7
     Note that <varname>LC_ALL</varname> may not be configured in this
803fb7
     file. For details about the meaning and semantics of these
803fb7
     settings, refer to
803fb7
-    <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
803fb7
   </refsect1>
803fb7
 
803fb7
   <refsect1>
803fb7
@@ -142,8 +142,8 @@ LC_MESSAGES=en_US.UTF-8</programlisting>
803fb7
       <title>See Also</title>
803fb7
       <para>
803fb7
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='man-pages'><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
       </para>
803fb7
diff --git a/man/localectl.xml b/man/localectl.xml
803fb7
index aae6e0629..7def047f6 100644
803fb7
--- a/man/localectl.xml
803fb7
+++ b/man/localectl.xml
803fb7
@@ -124,7 +124,7 @@
803fb7
         <listitem><para>Set the system locale. This takes one or more
803fb7
         assignments such as "LANG=de_DE.utf8",
803fb7
         "LC_MESSAGES=en_GB.utf8", and so on. See
803fb7
-        <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         for details on the available settings and their meanings. Use
803fb7
         <command>list-locales</command> for a list of available
803fb7
         locales (see below). </para></listitem>
803fb7
@@ -204,10 +204,10 @@
803fb7
     <title>See Also</title>
803fb7
     <para>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='mankier'><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>kbd</refentrytitle><manvolnum>4</manvolnum></citerefentry>,
803fb7
       <ulink url="http://www.x.org/releases/current/doc/xorg-docs/input/XKB-Config.html">
803fb7
         The XKB Configuration Guide
803fb7
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
803fb7
index ca2b18783..d02d57356 100644
803fb7
--- a/man/logind.conf.xml
803fb7
+++ b/man/logind.conf.xml
803fb7
@@ -126,7 +126,7 @@
803fb7
 
803fb7
         <para>Note that setting <varname>KillUserProcesses=1</varname>
803fb7
         will break tools like
803fb7
-        <citerefentry><refentrytitle>screen</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para></listitem>
803fb7
+        <citerefentry project='die-net'><refentrytitle>screen</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
       <varlistentry>
803fb7
diff --git a/man/machine-id.xml b/man/machine-id.xml
803fb7
index 83e0b26ce..92d67a386 100644
803fb7
--- a/man/machine-id.xml
803fb7
+++ b/man/machine-id.xml
803fb7
@@ -75,7 +75,7 @@
803fb7
     globally unique ID in the network, which does not change even if
803fb7
     the local network configuration changes. Due to this and its
803fb7
     greater length, it is a more useful replacement for the
803fb7
-    <citerefentry><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
     call that POSIX specifies.</para>
803fb7
 
803fb7
     <para>The
803fb7
@@ -127,7 +127,7 @@ id[8] = (id[8] & 0x3F) | 0x80;</programlisting>
803fb7
       <para>
803fb7
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='man-pages'><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
803fb7
index 34a937db6..4b722aa12 100644
803fb7
--- a/man/modules-load.d.xml
803fb7
+++ b/man/modules-load.d.xml
803fb7
@@ -94,7 +94,7 @@ virtio-net</programlisting>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-modules-load.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>modprobe</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>modprobe</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/os-release.xml b/man/os-release.xml
803fb7
index 1b71a49d0..8f4ab10fe 100644
803fb7
--- a/man/os-release.xml
803fb7
+++ b/man/os-release.xml
803fb7
@@ -316,7 +316,7 @@ BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting>
803fb7
       <title>See Also</title>
803fb7
       <para>
803fb7
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>lsb_release</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='die-net'><refentrytitle>lsb_release</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
803fb7
index 0c49a0c7c..11fa07c63 100644
803fb7
--- a/man/sd_bus_message_append.xml
803fb7
+++ b/man/sd_bus_message_append.xml
803fb7
@@ -245,7 +245,7 @@ sd_bus_message_append(m, "ynqiuxtd", y, n, q, i, u, x, t, d);</programlisting>
803fb7
       <citerefentry><refentrytitle>sd_bus_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>sd_bus_ref</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>sd_bus_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     </para>
803fb7
diff --git a/man/sd_bus_open_user.xml b/man/sd_bus_open_user.xml
803fb7
index e7a765962..2bbb01069 100644
803fb7
--- a/man/sd_bus_open_user.xml
803fb7
+++ b/man/sd_bus_open_user.xml
803fb7
@@ -208,7 +208,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
803fb7
       <citerefentry><refentrytitle>sd_bus_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>sd_bus_ref</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>sd_bus_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     </para>
803fb7
diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml
803fb7
index 0299aa5a5..7c8df7df8 100644
803fb7
--- a/man/sd_event_add_signal.xml
803fb7
+++ b/man/sd_event_add_signal.xml
803fb7
@@ -86,7 +86,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
803fb7
     the <parameter>source</parameter> parameter. The
803fb7
     <parameter>signal</parameter> parameter specifies the signal to be handled
803fb7
     (see
803fb7
-    <citerefentry><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>).
803fb7
+    <citerefentry project='man-pages'><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>).
803fb7
     The <parameter>handler</parameter> must reference a function to
803fb7
     call when the signal is delivered or be <constant>NULL</constant>.
803fb7
     The handler function will be passed the
803fb7
@@ -94,7 +94,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
803fb7
     freely by the caller. The handler also receives a pointer to a
803fb7
     <structname>const struct signalfd_siginfo</structname> containing
803fb7
     the information about the received signal. See
803fb7
-    <citerefentry><refentrytitle>signalfd</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>signalfd</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
     for further information.</para>
803fb7
 
803fb7
     <para>Only a single handler may be installed for a specific
803fb7
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
803fb7
index 1dcbadd18..c19eb11b2 100644
803fb7
--- a/man/sd_journal_get_catalog.xml
803fb7
+++ b/man/sd_journal_get_catalog.xml
803fb7
@@ -130,7 +130,7 @@
803fb7
       <citerefentry><refentrytitle>sd_journal_open</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>sd_journal_next</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>sd_journal_get_data</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>malloc</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>malloc</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
803fb7
index 2b7f443f2..a400d8b1b 100644
803fb7
--- a/man/sd_journal_get_cursor.xml
803fb7
+++ b/man/sd_journal_get_cursor.xml
803fb7
@@ -84,7 +84,7 @@
803fb7
     time) available entry. The call takes two arguments: a journal
803fb7
     context object and a pointer to a string pointer where the cursor
803fb7
     string will be placed. The string is allocated via libc
803fb7
-    <citerefentry><refentrytitle>malloc</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>malloc</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
     and should be freed after use with
803fb7
     <citerefentry project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
803fb7
 
803fb7
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
803fb7
index 068b10e7c..0cd0b45b9 100644
803fb7
--- a/man/sd_journal_print.xml
803fb7
+++ b/man/sd_journal_print.xml
803fb7
@@ -119,7 +119,7 @@
803fb7
     <function>sd_journal_print()</function> but takes a variable
803fb7
     argument list encapsulated in an object of type
803fb7
     <varname>va_list</varname> (see
803fb7
-    <citerefentry><refentrytitle>stdarg</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>stdarg</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
     for more information) instead of the format string. It is
803fb7
     otherwise equivalent in behavior.</para>
803fb7
 
803fb7
@@ -145,7 +145,7 @@
803fb7
     <function>sd_journal_send()</function> but takes an array of
803fb7
     <varname>struct iovec</varname> (as defined in
803fb7
     <filename>uio.h</filename>, see
803fb7
-    <citerefentry><refentrytitle>readv</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>readv</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
     for details) instead of the format string. Each structure should
803fb7
     reference one field of the entry to submit. The second argument
803fb7
     specifies the number of structures in the array.
803fb7
@@ -154,7 +154,7 @@
803fb7
     necessary.</para>
803fb7
 
803fb7
     <para><function>sd_journal_perror()</function> is a similar to
803fb7
-    <citerefentry><refentrytitle>perror</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
+    <citerefentry project='die-net'><refentrytitle>perror</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
     and writes a message to the journal that consists of the passed
803fb7
     string, suffixed with ": " and a human readable representation of
803fb7
     the current error code stored in
803fb7
@@ -219,7 +219,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
803fb7
     <title>Async signal safety</title>
803fb7
     <para><function>sd_journal_sendv()</function> is "async signal
803fb7
     safe" in the meaning of
803fb7
-    <citerefentry><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
803fb7
+    <citerefentry project='man-pages'><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
803fb7
     </para>
803fb7
 
803fb7
     <para><function>sd_journal_print</function>,
803fb7
@@ -249,11 +249,11 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
803fb7
       <citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>sd_journal_stream_fd</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>perror</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>perror</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
803fb7
index 5a35cfe2c..8a131791a 100644
803fb7
--- a/man/sysctl.d.xml
803fb7
+++ b/man/sysctl.d.xml
803fb7
@@ -57,7 +57,7 @@
803fb7
     <para>At boot,
803fb7
     <citerefentry><refentrytitle>systemd-sysctl.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     reads configuration files from the above directories to configure
803fb7
-    <citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     kernel parameters.</para>
803fb7
   </refsect1>
803fb7
 
803fb7
@@ -162,9 +162,9 @@ net.bridge.bridge-nf-call-arptables = 0
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-sysctl.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>sysctl.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>modprobe</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>sysctl.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>modprobe</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemctl.xml b/man/systemctl.xml
803fb7
index 6f30474c3..07eb43165 100644
803fb7
--- a/man/systemctl.xml
803fb7
+++ b/man/systemctl.xml
803fb7
@@ -1703,9 +1703,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
803fb7
         <varname>$VISUAL</varname> are present or if it is set to an empty
803fb7
         string or if their execution failed, systemctl will try to execute well
803fb7
         known editors in this order:
803fb7
-        <citerefentry><refentrytitle>nano</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>vim</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
803fb7
+        <citerefentry project='die-net'><refentrytitle>nano</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='die-net'><refentrytitle>vim</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='die-net'><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
803fb7
         </para></listitem>
803fb7
       </varlistentry>
803fb7
     </variablelist>
803fb7
diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
803fb7
index e64894a28..cb68a79be 100644
803fb7
--- a/man/systemd-activate.xml
803fb7
+++ b/man/systemd-activate.xml
803fb7
@@ -165,7 +165,7 @@
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>cat</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>cat</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 </refentry>
803fb7
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
803fb7
index 1ff81d3d5..198315052 100644
803fb7
--- a/man/systemd-analyze.xml
803fb7
+++ b/man/systemd-analyze.xml
803fb7
@@ -145,7 +145,7 @@
803fb7
     <para><command>systemd-analyze dot</command> generates textual
803fb7
     dependency graph description in dot format for further processing
803fb7
     with the GraphViz
803fb7
-    <citerefentry><refentrytitle>dot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+    <citerefentry project='die-net'><refentrytitle>dot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     tool. Use a command line like <command>systemd-analyze dot | dot
803fb7
     -Tsvg > systemd.svg</command> to generate a graphical dependency
803fb7
     tree. Unless <option>--order</option> or
803fb7
@@ -229,7 +229,7 @@
803fb7
         <command>dot</command> command (see above), this selects which
803fb7
         relationships are shown in the dependency graph. Both options
803fb7
         require a
803fb7
-        <citerefentry><refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         pattern as an argument, which will be matched against the
803fb7
         left-hand and the right-hand, respectively, nodes of a
803fb7
         relationship.</para>
803fb7
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
803fb7
index 38ddf66d2..9b1a8809d 100644
803fb7
--- a/man/systemd-cat.xml
803fb7
+++ b/man/systemd-cat.xml
803fb7
@@ -171,7 +171,7 @@
803fb7
     <para>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>logger</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>logger</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
803fb7
index 1974cd7a2..b6270358e 100644
803fb7
--- a/man/systemd-cryptsetup-generator.xml
803fb7
+++ b/man/systemd-cryptsetup-generator.xml
803fb7
@@ -185,7 +185,7 @@
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
diff --git a/man/systemd-cryptsetup@.service.xml b/man/systemd-cryptsetup@.service.xml
803fb7
index bd03637de..ea524851e 100644
803fb7
--- a/man/systemd-cryptsetup@.service.xml
803fb7
+++ b/man/systemd-cryptsetup@.service.xml
803fb7
@@ -78,7 +78,7 @@
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+      <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
      </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml
803fb7
index fd7ba7983..3431c3ce5 100644
803fb7
--- a/man/systemd-efi-boot-generator.xml
803fb7
+++ b/man/systemd-efi-boot-generator.xml
803fb7
@@ -62,7 +62,7 @@
803fb7
     does not communicate the used ESP to the OS, on systems where
803fb7
     <filename>/boot</filename> is an explicitly configured mount (for
803fb7
     example, listed in
803fb7
-    <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
803fb7
+    <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
803fb7
     or where the <filename>/boot</filename> mount point is non-empty.
803fb7
     Since this generator creates an automount unit, the mount will
803fb7
     only be activated on-demand, when accessed.</para>
803fb7
@@ -79,7 +79,7 @@
803fb7
       <citerefentry><refentrytitle>systemd.automount</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>gummiboot</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml
803fb7
index 67d38ba31..67289daa2 100644
803fb7
--- a/man/systemd-firstboot.xml
803fb7
+++ b/man/systemd-firstboot.xml
803fb7
@@ -91,7 +91,7 @@
803fb7
 
803fb7
     <para>Note that this tool operates directly on the file system and
803fb7
     does not involve any running system services, unlike
803fb7
-    <citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+    <citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
     <citerefentry><refentrytitle>timedatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     or
803fb7
     <citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
803fb7
@@ -125,7 +125,7 @@
803fb7
         <varname>LANG=</varname> and <varname>LC_MESSAGES</varname>
803fb7
         settings. The argument should be a valid locale identifier,
803fb7
         such as <literal>de_DE.UTF-8</literal>. This controls the
803fb7
-        <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
         configuration file.</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -163,7 +163,7 @@
803fb7
 
803fb7
         <listitem><para>Sets the password of the system's root user.
803fb7
         This creates a
803fb7
-        <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
         file. This setting exists in two forms:
803fb7
         <option>--root-password=</option> accepts the password to set
803fb7
         directly on the command line,
803fb7
@@ -171,7 +171,7 @@
803fb7
         Note that it is not recommended specifying passwords on the
803fb7
         command line as other users might be able to see them simply
803fb7
         by invoking
803fb7
-        <citerefentry><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para></listitem>
803fb7
+        <citerefentry project='die-net'><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
       <varlistentry>
803fb7
@@ -244,13 +244,13 @@
803fb7
     <title>See Also</title>
803fb7
     <para>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>localtime</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>timedatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     </para>
803fb7
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
803fb7
index 022efb413..bdc2dc1d0 100644
803fb7
--- a/man/systemd-fstab-generator.xml
803fb7
+++ b/man/systemd-fstab-generator.xml
803fb7
@@ -54,7 +54,7 @@
803fb7
 
803fb7
     <para><filename>systemd-fstab-generator</filename> is a generator
803fb7
     that translates <filename>/etc/fstab</filename> (see
803fb7
-    <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
     for details) into native systemd units early at boot and when
803fb7
     configuration of the system manager is reloaded. This will
803fb7
     instantiate mount and swap units as necessary.</para>
803fb7
@@ -173,7 +173,7 @@
803fb7
     <title>See Also</title>
803fb7
     <para>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd.swap</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
803fb7
index 8d2eaca4f..bcc64ec9b 100644
803fb7
--- a/man/systemd-gpt-auto-generator.xml
803fb7
+++ b/man/systemd-gpt-auto-generator.xml
803fb7
@@ -66,7 +66,7 @@
803fb7
     Partitions Specification</ulink>. Note that this generator has no
803fb7
     effect on non-GPT systems, on systems where the units are
803fb7
     explicitly configured (for example, listed in
803fb7
-    <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>),
803fb7
+    <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>),
803fb7
     or where the mount points are non-empty.</para>
803fb7
 
803fb7
     <para>This generator will only look for root partitions on the
803fb7
@@ -169,9 +169,9 @@
803fb7
       <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-efi-boot-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+      <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml
803fb7
index a21782cbf..d811b9b55 100644
803fb7
--- a/man/systemd-hibernate-resume-generator.xml
803fb7
+++ b/man/systemd-hibernate-resume-generator.xml
803fb7
@@ -73,7 +73,7 @@
803fb7
         <listitem><para>Takes a path to the resume device. Both
803fb7
         persistent block device paths like
803fb7
         <filename>/dev/disk/by-foo/bar</filename> and
803fb7
-        <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>-style
803fb7
+        <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>-style
803fb7
         specifiers like <literal>FOO=bar</literal> are
803fb7
         supported.</para></listitem>
803fb7
       </varlistentry>
803fb7
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
803fb7
index 6b250b65e..8280d6c87 100644
803fb7
--- a/man/systemd-journald.service.xml
803fb7
+++ b/man/systemd-journald.service.xml
803fb7
@@ -241,7 +241,7 @@
803fb7
       <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-coredump</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>setfacl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>setfacl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>sd_journal_print</refentrytitle><manvolnum>4</manvolnum></citerefentry>,
803fb7
       <command>pydoc systemd.journal</command>.
803fb7
     </para>
803fb7
diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
803fb7
index 899916638..06aa78c0e 100644
803fb7
--- a/man/systemd-localed.service.xml
803fb7
+++ b/man/systemd-localed.service.xml
803fb7
@@ -64,7 +64,7 @@
803fb7
     unused.</para>
803fb7
 
803fb7
     <para>The tool
803fb7
-    <citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     is a command line client to this service.</para>
803fb7
 
803fb7
     <para>See the 
803fb7
@@ -77,10 +77,10 @@
803fb7
     <title>See Also</title>
803fb7
     <para>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='mankier'><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
803fb7
index 4a936d326..65b4c2f29 100644
803fb7
--- a/man/systemd-nspawn.xml
803fb7
+++ b/man/systemd-nspawn.xml
803fb7
@@ -598,7 +598,7 @@
803fb7
 
803fb7
         <listitem><para>Control the architecture ("personality")
803fb7
         reported by
803fb7
-        <citerefentry><refentrytitle>uname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>uname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
         in the container. Currently, only <literal>x86</literal> and
803fb7
         <literal>x86-64</literal> are supported. This is useful when
803fb7
         running a 32-bit container on a 64-bit host. If this setting
803fb7
@@ -735,7 +735,7 @@
803fb7
       <citerefentry project='archlinux'><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd-quotacheck.service.xml b/man/systemd-quotacheck.service.xml
803fb7
index 2179f11e9..9d4976274 100644
803fb7
--- a/man/systemd-quotacheck.service.xml
803fb7
+++ b/man/systemd-quotacheck.service.xml
803fb7
@@ -86,7 +86,7 @@
803fb7
     <title>See Also</title>
803fb7
     <para>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>quotacheck</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>quotacheck</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-fsck@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml
803fb7
index 7b88ac3f3..8e60e31b5 100644
803fb7
--- a/man/systemd-remount-fs.service.xml
803fb7
+++ b/man/systemd-remount-fs.service.xml
803fb7
@@ -56,7 +56,7 @@
803fb7
 
803fb7
     <para><filename>systemd-remount-fs.service</filename> is an
803fb7
     early-boot service that applies mount options listed in
803fb7
-    <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
     to the root file system, the <filename>/usr</filename> file system
803fb7
     and the kernel API file systems. This is required so that the
803fb7
     mount options of these file systems -- which are pre-mounted by
803fb7
@@ -80,8 +80,8 @@
803fb7
     <title>See Also</title>
803fb7
     <para>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml
803fb7
index 1c78b656e..0b852e6bc 100644
803fb7
--- a/man/systemd-socket-proxyd.xml
803fb7
+++ b/man/systemd-socket-proxyd.xml
803fb7
@@ -72,7 +72,7 @@
803fb7
     to a configured server for each client, and then bidirectionally
803fb7
     forwards data between the two.</para>
803fb7
     <para>This utility's behavior is similar to
803fb7
-    <citerefentry><refentrytitle>socat</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
803fb7
+    <citerefentry project='die-net'><refentrytitle>socat</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
803fb7
     The main differences for <command>systemd-socket-proxyd</command>
803fb7
     are support for socket activation with
803fb7
     <literal>Accept=false</literal> and an event-driven
803fb7
@@ -183,9 +183,9 @@ $ curl http://localhost:80/]]></programlisting>
803fb7
       <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>socat</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>nginx</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>curl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+      <citerefentry project='die-net'><refentrytitle>socat</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>nginx</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>curl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 </refentry>
803fb7
diff --git a/man/systemd-sysctl.service.xml b/man/systemd-sysctl.service.xml
803fb7
index f35a18a4d..d4c1a7ebe 100644
803fb7
--- a/man/systemd-sysctl.service.xml
803fb7
+++ b/man/systemd-sysctl.service.xml
803fb7
@@ -56,11 +56,11 @@
803fb7
 
803fb7
     <para><filename>systemd-sysctl.service</filename> is an early-boot
803fb7
     service that configures
803fb7
-    <citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     kernel parameters.</para>
803fb7
 
803fb7
     <para>See
803fb7
-    <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
     for information about the configuration of this service.</para>
803fb7
   </refsect1>
803fb7
 
803fb7
@@ -68,8 +68,8 @@
803fb7
     <title>See Also</title>
803fb7
     <para>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
803fb7
index c7bcfaee4..1b74ed38f 100644
803fb7
--- a/man/systemd-system.conf.xml
803fb7
+++ b/man/systemd-system.conf.xml
803fb7
@@ -172,7 +172,7 @@
803fb7
         <citerefentry project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         for details. Takes a whitespace-separated list of capability
803fb7
         names as read by
803fb7
-        <citerefentry><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
+        <citerefentry project='mankier'><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
         Capabilities listed will be included in the bounding set, all
803fb7
         others are removed. If the list of capabilities is prefixed
803fb7
         with ~, all but the listed capabilities will be included, the
803fb7
diff --git a/man/systemd-update-utmp.service.xml b/man/systemd-update-utmp.service.xml
803fb7
index b842d2972..c8a9cb7c9 100644
803fb7
--- a/man/systemd-update-utmp.service.xml
803fb7
+++ b/man/systemd-update-utmp.service.xml
803fb7
@@ -69,7 +69,7 @@
803fb7
     <para>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry project='man-pages'><refentrytitle>utmp</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>auditd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>auditd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml
803fb7
index 59bb5e4e8..7c6ed0899 100644
803fb7
--- a/man/systemd-vconsole-setup.service.xml
803fb7
+++ b/man/systemd-vconsole-setup.service.xml
803fb7
@@ -57,9 +57,9 @@
803fb7
     <para><filename>systemd-vconsole-setup.service</filename> is an
803fb7
     early-boot service that configures the virtual console font and
803fb7
     console keymap. Internally it calls
803fb7
-    <citerefentry><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+    <citerefentry project='mankier'><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     and
803fb7
-    <citerefentry><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
803fb7
+    <citerefentry project='die-net'><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
803fb7
 
803fb7
     <para>See
803fb7
     <citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
@@ -105,8 +105,8 @@
803fb7
     <para>
803fb7
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='mankier'><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='die-net'><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
803fb7
index 3db65d988..b5b5885cd 100644
803fb7
--- a/man/systemd.automount.xml
803fb7
+++ b/man/systemd.automount.xml
803fb7
@@ -96,7 +96,7 @@
803fb7
 
803fb7
     <para>Automount units may either be configured via unit files, or
803fb7
     via <filename>/etc/fstab</filename> (see
803fb7
-    <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
     for details).</para>
803fb7
 
803fb7
     <para>For details how systemd parses
803fb7
@@ -145,8 +145,8 @@
803fb7
         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>automount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='die-net'><refentrytitle>automount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
       </para>
803fb7
   </refsect1>
803fb7
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
803fb7
index fdb157864..56b53e601 100644
803fb7
--- a/man/systemd.exec.xml
803fb7
+++ b/man/systemd.exec.xml
803fb7
@@ -663,7 +663,7 @@
803fb7
         <citerefentry project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         for details. Takes a whitespace-separated list of capability
803fb7
         names as read by
803fb7
-        <citerefentry><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='mankier'><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
803fb7
         e.g. <constant>CAP_SYS_ADMIN</constant>,
803fb7
         <constant>CAP_DAC_OVERRIDE</constant>,
803fb7
         <constant>CAP_SYS_PTRACE</constant>. Capabilities listed will
803fb7
@@ -711,7 +711,7 @@
803fb7
         set for the executed process. Take a capability string
803fb7
         describing the effective, permitted and inherited capability
803fb7
         sets as documented in
803fb7
-        <citerefentry><refentrytitle>cap_from_text</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
+        <citerefentry project='mankier'><refentrytitle>cap_from_text</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
         Note that these capability sets are usually influenced (and
803fb7
         filtered) by the capabilities attached to the executed file.
803fb7
         Due to that <varname>CapabilityBoundingSet=</varname> is
803fb7
@@ -881,7 +881,7 @@
803fb7
         <option>private</option>, which control whether mounts in the
803fb7
         file system namespace set up for this unit's processes will
803fb7
         receive or propagate mounts or unmounts. See
803fb7
-        <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
         for details. Defaults to <option>shared</option>. Use
803fb7
         <option>shared</option> to ensure that mounts and unmounts are
803fb7
         propagated from the host to the container and vice versa. Use
803fb7
@@ -929,7 +929,7 @@
803fb7
         authorize the transition. This directive is ignored if SELinux
803fb7
         is disabled. If prefixed by <literal>-</literal>, all errors
803fb7
         will be ignored. See
803fb7
-        <citerefentry><refentrytitle>setexeccon</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>setexeccon</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
         for details.</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -1076,7 +1076,7 @@
803fb7
         prefixed with <constant>~</constant> the listed address
803fb7
         families will be applied as blacklist, otherwise as whitelist.
803fb7
         Note that this restricts access to the
803fb7
-        <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
         system call only. Sockets passed into the process by other
803fb7
         means (for example, by using socket activation with socket
803fb7
         units, see
803fb7
@@ -1104,7 +1104,7 @@
803fb7
         <term><varname>Personality=</varname></term>
803fb7
 
803fb7
         <listitem><para>Controls which kernel architecture
803fb7
-        <citerefentry><refentrytitle>uname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>uname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
         shall report, when invoked by unit processes. Takes one of
803fb7
         <constant>x86</constant> and <constant>x86-64</constant>. This
803fb7
         is useful when running 32-bit services on a 64-bit host
803fb7
@@ -1166,7 +1166,7 @@
803fb7
         <term><varname>$LANG</varname></term>
803fb7
 
803fb7
         <listitem><para>Locale. Can be set in
803fb7
-        <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
         or on the kernel command line (see
803fb7
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
         and
803fb7
@@ -1184,7 +1184,7 @@
803fb7
         login shell. The variables are set for the units that have
803fb7
         <varname>User=</varname> set, which includes user
803fb7
         <command>systemd</command> instances. See
803fb7
-        <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
803fb7
+        <citerefentry project='die-net'><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
803fb7
         </para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
803fb7
index ccb698752..9b39e732e 100644
803fb7
--- a/man/systemd.generator.xml
803fb7
+++ b/man/systemd.generator.xml
803fb7
@@ -333,7 +333,7 @@ find $dir</programlisting>
803fb7
       <citerefentry><refentrytitle>systemd-debug-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-efi-boot-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-getty-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
803fb7
index 1fd46de31..7d6c5c715 100644
803fb7
--- a/man/systemd.journal-fields.xml
803fb7
+++ b/man/systemd.journal-fields.xml
803fb7
@@ -134,7 +134,7 @@
803fb7
           derived from glibc's
803fb7
           <varname>program_invocation_short_name</varname> variable,
803fb7
           see
803fb7
-          <citerefentry><refentrytitle>program_invocation_short_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>.)</para>
803fb7
+          <citerefentry project='die-net'><refentrytitle>program_invocation_short_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>.)</para>
803fb7
         </listitem>
803fb7
 
803fb7
       </varlistentry>
803fb7
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
803fb7
index c974e2248..e57f0e724 100644
803fb7
--- a/man/systemd.kill.xml
803fb7
+++ b/man/systemd.kill.xml
803fb7
@@ -135,7 +135,7 @@
803fb7
         of shutting down a unit (see above), and is usually followed
803fb7
         by <constant>SIGKILL</constant> (see above and below). For a
803fb7
         list of valid signals, see
803fb7
-        <citerefentry><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
803fb7
+        <citerefentry project='man-pages'><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
803fb7
         Defaults to <constant>SIGTERM</constant>. </para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -176,7 +176,7 @@
803fb7
         <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>kill</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
       </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
803fb7
index 5cbde8b84..fcb9a4416 100644
803fb7
--- a/man/systemd.mount.xml
803fb7
+++ b/man/systemd.mount.xml
803fb7
@@ -68,7 +68,7 @@
803fb7
     <para>Additional options are listed in
803fb7
     <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
     which define the execution environment the
803fb7
-    <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     binary is executed in, and in
803fb7
     <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
     which define the way the processes are terminated, and in
803fb7
@@ -78,7 +78,7 @@
803fb7
     particularly useful for mount units specifying a
803fb7
     <literal>Type=</literal> option or using configuration not
803fb7
     specified in <filename>/etc/fstab</filename>;
803fb7
-    <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     will refuse options that are not listed in
803fb7
     <filename>/etc/fstab</filename> if it is not run as UID 0.</para>
803fb7
 
803fb7
@@ -118,7 +118,7 @@
803fb7
 
803fb7
     <para>Mount units may either be configured via unit files, or via
803fb7
     <filename>/etc/fstab</filename> (see
803fb7
-    <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
     for details). Mounts listed in <filename>/etc/fstab</filename>
803fb7
     will be converted into native units dynamically at boot and when
803fb7
     the configuration of the system manager is reloaded. In general,
803fb7
@@ -231,7 +231,7 @@
803fb7
         <term><varname>What=</varname></term>
803fb7
         <listitem><para>Takes an absolute path of a device node, file
803fb7
         or other resource to mount. See
803fb7
-        <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for details. If this refers to a device node, a dependency on
803fb7
         the respective device unit is automatically created. (See
803fb7
         <citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
@@ -251,7 +251,7 @@
803fb7
       <varlistentry>
803fb7
         <term><varname>Type=</varname></term>
803fb7
         <listitem><para>Takes a string for the file system type. See
803fb7
-        <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for details. This setting is optional.</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -270,7 +270,7 @@
803fb7
         the options specified in <varname>Options=</varname> is
803fb7
         relaxed, and unknown mount options are tolerated. This
803fb7
         corresponds with
803fb7
-        <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>'s
803fb7
+        <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>'s
803fb7
         <parameter>-s</parameter> switch. Defaults to
803fb7
         off.</para></listitem>
803fb7
       </varlistentry>
803fb7
@@ -321,7 +321,7 @@
803fb7
         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry project='man-pages'><refentrytitle>proc</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='man-pages'><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
       </para>
803fb7
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
803fb7
index 24f8416ef..97386271d 100644
803fb7
--- a/man/systemd.network.xml
803fb7
+++ b/man/systemd.network.xml
803fb7
@@ -286,7 +286,7 @@
803fb7
             separated by a <literal>/</literal> character. Specify
803fb7
             this key more than once to configure several addresses.
803fb7
             The format of the address must be as described in
803fb7
-            <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
+            <citerefentry project='man-pages'><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
             This is a short-hand for an [Address] section only
803fb7
             containing an Address key (see below). This option may be
803fb7
             specified more than once.
803fb7
@@ -312,7 +312,7 @@
803fb7
           <listitem>
803fb7
             <para>The gateway address, which must be in the format
803fb7
             described in
803fb7
-            <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
+            <citerefentry project='man-pages'><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
             This is a short-hand for a [Route] section only containing
803fb7
             a Gateway key. This option may be specified more than
803fb7
             once.</para>
803fb7
@@ -323,7 +323,7 @@
803fb7
           <listitem>
803fb7
             <para>A DNS server address, which must be in the format
803fb7
             described in
803fb7
-            <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
+            <citerefentry project='man-pages'><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
             This option may be specified more than once.</para>
803fb7
           </listitem>
803fb7
         </varlistentry>
803fb7
@@ -429,7 +429,7 @@
803fb7
           <listitem>
803fb7
             <para>The broadcast address, which must be in the format
803fb7
             described in
803fb7
-            <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
+            <citerefentry project='man-pages'><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
803fb7
             This key only applies to IPv4 addresses. If it is not
803fb7
             given, it is derived from the <literal>Address</literal>
803fb7
             key.</para>
803fb7
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
803fb7
index 08a7ec897..d02bc92ae 100644
803fb7
--- a/man/systemd.path.xml
803fb7
+++ b/man/systemd.path.xml
803fb7
@@ -74,7 +74,7 @@
803fb7
     (see below).</para>
803fb7
 
803fb7
     <para>Internally, path units use the
803fb7
-    <citerefentry><refentrytitle>inotify</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>inotify</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
     API to monitor file systems. Due to that, it suffers by the same
803fb7
     limitations as inotify, and for example cannot be used to monitor
803fb7
     files or directories changed by other machines on remote NFS file
803fb7
@@ -187,7 +187,7 @@
803fb7
         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>inotify</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='man-pages'><refentrytitle>inotify</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
       </para>
803fb7
   </refsect1>
803fb7
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
803fb7
index 3938345fa..2f541937f 100644
803fb7
--- a/man/systemd.socket.xml
803fb7
+++ b/man/systemd.socket.xml
803fb7
@@ -265,7 +265,7 @@
803fb7
         <listitem><para>Takes a one of <option>default</option>,
803fb7
         <option>both</option> or <option>ipv6-only</option>. Controls
803fb7
         the IPV6_V6ONLY socket option (see
803fb7
-        <citerefentry><refentrytitle>ipv6</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>ipv6</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         for details). If <option>both</option>, IPv6 sockets bound
803fb7
         will be accessible via both IPv4 and IPv6. If
803fb7
         <option>ipv6-only</option>, they will be accessible via IPv6
803fb7
@@ -294,7 +294,7 @@
803fb7
         this socket to. If set, traffic will only be accepted from the
803fb7
         specified network interfaces. This controls the
803fb7
         SO_BINDTODEVICE socket option (see
803fb7
-        <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         for details). If this option is used, an automatic dependency
803fb7
         from this socket unit on the network interface device unit
803fb7
         (<citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
@@ -380,7 +380,7 @@
803fb7
         <filename>/proc/sys/net/ipv4/tcp_keepalive_time</filename>)
803fb7
         for all TCP streams accepted on this socket. This controls the
803fb7
         SO_KEEPALIVE socket option (see
803fb7
-        <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         and the 
803fb7
         url="http://www.tldp.org/HOWTO/html_single/TCP-Keepalive-HOWTO/">TCP
803fb7
         Keepalive HOWTO</ulink> for details.) Defaults to
803fb7
@@ -392,7 +392,7 @@
803fb7
         <listitem><para>Takes time (in seconds) as argument . The connection needs to remain
803fb7
         idle before TCP starts sending keepalive probes. This controls the TCP_KEEPIDLE
803fb7
         socket option (see
803fb7
-        <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         and the 
803fb7
         url="http://www.tldp.org/HOWTO/html_single/TCP-Keepalive-HOWTO/">TCP
803fb7
         Keepalive HOWTO</ulink> for details.)
803fb7
@@ -405,7 +405,7 @@
803fb7
         individual keepalive probes, if the socket option SO_KEEPALIVE
803fb7
         has been set on this socket seconds as argument. This controls
803fb7
         the TCP_KEEPINTVL socket option (see
803fb7
-        <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         and the 
803fb7
         url="http://www.tldp.org/HOWTO/html_single/TCP-Keepalive-HOWTO/">TCP
803fb7
         Keepalive HOWTO</ulink> for details.) Defaults value is 75
803fb7
@@ -418,7 +418,7 @@
803fb7
         unacknowledged probes to send before considering the
803fb7
         connection dead and notifying the application layer. This
803fb7
         controls the TCP_KEEPCNT socket option (see
803fb7
-        <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         and the 
803fb7
         url="http://www.tldp.org/HOWTO/html_single/TCP-Keepalive-HOWTO/">TCP
803fb7
         Keepalive HOWTO</ulink> for details.) Defaults value is
803fb7
@@ -431,7 +431,7 @@
803fb7
         algorithm works by combining a number of small outgoing
803fb7
         messages, and sending them all at once. This controls the
803fb7
         TCP_NODELAY socket option (see
803fb7
-        <citerefentry><refentrytitle>tcp</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>tcp</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         Defaults to <option>false</option>.</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -440,7 +440,7 @@
803fb7
         <listitem><para>Takes an integer argument controlling the
803fb7
         priority for all traffic sent from this socket. This controls
803fb7
         the SO_PRIORITY socket option (see
803fb7
-        <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         for details.).</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -453,7 +453,7 @@
803fb7
         established. When this option is set, the
803fb7
         <constant>TCP_DEFER_ACCEPT</constant> socket option will be
803fb7
         used (see
803fb7
-        <citerefentry><refentrytitle>tcp</refentrytitle><manvolnum>7</manvolnum></citerefentry>),
803fb7
+        <citerefentry project='die-net'><refentrytitle>tcp</refentrytitle><manvolnum>7</manvolnum></citerefentry>),
803fb7
         and the kernel will ignore initial ACK packets without any
803fb7
         data. The argument specifies the approximate amount of time
803fb7
         the kernel should wait for incoming data before falling back
803fb7
@@ -480,7 +480,7 @@
803fb7
         <listitem><para>Takes an integer argument controlling the
803fb7
         receive or send buffer sizes of this socket, respectively.
803fb7
         This controls the SO_RCVBUF and SO_SNDBUF socket options (see
803fb7
-        <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         for details.). The usual suffixes K, M, G are supported and
803fb7
         are understood to the base of 1024.</para></listitem>
803fb7
       </varlistentry>
803fb7
@@ -490,7 +490,7 @@
803fb7
         <listitem><para>Takes an integer argument controlling the IP
803fb7
         Type-Of-Service field for packets generated from this socket.
803fb7
         This controls the IP_TOS socket option (see
803fb7
-        <citerefentry><refentrytitle>ip</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>ip</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         for details.). Either a numeric string or one of
803fb7
         <option>low-delay</option>, <option>throughput</option>,
803fb7
         <option>reliability</option> or <option>low-cost</option> may
803fb7
@@ -503,9 +503,9 @@
803fb7
         Time-To-Live/IPv6 Hop-Count field for packets generated from
803fb7
         this socket. This sets the IP_TTL/IPV6_UNICAST_HOPS socket
803fb7
         options (see
803fb7
-        <citerefentry><refentrytitle>ip</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>ip</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         and
803fb7
-        <citerefentry><refentrytitle>ipv6</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>ipv6</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         for details.)</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -515,7 +515,7 @@
803fb7
         mark of packets generated by this socket. This can be used in
803fb7
         the firewall logic to filter packets from this socket. This
803fb7
         sets the SO_MARK socket option. See
803fb7
-        <citerefentry><refentrytitle>iptables</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>iptables</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for details.</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -526,7 +526,7 @@
803fb7
         <citerefentry><refentrytitle>bind</refentrytitle><manvolnum>2</manvolnum></citerefentry>s
803fb7
         to this TCP or UDP port. This controls the SO_REUSEPORT socket
803fb7
         option. See
803fb7
-        <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
         for details.</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -578,7 +578,7 @@
803fb7
         control the mq_maxmsg field or the mq_msgsize field,
803fb7
         respectively, when creating the message queue. Note that
803fb7
         either none or both of these variables need to be set. See
803fb7
-        <citerefentry><refentrytitle>mq_setattr</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
+        <citerefentry project='die-net'><refentrytitle>mq_setattr</refentrytitle><manvolnum>3</manvolnum></citerefentry>
803fb7
         for details.</para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
803fb7
index 23b9c712e..5016f453d 100644
803fb7
--- a/man/systemd.swap.xml
803fb7
+++ b/man/systemd.swap.xml
803fb7
@@ -69,7 +69,7 @@
803fb7
     <para>Additional options are listed in
803fb7
     <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
     which define the execution environment the
803fb7
-    <citerefentry><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
     binary is executed in, and in
803fb7
     <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
     which define the way the processes are terminated, and in
803fb7
@@ -100,7 +100,7 @@
803fb7
 
803fb7
     <para>Swap units may either be configured via unit files, or via
803fb7
     <filename>/etc/fstab</filename> (see
803fb7
-    <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+    <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
     for details). Swaps listed in <filename>/etc/fstab</filename> will
803fb7
     be converted into native units dynamically at boot and when the
803fb7
     configuration of the system manager is reloaded. See
803fb7
@@ -161,7 +161,7 @@
803fb7
         <term><varname>What=</varname></term>
803fb7
         <listitem><para>Takes an absolute path of a device node or
803fb7
         file to use for paging. See
803fb7
-        <citerefentry><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for details. If this refers to a device node, a dependency on
803fb7
         the respective device unit is automatically created. (See
803fb7
         <citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
@@ -187,7 +187,7 @@
803fb7
         device. This may be used for controlling discard options among
803fb7
         other functionality, if the swap backing device supports the
803fb7
         discard or trim operation. (See
803fb7
-        <citerefentry><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
         for more information.) </para></listitem>
803fb7
       </varlistentry>
803fb7
 
803fb7
@@ -229,7 +229,7 @@
803fb7
         <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='man-pages'><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
803fb7
       </para>
803fb7
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
803fb7
index a452f87ba..c2e374a94 100644
803fb7
--- a/man/systemd.unit.xml
803fb7
+++ b/man/systemd.unit.xml
803fb7
@@ -826,7 +826,7 @@
803fb7
         <varname>cris</varname> to test
803fb7
         against a specific architecture. The architecture is
803fb7
         determined from the information returned by
803fb7
-        <citerefentry><refentrytitle>uname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>uname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
803fb7
         and is thus subject to
803fb7
         <citerefentry><refentrytitle>personality</refentrytitle><manvolnum>2</manvolnum></citerefentry>.
803fb7
         Note that a <varname>Personality=</varname> setting in the
803fb7
@@ -1438,7 +1438,7 @@ PrivateTmp=yes</programlisting>
803fb7
       <citerefentry><refentrytitle>systemd-analyze</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>uname</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
+      <citerefentry project='man-pages'><refentrytitle>uname</refentrytitle><manvolnum>1</manvolnum></citerefentry>
803fb7
     </para>
803fb7
   </refsect1>
803fb7
 
803fb7
diff --git a/man/systemd.xml b/man/systemd.xml
803fb7
index 9b92140e6..d006b0bb9 100644
803fb7
--- a/man/systemd.xml
803fb7
+++ b/man/systemd.xml
803fb7
@@ -1012,9 +1012,9 @@
803fb7
         <listitem><para>Set the system locale to use. This overrides
803fb7
         the settings in <filename>/etc/locale.conf</filename>. For
803fb7
         more information see
803fb7
-        <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
+        <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
803fb7
         and
803fb7
-        <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
803fb7
+        <citerefentry project='man-pages'><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
803fb7
         </para></listitem>
803fb7
       </varlistentry>
803fb7
     </variablelist>
803fb7
@@ -1077,7 +1077,7 @@
803fb7
     <para>
803fb7
       The <ulink url="http://www.freedesktop.org/wiki/Software/systemd/">systemd Homepage</ulink>,
803fb7
       <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
-      <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+      <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
       <citerefentry><refentrytitle>systemd-notify</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
803fb7
index 17bea8b68..27196d44e 100644
803fb7
--- a/man/vconsole.conf.xml
803fb7
+++ b/man/vconsole.conf.xml
803fb7
@@ -129,9 +129,9 @@ FONT=eurlatgr</programlisting>
803fb7
       <para>
803fb7
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
-        <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='mankier'><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='die-net'><refentrytitle>setfont</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
803fb7
+        <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
803fb7
         <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
803fb7
       </para>
803fb7
   </refsect1>