Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 28 insertions, 27 deletions

diff --git a/man/systemd.environment-generator.xml b/man/systemd.environment-generator.xml
index 856f6a6..98acbcb 100644
--- a/man/systemd.environment-generator.xml
+++ b/man/systemd.environment-generator.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" [
 <!ENTITY % entities SYSTEM "custom-entities.ent" >
 %entities;
 ]>
@@ -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>
@@ -61,11 +61,12 @@
     above. System and user environment generators are loaded from directories with names ending in
     <filename>system-environment-generators/</filename> and
     <filename>user-environment-generators/</filename>, respectively. Generators found in directories
-    listed earlier override the ones with the same name in directories lower in the list. A symlink
-    to <filename>/dev/null</filename> or an empty file can be used to mask a generator, thereby
-    preventing it from running. Please note that the order of the two directories with the highest
-    priority is reversed with respect to the unit load path, and generators in
-    <filename>/run/</filename> overwrite those in <filename>/etc/</filename>.</para>
+    listed earlier override the ones with the same name in directories lower in the list
+    <xi:include href="standard-conf.xml" xpointer="usr-local-footnote" />.
+    A symlink to <filename>/dev/null</filename> or an empty file can be used to mask a generator,
+    thereby preventing it from running. Please note that the order of the two directories with the highest
+    priority is reversed with respect to the unit load path, and generators in <filename>/run/</filename>
+    overwrite those in <filename>/etc/</filename>.</para>
 
     <para>After installing new generators or updating the configuration, <command>systemctl
     daemon-reload</command> may be executed. This will re-run all generators, updating environment
@@ -122,13 +123,13 @@
   </refsect1>
 
   <refsect1>
-    <title>See also</title>
-
-    <para>
-      <citerefentry><refentrytitle>systemd-environment-d-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    </para>
+    <title>See Also</title>
+
+    <para><simplelist type="inline">
+      <member><citerefentry><refentrytitle>systemd-environment-d-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+    </simplelist></para>
   </refsect1>
 </refentry>