man: fix spacing issue in various man pages

Before: libsystemd-daemonpkg-config(1)
After: libsystemd-daemon pkg-config(1)

This fix is more complicated than it should be due to the consecutive
XML elements separated by collapsible whitespace.

Merging the lines and separating the XML elements with an en space or a
non-breaking space is the only solution that results in one, and only
one, space being inserted between them when testing. An em space results
in two spaces being inserted.

31 files changed, 31 insertions, 62 deletions

diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 55ee1fd89..136415f0a 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -146,8 +146,7 @@
                 <filename>sd-daemon.h</filename> files. These
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-daemon</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-daemon</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file. Alternatively, applications consuming these APIs
                 may copy the implementation into their source tree,
                 either verbatim or in excerpts.</para>
diff --git a/man/sd-id128.xml b/man/sd-id128.xml
index 51a16e35d..c194f5745 100644
--- a/man/sd-id128.xml
+++ b/man/sd-id128.xml
@@ -157,8 +157,7 @@
 
                 <para>These APIs are implemented as a shared library,
                 which can be compiled and linked to with the
-                <literal>libsystemd-id128</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <literal>libsystemd-id128</literal> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
 
         </refsect1>
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index 490b971f1..6d3961144 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -100,8 +100,7 @@
 
                 <para>These APIs are implemented as shared library,
                 which can be compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd-login.xml b/man/sd-login.xml
index c186324f8..251b35b06 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -122,8 +122,7 @@
 
                 <para>These APIs are implemented as shared library,
                 which can be compiled and linked to with the
-                <constant>libsystemd-login</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-login</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index 32d0fd095..84af8fbd9 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -102,8 +102,7 @@
                 <filename>sd-daemon.h</filename> files. These
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-daemon</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-daemon</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file. Alternatively, applications consuming these APIs
                 may copy the implementation into their source
                 tree. For more details about the reference
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
index 9fb0732c1..8254b7cae 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -124,8 +124,7 @@
                 <function>sd_get_machine_names()</function> interfaces
                 are available as shared library, which can be compiled
                 and linked to with the
-                <constant>libsystemd-login</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-login</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
index 039c1dd64..12887a240 100644
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.xml
@@ -118,8 +118,7 @@
                 and <function>sd_id128_get_boot()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <literal>libsystemd-id128</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <literal>libsystemd-id128</literal> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
index 37efe164c..15e17619d 100644
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.xml
@@ -98,8 +98,7 @@
                 <para>The <function>sd_id128_randomize()</function> interface
                 is available as shared library, which can be compiled
                 and linked to with the
-                <literal>libsystemd-id128</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <literal>libsystemd-id128</literal> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
index 593d0752d..6d5cf45f9 100644
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.xml
@@ -118,8 +118,7 @@
                 <para>The <function>sd_id128_to_string()</function>
                 and <function>sd_id128_from_string()</function> interfaces are
                 available as shared library, which can be compiled and
-                linked to with the <literal>libsystemd-id128</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                linked to with the <literal>libsystemd-id128</literal> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index 5eaf1585a..44b41abf8 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -192,8 +192,7 @@
                 <filename>sd-daemon.h</filename> files. These
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-daemon</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-daemon</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file. Alternatively, applications consuming these APIs
                 may copy the implementation into their source
                 tree. For more details about the reference
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index 82edf2183..d02285f20 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -176,8 +176,7 @@
                 <function>sd_journal_flush_matches()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index d1962e4ca..53ca3083b 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -120,8 +120,7 @@
                 <function>sd_journal_get_catalog_for_message_id()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
index d83c5191f..861927e2e 100644
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.xml
@@ -132,8 +132,7 @@
                 and <function>sd_journal_test_cursor()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
index 506c02c38..d987011a8 100644
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -124,8 +124,7 @@
                 <function>sd_journal_get_cutoff_monotonic_usec()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index ba50b8d09..460b709db 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -205,8 +205,7 @@
                 <function>sd_journal_get_data_threshold()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index f3fbe69c3..1c6f25005 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -255,8 +255,7 @@ else {
                 <function>sd_journal_wait()</function> interfaces are
                 available as shared library, which can be compiled and
                 linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
index b57a7c15b..e7e4e4e4d 100644
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.xml
@@ -124,8 +124,7 @@
                 <function>sd_journal_get_monotonic_usec()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
index 490317ac9..50953f506 100644
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.xml
@@ -86,8 +86,7 @@
                 <para>The <function>sd_journal_get_usage()</function>
                 interface is available as shared library, which can be
                 compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
index 11066611f..6e437d182 100644
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.xml
@@ -158,8 +158,7 @@
                 <function>sd_journal_previous_skip()</function> interfaces are
                 available as shared library, which can be compiled and
                 linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index d7ea8ff95..eae851e73 100644
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.xml
@@ -191,8 +191,7 @@
                 <function>sd_journal_close()</function> interfaces are
                 available as a shared library, which can be compiled and
                 linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 7292d3345..81900dbdf 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -229,8 +229,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
                 <function>sd_journal_sendv()</function> interfaces
                 are available as shared library, which can be compiled
                 and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
index dde52cf5f..f5d9d2bfb 100644
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.xml
@@ -158,8 +158,7 @@
                 <function>sd_journal_restart_unique()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index 9cf9dd07a..c4e64096e 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -158,8 +158,7 @@
                 and <function>sd_journal_seek_cursor()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index ec42e8cb1..3577526f2 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -114,8 +114,7 @@
                 <para>The <function>sd_journal_stream_fd()</function>
                 interface is available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-journal</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-journal</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index 9d9f4d0d7..c9b399701 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -151,8 +151,7 @@
                 <filename>sd-daemon.h</filename> files. These
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-daemon</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-daemon</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file. Alternatively, applications consuming these APIs
                 may copy the implementation into their source
                 tree. For more details about the reference
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index c7650e6ba..e93f93f9c 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -226,8 +226,7 @@ else {
                 <function>sd_login_monitor_get_timeout()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-login</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-login</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 52614a207..a7bf17f9c 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -238,8 +238,7 @@
                 <filename>sd-daemon.h</filename> files. These
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-daemon</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-daemon</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file. Alternatively, applications consuming these APIs
                 may copy the implementation into their source tree. For
                 more details about the reference implementation see
diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml
index b45c9a552..fd1ce4b87 100644
--- a/man/sd_pid_get_session.xml
+++ b/man/sd_pid_get_session.xml
@@ -169,8 +169,7 @@
                 <function>sd_pid_get_machine_name()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-login</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-login</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
 
                 <para>Note that the login session identifier as
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index 3060ec7d5..8b32bdc66 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -163,8 +163,7 @@
                 <function>sd_seat_can_grapical()</function> interfaces
                 are available as shared library, which can be compiled
                 and linked to with the
-                <constant>libsystemd-login</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-login</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index 0146fb427..e89117d99 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -241,8 +241,7 @@
                 <function>sd_session_get_tty()</function>
                 interfaces are available as shared library, which can
                 be compiled and linked to with the
-                <constant>libsystemd-login</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <constant>libsystemd-login</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>
 
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index 9a20b5453..ba614f932 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -172,8 +172,7 @@
                 <function>sd_uid_get_sessions()</function>, and
                 <function>sd_uid_get_seats()</function> interfaces are
                 available as shared library, which can be compiled and
-                linked to with the <constant>libsystemd-login</constant>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                linked to with the <constant>libsystemd-login</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 file.</para>
         </refsect1>