ryantimwilson / rpms / systemd

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