man: use <simplelist> for file lists in synopsis

With <para><filename>…</filename></para>, we get a separate "paragraph" for
each line, i.e. entries separated by empty lines. This uses up a lot of space
and was only done because docbook makes it hard to insert a newline. In some
other places, <literallayout> was used, but then we cannot indent the source
text (because the whitespace would end up in the final page). We can get the
desired result with <simplelist>.

With <simplelist> the items are indented in roff output, but not in html
output. In some places this looks better then no indentation, and in others it
would probably be better to have no indent. But this is a minor issue and we
cannot control that.

(I didn't convert all spots. There's a bunch of other man pages which have two
lines, e.g. an executable and service file, and it doesn't matter there so
much.)

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index ab56460d3e96dd55a416d7c73b2797fff0982d23..7420b5ee68a09d1b5f6ac66589ae346d089aacca 100644 (file)
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -23,9 +23,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/binfmt.d/*.conf</filename></para>
-    <para><filename>/run/binfmt.d/*.conf</filename></para>
-    <para><filename>/usr/lib/binfmt.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/binfmt.d/*.conf</filename></member>
+      <member><filename>/run/binfmt.d/*.conf</filename></member>
+      <member><filename>/usr/lib/binfmt.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index 61014d3823517e6b30402119db6d49a843f6859c..aa73f62ea8f01133b697ec8f6b2f7e9aafbd34d4 100644 (file)
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -22,10 +22,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/coredump.conf</filename></para>
-    <para><filename>/etc/systemd/coredump.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/coredump.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/coredump.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/coredump.conf</filename></member>
+      <member><filename>/etc/systemd/coredump.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/coredump.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/coredump.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/dnssec-trust-anchors.d.xml b/man/dnssec-trust-anchors.d.xml
index 39b9515c45234aae202def276b03ce5ac8747f51..391f93b5b7799568865a45635af4aed8a8f45617 100644 (file)
--- a/man/dnssec-trust-anchors.d.xml
+++ b/man/dnssec-trust-anchors.d.xml
@@ -23,12 +23,14 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/dnssec-trust-anchors.d/*.positive</filename></para>
-    <para><filename>/run/dnssec-trust-anchors.d/*.positive</filename></para>
-    <para><filename>/usr/lib/dnssec-trust-anchors.d/*.positive</filename></para>
-    <para><filename>/etc/dnssec-trust-anchors.d/*.negative</filename></para>
-    <para><filename>/run/dnssec-trust-anchors.d/*.negative</filename></para>
-    <para><filename>/usr/lib/dnssec-trust-anchors.d/*.negative</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/dnssec-trust-anchors.d/*.positive</filename></member>
+      <member><filename>/run/dnssec-trust-anchors.d/*.positive</filename></member>
+      <member><filename>/usr/lib/dnssec-trust-anchors.d/*.positive</filename></member>
+      <member><filename>/etc/dnssec-trust-anchors.d/*.negative</filename></member>
+      <member><filename>/run/dnssec-trust-anchors.d/*.negative</filename></member>
+      <member><filename>/usr/lib/dnssec-trust-anchors.d/*.negative</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/environment.d.xml b/man/environment.d.xml
index fc03405a94098f2e9a20a28abd0599faa9794a68..f0c63da77deaf04924a398b855c775a368239292 100644 (file)
--- a/man/environment.d.xml
+++ b/man/environment.d.xml
@@ -26,11 +26,13 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>~/.config/environment.d/*.conf</filename></para>
-    <para><filename>/etc/environment.d/*.conf</filename></para>
-    <para><filename>/run/environment.d/*.conf</filename></para>
-    <para><filename>/usr/lib/environment.d/*.conf</filename></para>
-    <para><filename>/etc/environment</filename></para>
+    <para><simplelist>
+      <member><filename>~/.config/environment.d/*.conf</filename></member>
+      <member><filename>/etc/environment.d/*.conf</filename></member>
+      <member><filename>/run/environment.d/*.conf</filename></member>
+      <member><filename>/usr/lib/environment.d/*.conf</filename></member>
+      <member><filename>/etc/environment</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/homed.conf.xml b/man/homed.conf.xml
index acc5f5f17614f7726c6823edfc843e885740faa1..4a075511b7b72aff087bd0a96f1817de89c067b4 100644 (file)
--- a/man/homed.conf.xml
+++ b/man/homed.conf.xml
@@ -22,10 +22,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/homed.conf</filename></para>
-    <para><filename>/etc/systemd/homed.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/homed.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/homed.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/homed.conf</filename></member>
+      <member><filename>/etc/systemd/homed.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/homed.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/homed.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
index a5a5b56ec34db8b648ec7d3d2034d48c377840e7..7d75f0e79f55d9c1c28f6dbf3705b6166a108e4e 100644 (file)
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
@@ -27,10 +27,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/journal-remote.conf</filename></para>
-    <para><filename>/etc/systemd/journal-remote.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/journal-remote.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/journal-remote.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/journal-remote.conf</filename></member>
+      <member><filename>/etc/systemd/journal-remote.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/journal-remote.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/journal-remote.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index e150d04dcff24298d3e2c733675b2ce8f7a9c41c..634cec4b52db4efa2e23b9b1c6640873bd34ecb3 100644 (file)
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -23,14 +23,16 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/journald.conf</filename></para>
-    <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>/etc/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf</filename></para>
-    <para><filename>/etc/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/journald.conf</filename></member>
+      <member><filename>/etc/systemd/journald.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/journald.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></member>
+      <member><filename>/etc/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf</filename></member>
+      <member><filename>/etc/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 2b5c11b916658f333f2fa53af9b0bf1861b8931f..e1d65821bfab7a9de8887e42f5e3a0d2816d5fff 100644 (file)
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -25,10 +25,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/logind.conf</filename></para>
-    <para><filename>/etc/systemd/logind.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/logind.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/logind.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/logind.conf</filename></member>
+      <member><filename>/etc/systemd/logind.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/logind.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/logind.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index cd0c00687a54f3b2662328fffc2dba5c4b6088ff..1293dd5249a2d956fa3d21bd2f30bbe37e39d373 100644 (file)
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -22,9 +22,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/modules-load.d/*.conf</filename></para>
-    <para><filename>/run/modules-load.d/*.conf</filename></para>
-    <para><filename>/usr/lib/modules-load.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/modules-load.d/*.conf</filename></member>
+      <member><filename>/run/modules-load.d/*.conf</filename></member>
+      <member><filename>/usr/lib/modules-load.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml
index 6d1dfc78cee58359fdd3f84a72c4c2f27ccf882d..27cab25d88f19c3e08f52fda58e043abc11a829d 100644 (file)
--- a/man/networkd.conf.xml
+++ b/man/networkd.conf.xml
@@ -27,9 +27,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/networkd.conf</filename></para>
-    <para><filename>/etc/systemd/networkd.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/networkd.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/networkd.conf</filename></member>
+      <member><filename>/etc/systemd/networkd.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/networkd.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/oomd.conf.xml b/man/oomd.conf.xml
index 4fc7abd89501f472b7ab22f44166f350a6930559..e8f9b58658e77eb95346fa70b825013849aca85f 100644 (file)
--- a/man/oomd.conf.xml
+++ b/man/oomd.conf.xml
@@ -22,9 +22,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/oomd.conf</filename></para>
-    <para><filename>/etc/systemd/oomd.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/oomd.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/oomd.conf</filename></member>
+      <member><filename>/etc/systemd/oomd.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/oomd.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/os-release.xml b/man/os-release.xml
index f2e0f3ecb7b39dbff2a95f94922d6aad36d8f324..79de2451bf3774fb8e8b8d95540d073683c6c59b 100644 (file)
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -22,10 +22,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/os-release</filename></para>
-    <para><filename>/usr/lib/os-release</filename></para>
-    <para><filename>/etc/initrd-release</filename></para>
-    <para><filename>/usr/lib/extension-release.d/extension-release.<replaceable>IMAGE</replaceable></filename></para>
+    <para><simplelist>
+      <member><filename>/etc/os-release</filename></member>
+      <member><filename>/usr/lib/os-release</filename></member>
+      <member><filename>/etc/initrd-release</filename></member>
+      <member><filename>/usr/lib/extension-release.d/extension-release.<replaceable>IMAGE</replaceable></filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/repart.d.xml b/man/repart.d.xml
index 79908a0805458350e75c2a54e440d7a9fcfae8ae..ea8cd9e4e496701f1e59826180b2b2918213c94b 100644 (file)
--- a/man/repart.d.xml
+++ b/man/repart.d.xml
@@ -22,10 +22,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><literallayout><filename>/etc/repart.d/*.conf</filename>
-<filename>/run/repart.d/*.conf</filename>
-<filename>/usr/lib/repart.d/*.conf</filename>
-    </literallayout></para>
+    <para><simplelist>
+      <member><filename>/etc/repart.d/*.conf</filename></member>
+      <member><filename>/run/repart.d/*.conf</filename></member>
+      <member><filename>/usr/lib/repart.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index d153865c6e33a2adc45a22b7e49e9b8b5f97665a..194a614244ea2fb0f56b6a9d55949a410786e0a9 100644 (file)
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -25,10 +25,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/resolved.conf</filename></para>
-    <para><filename>/etc/systemd/resolved.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/resolved.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/resolved.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/resolved.conf</filename></member>
+      <member><filename>/etc/systemd/resolved.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/resolved.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/resolved.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 4d810e6c0c47f4d2655fe9777cc999da68a6859b..116ae9b3142a16beb9184dc31f819a02e4f3385f 100644 (file)
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -21,9 +21,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/sysctl.d/*.conf</filename></para>
-    <para><filename>/run/sysctl.d/*.conf</filename></para>
-    <para><filename>/usr/lib/sysctl.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/sysctl.d/*.conf</filename></member>
+      <member><filename>/run/sysctl.d/*.conf</filename></member>
+      <member><filename>/usr/lib/sysctl.d/*.conf</filename></member>
+    </simplelist></para>
 
     <programlisting>key.name.under.proc.sys = some value
 key/name/under/proc/sys = some value

diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml
index 03b7317cd3506c187b3ff5b6cf4d89796def4ad8..90ce8cfbccd0e1cd45fed5ea341b8e66786cb83a 100644 (file)
--- a/man/systemd-ask-password-console.service.xml
+++ b/man/systemd-ask-password-console.service.xml
@@ -25,10 +25,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-ask-password-console.service</filename></para>
-    <para><filename>systemd-ask-password-console.path</filename></para>
-    <para><filename>systemd-ask-password-wall.service</filename></para>
-    <para><filename>systemd-ask-password-wall.path</filename></para>
+    <para><simplelist>
+      <member><filename>systemd-ask-password-console.service</filename></member>
+      <member><filename>systemd-ask-password-console.path</filename></member>
+      <member><filename>systemd-ask-password-wall.service</filename></member>
+      <member><filename>systemd-ask-password-wall.path</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
index 78c661bfad87be36cec91bccadf4828d097f6c60..ae3574e228028d44a79c15598704b59e93593cd7 100644 (file)
--- a/man/systemd-fsck@.service.xml
+++ b/man/systemd-fsck@.service.xml
@@ -24,10 +24,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-fsck@.service</filename></para>
-    <para><filename>systemd-fsck-root.service</filename></para>
-    <para><filename>systemd-fsck-usr.service</filename></para>
-    <para><filename>/usr/lib/systemd/systemd-fsck</filename></para>
+    <para><simplelist>
+      <member><filename>systemd-fsck@.service</filename></member>
+      <member><filename>systemd-fsck-root.service</filename></member>
+      <member><filename>systemd-fsck-usr.service</filename></member>
+      <member><filename>/usr/lib/systemd/systemd-fsck</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 31435b28658fbc3c7772f5a8b2fb445a0fa4d0ef..48d1afcaf87fd2463e5c1e13ec0866110a2f3afc 100644 (file)
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -29,14 +29,16 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-journald.service</filename></para>
-    <para><filename>systemd-journald.socket</filename></para>
-    <para><filename>systemd-journald-dev-log.socket</filename></para>
-    <para><filename>systemd-journald-audit.socket</filename></para>
-    <para><filename>systemd-journald@.service</filename></para>
-    <para><filename>systemd-journald@.socket</filename></para>
-    <para><filename>systemd-journald-varlink@.socket</filename></para>
-    <para><filename>/usr/lib/systemd/systemd-journald</filename></para>
+    <para><simplelist>
+      <member><filename>systemd-journald.service</filename></member>
+      <member><filename>systemd-journald.socket</filename></member>
+      <member><filename>systemd-journald-dev-log.socket</filename></member>
+      <member><filename>systemd-journald-audit.socket</filename></member>
+      <member><filename>systemd-journald@.service</filename></member>
+      <member><filename>systemd-journald@.socket</filename></member>
+      <member><filename>systemd-journald-varlink@.socket</filename></member>
+      <member><filename>/usr/lib/systemd/systemd-journald</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index ee13ce8703fdf7afdb414bdd5052d715352c1a12..9afa8b28bb3e24ea301097ef379f8e1db8c02093 100644 (file)
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -22,10 +22,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/sleep.conf</filename></para>
-    <para><filename>/etc/systemd/sleep.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/sleep.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/sleep.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/sleep.conf</filename></member>
+      <member><filename>/etc/systemd/sleep.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/sleep.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/sleep.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-stub.xml b/man/systemd-stub.xml
index 6e853336c224fec713b5960b4a4d5f839ae6f342..385f1b74db12e8eee5512b242b026d14789dcfc0 100644 (file)
--- a/man/systemd-stub.xml
+++ b/man/systemd-stub.xml
@@ -25,14 +25,16 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/usr/lib/systemd/boot/efi/linuxx64.efi.stub</filename></para>
-    <para><filename>/usr/lib/systemd/boot/efi/linuxia32.efi.stub</filename></para>
-    <para><filename>/usr/lib/systemd/boot/efi/linuxaa64.efi.stub</filename></para>
-    <para><filename><replaceable>ESP</replaceable>/.../<replaceable>foo</replaceable>.efi.extra.d/*.addon.efi</filename></para>
-    <para><filename><replaceable>ESP</replaceable>/.../<replaceable>foo</replaceable>.efi.extra.d/*.cred</filename></para>
-    <para><filename><replaceable>ESP</replaceable>/.../<replaceable>foo</replaceable>.efi.extra.d/*.raw</filename></para>
-    <para><filename><replaceable>ESP</replaceable>/loader/addons/*.addon.efi</filename></para>
-    <para><filename><replaceable>ESP</replaceable>/loader/credentials/*.cred</filename></para>
+    <para><simplelist>
+      <member><filename>/usr/lib/systemd/boot/efi/linuxx64.efi.stub</filename></member>
+      <member><filename>/usr/lib/systemd/boot/efi/linuxia32.efi.stub</filename></member>
+      <member><filename>/usr/lib/systemd/boot/efi/linuxaa64.efi.stub</filename></member>
+      <member><filename><replaceable>ESP</replaceable>/.../<replaceable>foo</replaceable>.efi.extra.d/*.addon.efi</filename></member>
+      <member><filename><replaceable>ESP</replaceable>/.../<replaceable>foo</replaceable>.efi.extra.d/*.cred</filename></member>
+      <member><filename><replaceable>ESP</replaceable>/.../<replaceable>foo</replaceable>.efi.extra.d/*.raw</filename></member>
+      <member><filename><replaceable>ESP</replaceable>/loader/addons/*.addon.efi</filename></member>
+      <member><filename><replaceable>ESP</replaceable>/loader/credentials/*.cred</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 02daecf33ba03df30840302f3a1b8d836fba4cb3..d15a3da21e2b02b33fa8ad6d4352e2856e658e01 100644 (file)
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -26,11 +26,13 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-suspend.service</filename></para>
-    <para><filename>systemd-hibernate.service</filename></para>
-    <para><filename>systemd-hybrid-sleep.service</filename></para>
-    <para><filename>systemd-suspend-then-hibernate.service</filename></para>
-    <para><filename>/usr/lib/systemd/system-sleep</filename></para>
+    <para><simplelist>
+      <member><filename>systemd-suspend.service</filename></member>
+      <member><filename>systemd-hibernate.service</filename></member>
+      <member><filename>systemd-hybrid-sleep.service</filename></member>
+      <member><filename>systemd-suspend-then-hibernate.service</filename></member>
+      <member><filename>/usr/lib/systemd/system-sleep</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-sysext.xml b/man/systemd-sysext.xml
index 76076931d5fd6a8452701178adb21a8b086dcd09..6180d1c4f57bc66cc6c708f2dbf3f1b67ec7d971 100644 (file)
--- a/man/systemd-sysext.xml
+++ b/man/systemd-sysext.xml
@@ -31,7 +31,7 @@
       <arg choice="plain">COMMAND</arg>
     </cmdsynopsis>
 
-    <para><literallayout><filename>systemd-sysext.service</filename></literallayout></para>
+    <para><filename>systemd-sysext.service</filename></para>
 
     <cmdsynopsis>
       <command>systemd-confext</command>
@@ -39,8 +39,7 @@
       <arg choice="plain">COMMAND</arg>
     </cmdsynopsis>
 
-    <para><literallayout><filename>systemd-confext.service</filename></literallayout></para>
-
+    <para><filename>systemd-confext.service</filename></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index 95e1e2951c8b1854e99c3c51d5d4670288ab01a9..28ac36398837f26b69eb2fea9e06621995a66bc9 100644 (file)
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -35,16 +35,22 @@
     </cmdsynopsis>
 
     <para>System units:
-<literallayout><filename>systemd-tmpfiles-setup.service</filename>
-<filename>systemd-tmpfiles-setup-dev-early.service</filename>
-<filename>systemd-tmpfiles-setup-dev.service</filename>
-<filename>systemd-tmpfiles-clean.service</filename>
-<filename>systemd-tmpfiles-clean.timer</filename></literallayout></para>
+    <simplelist>
+      <member><filename>systemd-tmpfiles-setup.service</filename></member>
+      <member><filename>systemd-tmpfiles-setup-dev-early.service</filename></member>
+      <member><filename>systemd-tmpfiles-setup-dev.service</filename></member>
+      <member><filename>systemd-tmpfiles-clean.service</filename></member>
+      <member><filename>systemd-tmpfiles-clean.timer</filename></member>
+    </simplelist>
+    </para>
 
     <para>User units:
-<literallayout><filename>systemd-tmpfiles-setup.service</filename>
-<filename>systemd-tmpfiles-clean.service</filename>
-<filename>systemd-tmpfiles-clean.timer</filename></literallayout></para>
+    <simplelist>
+      <member><filename>systemd-tmpfiles-setup.service</filename></member>
+      <member><filename>systemd-tmpfiles-clean.service</filename></member>
+      <member><filename>systemd-tmpfiles-clean.timer</filename></member>
+    </simplelist>
+    </para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd.environment-generator.xml b/man/systemd.environment-generator.xml
index 856f6a641b1d4a9356be77c9adb3889d55d48db3..151c6ace43c2cbc90de435678216916d8b2b384a 100644 (file)
--- a/man/systemd.environment-generator.xml
+++ b/man/systemd.environment-generator.xml
@@ -31,19 +31,19 @@
       <command>&USER_ENV_GENERATOR_DIR;/some-generator</command>
     </cmdsynopsis>
 
-    <para>
-      <literallayout><filename>/run/systemd/system-environment-generators/*</filename>
-<filename>/etc/systemd/system-environment-generators/*</filename>
-<filename>/usr/local/lib/systemd/system-environment-generators/*</filename>
-<filename>&SYSTEM_ENV_GENERATOR_DIR;/*</filename></literallayout>
-    </para>
-
-    <para>
-      <literallayout><filename>/run/systemd/user-environment-generators/*</filename>
-<filename>/etc/systemd/user-environment-generators/*</filename>
-<filename>/usr/local/lib/systemd/user-environment-generators/*</filename>
-<filename>&USER_ENV_GENERATOR_DIR;/*</filename></literallayout>
-    </para>
+    <para><simplelist>
+      <member><filename>/run/systemd/system-environment-generators/*</filename></member>
+      <member><filename>/etc/systemd/system-environment-generators/*</filename></member>
+      <member><filename>/usr/local/lib/systemd/system-environment-generators/*</filename></member>
+      <member><filename>&SYSTEM_ENV_GENERATOR_DIR;/*</filename></member>
+    </simplelist></para>
+
+    <para><simplelist>
+      <member><filename>/run/systemd/user-environment-generators/*</filename></member>
+      <member><filename>/etc/systemd/user-environment-generators/*</filename></member>
+      <member><filename>/usr/local/lib/systemd/user-environment-generators/*</filename></member>
+      <member><filename>&USER_ENV_GENERATOR_DIR;/*</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index b216ef96d0ee442e9eb3d0a743a5399fd0f4ac15..06fe7ec9d9e250f9c2f31fffc8355be6a11a886f 100644 (file)
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -30,19 +30,19 @@
       <arg choice="option"><replaceable>late-dir</replaceable></arg>
     </cmdsynopsis>
 
-    <para>
-      <literallayout><filename>/run/systemd/system-generators/*</filename>
-<filename>/etc/systemd/system-generators/*</filename>
-<filename>/usr/local/lib/systemd/system-generators/*</filename>
-<filename>&SYSTEM_GENERATOR_DIR;/*</filename></literallayout>
-    </para>
-
-    <para>
-      <literallayout><filename>/run/systemd/user-generators/*</filename>
-<filename>/etc/systemd/user-generators/*</filename>
-<filename>/usr/local/lib/systemd/user-generators/*</filename>
-<filename>&USER_GENERATOR_DIR;/*</filename></literallayout>
-    </para>
+    <para><simplelist>
+      <member><filename>/run/systemd/system-generators/*</filename></member>
+      <member><filename>/etc/systemd/system-generators/*</filename></member>
+      <member><filename>/usr/local/lib/systemd/system-generators/*</filename></member>
+      <member><filename>&SYSTEM_GENERATOR_DIR;/*</filename></member>
+    </simplelist></para>
+
+    <para><simplelist>
+      <member><filename>/run/systemd/user-generators/*</filename></member>
+      <member><filename>/etc/systemd/user-generators/*</filename></member>
+      <member><filename>/usr/local/lib/systemd/user-generators/*</filename></member>
+      <member><filename>&USER_GENERATOR_DIR;/*</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml
index 79806199e571f54b063cb37bb019492d5515ee2a..786031c7557471196afaead9680562580d206df0 100644 (file)
--- a/man/systemd.nspawn.xml
+++ b/man/systemd.nspawn.xml
@@ -24,9 +24,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/nspawn/<replaceable>machine</replaceable>.nspawn</filename></para>
-    <para><filename>/run/systemd/nspawn/<replaceable>machine</replaceable>.nspawn</filename></para>
-    <para><filename>/var/lib/machines/<replaceable>machine</replaceable>.nspawn</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/nspawn/<replaceable>machine</replaceable>.nspawn</filename></member>
+      <member><filename>/run/systemd/nspawn/<replaceable>machine</replaceable>.nspawn</filename></member>
+      <member><filename>/var/lib/machines/<replaceable>machine</replaceable>.nspawn</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd.pcrlock.xml b/man/systemd.pcrlock.xml
index 5687db502187c6266acd2b150f36c379d7496ac0..1dcba3fe532e839881768365e1ec6bb15f133757 100644 (file)
--- a/man/systemd.pcrlock.xml
+++ b/man/systemd.pcrlock.xml
@@ -21,17 +21,18 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><literallayout>
-<filename>/etc/pcrlock.d/*.pcrlock</filename>
-<filename>/etc/pcrlock.d/*.pcrlock.d/*.pcrlock</filename>
-<filename>/run/pcrlock.d/*.pcrlock</filename>
-<filename>/run/pcrlock.d/*.pcrlock.d/*.pcrlock</filename>
-<filename>/var/lib/pcrlock.d/*.pcrlock</filename>
-<filename>/var/lib/pcrlock.d/*.pcrlock.d/*.pcrlock</filename>
-<filename>/usr/local/pcrlock.d/*.pcrlock</filename>
-<filename>/usr/local/pcrlock.d/*.pcrlock.d/*.pcrlock</filename>
-<filename>/usr/lib/pcrlock.d/*.pcrlock</filename>
-<filename>/usr/lib/pcrlock.d/*.pcrlock.d/*.pcrlock</filename></literallayout></para>
+    <para><simplelist>
+      <member><filename>/etc/pcrlock.d/*.pcrlock</filename></member>
+      <member><filename>/etc/pcrlock.d/*.pcrlock.d/*.pcrlock</filename></member>
+      <member><filename>/run/pcrlock.d/*.pcrlock</filename></member>
+      <member><filename>/run/pcrlock.d/*.pcrlock.d/*.pcrlock</filename></member>
+      <member><filename>/var/lib/pcrlock.d/*.pcrlock</filename></member>
+      <member><filename>/var/lib/pcrlock.d/*.pcrlock.d/*.pcrlock</filename></member>
+      <member><filename>/usr/local/pcrlock.d/*.pcrlock</filename></member>
+      <member><filename>/usr/local/pcrlock.d/*.pcrlock.d/*.pcrlock</filename></member>
+      <member><filename>/usr/lib/pcrlock.d/*.pcrlock</filename></member>
+      <member><filename>/usr/lib/pcrlock.d/*.pcrlock.d/*.pcrlock</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 5d46a88c3e94f41c158727d3f2e6c8260ea01c64..26e090ea2ccf475b0c71549067089d54b6c088e4 100644 (file)
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -21,12 +21,14 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/system-preset/*.preset</filename></para>
-    <para><filename>/run/systemd/system-preset/*.preset</filename></para>
-    <para><filename>/usr/lib/systemd/system-preset/*.preset</filename></para>
-    <para><filename>/etc/systemd/user-preset/*.preset</filename></para>
-    <para><filename>/run/systemd/user-preset/*.preset</filename></para>
-    <para><filename>/usr/lib/systemd/user-preset/*.preset</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/system-preset/*.preset</filename></member>
+      <member><filename>/run/systemd/system-preset/*.preset</filename></member>
+      <member><filename>/usr/lib/systemd/system-preset/*.preset</filename></member>
+      <member><filename>/etc/systemd/user-preset/*.preset</filename></member>
+      <member><filename>/run/systemd/user-preset/*.preset</filename></member>
+      <member><filename>/usr/lib/systemd/user-preset/*.preset</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 7fed74a22730d11babf0a8d541e1981e844518bb..c21c8b8221978f5d44d1592da21e1fc9699f00f0 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -40,37 +40,41 @@
     <refsect2>
       <title>System Unit Search Path</title>
 
-      <para><literallayout><filename>/etc/systemd/system.control/*</filename>
-<filename>/run/systemd/system.control/*</filename>
-<filename>/run/systemd/transient/*</filename>
-<filename>/run/systemd/generator.early/*</filename>
-<filename>/etc/systemd/system/*</filename>
-<filename>/etc/systemd/system.attached/*</filename>
-<filename>/run/systemd/system/*</filename>
-<filename>/run/systemd/system.attached/*</filename>
-<filename>/run/systemd/generator/*</filename>
-<filename index='false'>…</filename>
-<filename>/usr/lib/systemd/system/*</filename>
-<filename>/run/systemd/generator.late/*</filename></literallayout></para>
+      <para><simplelist>
+        <member><filename>/etc/systemd/system.control/*</filename></member>
+        <member><filename>/run/systemd/system.control/*</filename></member>
+        <member><filename>/run/systemd/transient/*</filename></member>
+        <member><filename>/run/systemd/generator.early/*</filename></member>
+        <member><filename>/etc/systemd/system/*</filename></member>
+        <member><filename>/etc/systemd/system.attached/*</filename></member>
+        <member><filename>/run/systemd/system/*</filename></member>
+        <member><filename>/run/systemd/system.attached/*</filename></member>
+        <member><filename>/run/systemd/generator/*</filename></member>
+        <member><filename index='false'>…</filename></member>
+        <member><filename>/usr/lib/systemd/system/*</filename></member>
+        <member><filename>/run/systemd/generator.late/*</filename></member>
+      </simplelist></para>
     </refsect2>
 
     <refsect2>
       <title>User Unit Search Path</title>
-      <para><literallayout><filename>~/.config/systemd/user.control/*</filename>
-<filename>$XDG_RUNTIME_DIR/systemd/user.control/*</filename>
-<filename>$XDG_RUNTIME_DIR/systemd/transient/*</filename>
-<filename>$XDG_RUNTIME_DIR/systemd/generator.early/*</filename>
-<filename>~/.config/systemd/user/*</filename>
-<filename>$XDG_CONFIG_DIRS/systemd/user/*</filename>
-<filename>/etc/systemd/user/*</filename>
-<filename>$XDG_RUNTIME_DIR/systemd/user/*</filename>
-<filename>/run/systemd/user/*</filename>
-<filename>$XDG_RUNTIME_DIR/systemd/generator/*</filename>
-<filename>$XDG_DATA_HOME/systemd/user/*</filename>
-<filename>$XDG_DATA_DIRS/systemd/user/*</filename>
-<filename index='false'>…</filename>
-<filename>/usr/lib/systemd/user/*</filename>
-<filename>$XDG_RUNTIME_DIR/systemd/generator.late/*</filename></literallayout></para>
+      <para><simplelist>
+        <member><filename>~/.config/systemd/user.control/*</filename></member>
+        <member><filename>$XDG_RUNTIME_DIR/systemd/user.control/*</filename></member>
+        <member><filename>$XDG_RUNTIME_DIR/systemd/transient/*</filename></member>
+        <member><filename>$XDG_RUNTIME_DIR/systemd/generator.early/*</filename></member>
+        <member><filename>~/.config/systemd/user/*</filename></member>
+        <member><filename>$XDG_CONFIG_DIRS/systemd/user/*</filename></member>
+        <member><filename>/etc/systemd/user/*</filename></member>
+        <member><filename>$XDG_RUNTIME_DIR/systemd/user/*</filename></member>
+        <member><filename>/run/systemd/user/*</filename></member>
+        <member><filename>$XDG_RUNTIME_DIR/systemd/generator/*</filename></member>
+        <member><filename>$XDG_DATA_HOME/systemd/user/*</filename></member>
+        <member><filename>$XDG_DATA_DIRS/systemd/user/*</filename></member>
+        <member><filename index='false'>…</filename></member>
+        <member><filename>/usr/lib/systemd/user/*</filename></member>
+        <member><filename>$XDG_RUNTIME_DIR/systemd/generator.late/*</filename></member>
+      </simplelist></para>
     </refsect2>
 
   </refsynopsisdiv>

diff --git a/man/sysupdate.d.xml b/man/sysupdate.d.xml
index 00b4ac887d91568a86dfac43cf2e2c1b89dd3257..b5c89811f5c0fe275fde20589d6a5a0f27b50eab 100644 (file)
--- a/man/sysupdate.d.xml
+++ b/man/sysupdate.d.xml
@@ -22,10 +22,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><literallayout><filename>/etc/sysupdate.d/*.conf</filename>
-<filename>/run/sysupdate.d/*.conf</filename>
-<filename>/usr/lib/sysupdate.d/*.conf</filename>
-    </literallayout></para>
+    <para><simplelist>
+      <member><filename>/etc/sysupdate.d/*.conf</filename></member>
+      <member><filename>/run/sysupdate.d/*.conf</filename></member>
+      <member><filename>/usr/lib/sysupdate.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml
index e7cd2855d93664812d359926cec47a633892f44c..5c126741a0a661dd8bd915a90d787e9f8006952b 100644 (file)
--- a/man/sysusers.d.xml
+++ b/man/sysusers.d.xml
@@ -22,9 +22,11 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/sysusers.d/*.conf</filename></para>
-    <para><filename>/run/sysusers.d/*.conf</filename></para>
-    <para><filename>/usr/lib/sysusers.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/sysusers.d/*.conf</filename></member>
+      <member><filename>/run/sysusers.d/*.conf</filename></member>
+      <member><filename>/usr/lib/sysusers.d/*.conf</filename></member>
+    </simplelist></para>
 
     <programlisting>
 #Type Name       ID                  GECOS              Home directory Shell

diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
index e804f5fb8410f437e4beb920ba9ad0fc694001e2..b2000383760c1ef00e6db74fd245d29882c9c837 100644 (file)
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
@@ -22,10 +22,12 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/systemd/timesyncd.conf</filename></para>
-    <para><filename>/etc/systemd/timesyncd.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/timesyncd.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/timesyncd.conf.d/*.conf</filename></para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/timesyncd.conf</filename></member>
+      <member><filename>/etc/systemd/timesyncd.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/timesyncd.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/timesyncd.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 6bf2f9c806f2c52ab5387a7e6c00821ebec5ad1e..1800de903aa49cfd306fb203547d0690f92f6fd7 100644 (file)
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -25,17 +25,19 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><literallayout><filename>/etc/tmpfiles.d/*.conf</filename>
-<filename>/run/tmpfiles.d/*.conf</filename>
-<filename>/usr/lib/tmpfiles.d/*.conf</filename>
-    </literallayout></para>
-
-    <para><literallayout><filename>~/.config/user-tmpfiles.d/*.conf</filename>
-<filename>$XDG_RUNTIME_DIR/user-tmpfiles.d/*.conf</filename>
-<filename>~/.local/share/user-tmpfiles.d/*.conf</filename>
-<filename index='false'>…</filename>
-<filename>/usr/share/user-tmpfiles.d/*.conf</filename>
-    </literallayout></para>
+    <para><simplelist>
+      <member><filename>/etc/tmpfiles.d/*.conf</filename></member>
+      <member><filename>/run/tmpfiles.d/*.conf</filename></member>
+      <member><filename>/usr/lib/tmpfiles.d/*.conf</filename></member>
+    </simplelist></para>
+
+    <para><simplelist>
+      <member><filename>~/.config/user-tmpfiles.d/*.conf</filename></member>
+      <member><filename>$XDG_RUNTIME_DIR/user-tmpfiles.d/*.conf</filename></member>
+      <member><filename>~/.local/share/user-tmpfiles.d/*.conf</filename></member>
+      <member><filename index='false'>…</filename></member>
+      <member><filename>/usr/share/user-tmpfiles.d/*.conf</filename></member>
+    </simplelist></para>
 
     <programlisting>#Type Path                                     Mode User Group Age         Argument
 f     /file/to/create                          mode user group -           content