From 78e9bb837c258ac0ec7712b3d612cc2f407e731e Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 05:50:42 +0200
Subject: Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 man/journal-upload.conf.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'man/journal-upload.conf.xml')

diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml
index 1bc7f08..7d3f22f 100644
--- a/man/journal-upload.conf.xml
+++ b/man/journal-upload.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
 <refentry id="journal-upload.conf" conditional='HAVE_MICROHTTPD'
@@ -23,6 +23,8 @@
 
   <refsynopsisdiv>
     <para><filename>/etc/systemd/journal-upload.conf</filename></para>
+    <para><filename>/run/systemd/journal-upload.conf</filename></para>
+    <para><filename>/usr/lib/systemd/journal-upload.conf</filename></para>
     <para><filename>/etc/systemd/journal-upload.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/journal-upload.conf.d/*.conf</filename></para>
     <para><filename>/usr/lib/systemd/journal-upload.conf.d/*.conf</filename></para>
@@ -101,11 +103,11 @@
 
   <refsect1>
       <title>See Also</title>
-      <para>
-        <citerefentry><refentrytitle>systemd-journal-upload.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-      </para>
+      <para><simplelist type="inline">
+        <member><citerefentry><refentrytitle>systemd-journal-upload.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      </simplelist></para>
   </refsect1>
 
 </refentry>
-- 
cgit v1.2.3