daandemeyer / rpms / systemd

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