man: drop whitespace from final <programlisting> lines

In the troff output, this doesn't seem to make any difference. But in the
html output, the whitespace is sometimes preserved, creating an additional
gap before the following content. Drop it everywhere to avoid this.

(cherry picked from commit fe45f8dc9bf1e9be8de4e14838bc2d7befcf946b)

diff --git a/man/environment.d.xml b/man/environment.d.xml
index 942122ed42d201eaa16905770624c7aaf346c3c7..288450f934b5c562170819566e048e7ef21411ad 100644 (file)
--- a/man/environment.d.xml
+++ b/man/environment.d.xml
@@ -86,7 +86,7 @@
         PATH=/opt/foo/bin:$PATH
         LD_LIBRARY_PATH=/opt/foo/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
         XDG_DATA_DIRS=/opt/foo/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}
-        </programlisting>
+</programlisting>
       </example>
     </refsect2>
   </refsect1>

diff --git a/man/libsystemd.xml b/man/libsystemd.xml
index 34bd62ed52cc2ec0c8815afc93127c0afb027cc1..1e864e7b7c090315b98e458b20f5399ede213c1c 100644 (file)
--- a/man/libsystemd.xml
+++ b/man/libsystemd.xml
@@ -36,7 +36,7 @@
 #include <systemd/sd-login.h>
 #include <systemd/sd-messages.h>
 #include <systemd/sd-path.h>
-    </programlisting>
+</programlisting>
 
     <cmdsynopsis>
       <command>pkg-config --cflags --libs libsystemd</command>

diff --git a/man/loader.conf.xml b/man/loader.conf.xml
index 068aa3b54a63caf4bccabbf7cce16d714f343368..8e67c2bc1ae381dd92d6a1e78e3ced0c1ab64d5f 100644 (file)
--- a/man/loader.conf.xml
+++ b/man/loader.conf.xml
@@ -362,7 +362,7 @@ attr=NON_VOLATILE,RUNTIME_ACCESS,BOOTSERVICE_ACCESS,TIME_BASED_AUTHENTICATED_WRI
 sbvarsign --attr "${attr}" --key PK.key --cert PK.pem --output PK.auth PK PK.esl
 sbvarsign --attr "${attr}" --key PK.key --cert PK.pem --output KEK.auth KEK KEK.esl
 sbvarsign --attr "${attr}" --key KEK.key --cert KEK.pem --output db.auth db db.esl
-        </programlisting>
+</programlisting>
 
         <para>This feature is considered dangerous because even if all the required files are signed with the
         keys being loaded, some files necessary for the system to function properly still won't be. This
@@ -409,7 +409,7 @@ sbvarsign --attr "${attr}" --key KEK.key --cert KEK.pem --output db.auth db db.e
 timeout 0
 default 01234567890abcdef1234567890abdf0-*
 editor no
-    </programlisting>
+</programlisting>
 
     <para>The menu will not be shown by default (the menu can still be shown by
     pressing and holding a key during boot). One of the entries with files with a

diff --git a/man/org.freedesktop.LogControl1.xml b/man/org.freedesktop.LogControl1.xml
index 5738a3dda678b50ea94cb3ddaf4f5589712c007e..42e331a0da9133d2ef953ddd0db6439e42a7d22b 100644 (file)
--- a/man/org.freedesktop.LogControl1.xml
+++ b/man/org.freedesktop.LogControl1.xml
@@ -55,7 +55,7 @@ node /org/freedesktop/LogControl1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 

diff --git a/man/org.freedesktop.home1.xml b/man/org.freedesktop.home1.xml
index 9334f1a596ec82cabcc2c43e279b8da18a0d1ffb..dd947a3ed4fecb71bb056fa4edb15e7c86121173 100644 (file)
--- a/man/org.freedesktop.home1.xml
+++ b/man/org.freedesktop.home1.xml
@@ -125,7 +125,7 @@ node /org/freedesktop/home1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -337,7 +337,7 @@ node /org/freedesktop/home1 {
       can be used to further customize the behavior of this method via flags defined as follows:</para>
       <programlisting>
 #define SD_HOMED_UPDATE_OFFLINE (UINT64_C(1) &lt;&lt; 0)
-      </programlisting>
+</programlisting>
       <para>When <constant>SD_HOMED_UPDATE_OFFLINE</constant> (0x01) is set, no attempt is made to update the copies
       of the user record and blob directory that are embedded into the home directory. Changes will be stored, however,
       and may be propagated into the home directory the next time it is reconciled (most likely when the user next logs in).
@@ -495,7 +495,7 @@ node /org/freedesktop/home1/home {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.DBus.ObjectManager { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 

diff --git a/man/org.freedesktop.hostname1.xml b/man/org.freedesktop.hostname1.xml
index 6c329cbd2c05d9cf8d4b9bccf544b328da6783af..9e712c94c2cd32ef9de7f8fb7cacb874462d056e 100644 (file)
--- a/man/org.freedesktop.hostname1.xml
+++ b/man/org.freedesktop.hostname1.xml
@@ -106,7 +106,7 @@ node /org/freedesktop/hostname1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -436,7 +436,7 @@ node /org/freedesktop/hostname1 {
       <programlisting>$ gdbus introspect --system \
   --dest org.freedesktop.hostname1 \
   --object-path /org/freedesktop/hostname1
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/org.freedesktop.import1.xml b/man/org.freedesktop.import1.xml
index cfcf1339755c6d6997d1488eed3c199ccf2c9d71..146adf6bcf0e0424045ca2e1d49f029569d34f14 100644 (file)
--- a/man/org.freedesktop.import1.xml
+++ b/man/org.freedesktop.import1.xml
@@ -155,7 +155,7 @@ node /org/freedesktop/import1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -362,7 +362,7 @@ node /org/freedesktop/import1/transfer/_1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -439,7 +439,7 @@ node /org/freedesktop/import1/transfer/_1 {
       <programlisting>$ gdbus introspect --system \
   --dest org.freedesktop.import1 \
   --object-path /org/freedesktop/import1
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -448,7 +448,7 @@ node /org/freedesktop/import1/transfer/_1 {
       <programlisting>$ gdbus introspect --system \
   --dest org.freedesktop.import1 \
   --object-path /org/freedesktop/import1/transfer/_1
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/org.freedesktop.locale1.xml b/man/org.freedesktop.locale1.xml
index 0fd8876ca891195e97b0323755c4244af89b2c61..4e42c2907084b31a39d974ef24b2f0eda30462e0 100644 (file)
--- a/man/org.freedesktop.locale1.xml
+++ b/man/org.freedesktop.locale1.xml
@@ -63,7 +63,7 @@ node /org/freedesktop/locale1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -175,7 +175,7 @@ node /org/freedesktop/locale1 {
 $ gdbus introspect --system \
   --dest org.freedesktop.locale1 \
   --object-path /org/freedesktop/locale1
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/org.freedesktop.login1.xml b/man/org.freedesktop.login1.xml
index dddb7e8acb8ce81553551295dd27038179975b72..b154d100dc3b47722d0c043d8fb93cf6050b045b 100644 (file)
--- a/man/org.freedesktop.login1.xml
+++ b/man/org.freedesktop.login1.xml
@@ -281,7 +281,7 @@ node /org/freedesktop/login1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--property SleepOperation is not documented!-->
 
@@ -650,7 +650,7 @@ node /org/freedesktop/login1 {
 #define SD_LOGIND_KEXEC_REBOOT                   (UINT64_C(1) &lt;&lt; 1)
 #define SD_LOGIND_SOFT_REBOOT                    (UINT64_C(1) &lt;&lt; 2)
 #define SD_LOGIND_SOFT_REBOOT_IF_NEXTROOT_SET_UP (UINT64_C(1) &lt;&lt; 3)
-      </programlisting>
+</programlisting>
       <para>When the <varname>flags</varname> is 0 then these methods behave just like the versions without
       flags. When <constant>SD_LOGIND_ROOT_CHECK_INHIBITORS</constant> (0x01) is set, active inhibitors are
       honoured for privileged users too. When <constant>SD_LOGIND_KEXEC_REBOOT</constant> (0x02) is set,
@@ -903,7 +903,7 @@ node /org/freedesktop/login1/seat/seat0 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -1023,7 +1023,7 @@ node /org/freedesktop/login1/user/_1000 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -1214,7 +1214,7 @@ node /org/freedesktop/login1/session/1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -1511,12 +1511,12 @@ node /org/freedesktop/login1/session/1 {
 
       <programlisting>$ gdbus introspect --system --dest org.freedesktop.login1 \
   --object-path /org/freedesktop/login1
-      </programlisting>
+</programlisting>
 
       <para>or</para>
 
       <programlisting>$ busctl introspect org.freedesktop.login1 /org/freedesktop/login1
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -1524,12 +1524,12 @@ node /org/freedesktop/login1/session/1 {
 
       <programlisting>$ gdbus introspect --system --dest org.freedesktop.login1 \
  --object-path /org/freedesktop/login1/seat/seat0
-      </programlisting>
+</programlisting>
 
       <para>or</para>
 
       <programlisting>$ busctl introspect org.freedesktop.login1 /org/freedesktop/login1/seat/seat0
-      </programlisting>
+</programlisting>
 
       <para>Seat <literal>seat0</literal> is the default seat, so it'll be present unless local configuration
       is made to reassign all devices to a different seat. The list of seats and users can be acquired with
@@ -1541,12 +1541,12 @@ node /org/freedesktop/login1/session/1 {
 
       <programlisting>$ gdbus introspect --system --dest org.freedesktop.login1 \
   --object-path /org/freedesktop/login1/user/_1000
-      </programlisting>
+</programlisting>
 
       <para>or</para>
 
       <programlisting>$ busctl introspect org.freedesktop.login1 /org/freedesktop/login1/user/_1000
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -1554,12 +1554,12 @@ node /org/freedesktop/login1/session/1 {
 
       <programlisting>$ gdbus introspect --system --dest org.freedesktop.login1 \
   --object-path /org/freedesktop/login1/session/45
-      </programlisting>
+</programlisting>
 
       <para>or</para>
 
       <programlisting>$ busctl introspect org.freedesktop.login1 /org/freedesktop/login1/session/45
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/org.freedesktop.machine1.xml b/man/org.freedesktop.machine1.xml
index 8726e5f9398d9a8df80565d655592e4ac5626dae..055749ee263424fb57f10589a73cbfe7dba62038 100644 (file)
--- a/man/org.freedesktop.machine1.xml
+++ b/man/org.freedesktop.machine1.xml
@@ -183,7 +183,7 @@ node /org/freedesktop/machine1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method UnregisterMachine is not documented!-->
 
@@ -531,7 +531,7 @@ node /org/freedesktop/machine1/machine/rawhide {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method GetUIDShift is not documented!-->
 
@@ -687,7 +687,7 @@ node /org/freedesktop/machine1/machine/rawhide {
 $ gdbus introspect --system \
   --dest org.freedesktop.machine1 \
   --object-path /org/freedesktop/machine1
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -697,7 +697,7 @@ $ gdbus introspect --system \
 $ gdbus introspect --system \
   --dest org.freedesktop.machine1 \
   --object-path /org/freedesktop/machine1/machine/rawhide
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/org.freedesktop.network1.xml b/man/org.freedesktop.network1.xml
index c7f1a687989bd1eeda829997bd8582ec89a5bf17..0b7a6b5ed3d11fa2b6e6a4c2058a4990fee89e8d 100644 (file)
--- a/man/org.freedesktop.network1.xml
+++ b/man/org.freedesktop.network1.xml
@@ -94,7 +94,7 @@ node /org/freedesktop/network1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method ListLinks is not documented!-->
 
@@ -270,7 +270,7 @@ node /org/freedesktop/network1/link/_1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method SetNTP is not documented!-->
 
@@ -407,7 +407,7 @@ node /org/freedesktop/network1/network/_1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--property Description is not documented!-->
 
@@ -464,7 +464,7 @@ node /org/freedesktop/network1/link/_1 {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.network1.Link { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--property Leases is not documented!-->
 
@@ -501,7 +501,7 @@ node /org/freedesktop/network1/link/_1 {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.network1.Link { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--property State is not documented!-->
 
@@ -538,7 +538,7 @@ node /org/freedesktop/network1/link/_1 {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.network1.Link { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--property State is not documented!-->
 
@@ -571,7 +571,7 @@ node /org/freedesktop/network1/link/_1 {
 $ gdbus introspect --system \
   --dest org.freedesktop.network1 \
   --object-path /org/freedesktop/network1
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -581,7 +581,7 @@ $ gdbus introspect --system \
 $ gdbus introspect --system \
   --dest org.freedesktop.network1 \
   --object-path /org/freedesktop/network1/link/_11
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/org.freedesktop.oom1.xml b/man/org.freedesktop.oom1.xml
index 4b61119d6b9ed8d039ab0dfb1578336bc501ee4d..3c9958315c9b7d94cc7fe691219de916bcf880c8 100644 (file)
--- a/man/org.freedesktop.oom1.xml
+++ b/man/org.freedesktop.oom1.xml
@@ -47,7 +47,7 @@ node /org/freedesktop/oom1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method DumpByFileDescriptor is not documented!-->
 

diff --git a/man/org.freedesktop.portable1.xml b/man/org.freedesktop.portable1.xml
index af5e303e6e483973acea42287a06639760434a5c..6ba1a339129137d9ca826d01eb189de382be19d8 100644 (file)
--- a/man/org.freedesktop.portable1.xml
+++ b/man/org.freedesktop.portable1.xml
@@ -117,7 +117,7 @@ node /org/freedesktop/portable1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -329,7 +329,7 @@ node /org/freedesktop/portable1 {
 #define SD_SYSTEMD_PORTABLE_RUNTIME            (UINT64_C(1) &lt;&lt; 0)
 #define SD_SYSTEMD_PORTABLE_FORCE_ATTACH       (UINT64_C(1) &lt;&lt; 1)
 #define SD_SYSTEMD_PORTABLE_FORCE_EXTENSION    (UINT64_C(1) &lt;&lt; 2)
-      </programlisting>
+</programlisting>
     </refsect2>
 
     <refsect2>
@@ -428,7 +428,7 @@ node /org/freedesktop/portable1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method GetOSRelease is not documented!-->
 

diff --git a/man/org.freedesktop.resolve1.xml b/man/org.freedesktop.resolve1.xml
index 07c0528b5c5b5c3e3692ad5b5264eb65e176e289..a9c121d12f5dc06388268e5c156dabaf5739edc1 100644 (file)
--- a/man/org.freedesktop.resolve1.xml
+++ b/man/org.freedesktop.resolve1.xml
@@ -154,7 +154,7 @@ node /org/freedesktop/resolve1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -705,7 +705,7 @@ node /org/freedesktop/resolve1/link/_1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -920,7 +920,7 @@ node /org/freedesktop/resolve1/link/_1 {
 $ gdbus introspect --system \
   --dest org.freedesktop.resolve1 \
   --object-path /org/freedesktop/resolve1
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -930,7 +930,7 @@ $ gdbus introspect --system \
 $ gdbus introspect --system \
   --dest org.freedesktop.resolve1 \
   --object-path /org/freedesktop/resolve1/link/_11
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
index 295106f4fa6245430e82988e2db58068d79c4c07..d52efc81bbd56f4a1103b004f65718edfbe39edb 100644 (file)
--- a/man/org.freedesktop.systemd1.xml
+++ b/man/org.freedesktop.systemd1.xml
@@ -567,7 +567,7 @@ node /org/freedesktop/systemd1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method GetUnitByInvocationID is not documented!-->
 
@@ -1515,7 +1515,7 @@ node /org/freedesktop/systemd1 {
 #define SD_SYSTEMD_UNIT_RUNTIME  (UINT64_C(1) &lt;&lt; 0)
 #define SD_SYSTEMD_UNIT_FORCE    (UINT64_C(1) &lt;&lt; 1)
 #define SD_SYSTEMD_UNIT_PORTABLE (UINT64_C(1) &lt;&lt; 2)
-      </programlisting>
+</programlisting>
 
       <para><varname>SD_SYSTEMD_UNIT_RUNTIME</varname> will enable or disable the unit for runtime only,
       <varname>SD_SYSTEMD_UNIT_FORCE</varname> controls whether symlinks pointing to other units shall be
@@ -2120,7 +2120,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method EnqueueJob is not documented!-->
 
@@ -3339,7 +3339,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -5456,7 +5456,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -6788,7 +6788,7 @@ node /org/freedesktop/systemd1/unit/basic_2etarget {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <para>Target units have neither type-specific methods nor properties.</para>
   </refsect1>
@@ -6811,7 +6811,7 @@ node /org/freedesktop/systemd1/unit/dev_2dttyS0_2edevice {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -7429,7 +7429,7 @@ node /org/freedesktop/systemd1/unit/home_2emount {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -8598,7 +8598,7 @@ node /org/freedesktop/systemd1/unit/proc_2dsys_2dfs_2dbinfmt_5fmisc_2eautomount
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--property Where is not documented!-->
 
@@ -8687,7 +8687,7 @@ node /org/freedesktop/systemd1/unit/systemd_2dtmpfiles_2dclean_2etimer {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--property OnClockChange is not documented!-->
 
@@ -9363,7 +9363,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -10508,7 +10508,7 @@ node /org/freedesktop/systemd1/unit/cups_2epath {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--property MakeDirectory is not documented!-->
 
@@ -10768,7 +10768,7 @@ node /org/freedesktop/systemd1/unit/system_2eslice {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -11391,7 +11391,7 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope {
   interface org.freedesktop.DBus.Properties { ... };
   interface org.freedesktop.systemd1.Unit { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method GetProcesses is not documented!-->
 
@@ -11883,7 +11883,7 @@ node /org/freedesktop/systemd1/job/666 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--method GetAfter is not documented!-->
 
@@ -11955,7 +11955,7 @@ node /org/freedesktop/systemd1/job/666 {
 $ gdbus introspect --system \
         --dest org.freedesktop.systemd1 \
         --object-path /org/freedesktop/systemd1
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -11967,7 +11967,7 @@ $ busctl introspect org.freedesktop.systemd1 \
      /org/freedesktop/systemd1 \
      org.freedesktop.systemd1.Manager \
      GetUnit s systemd-resolved.service | cut -d'"' -f2)
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -11976,7 +11976,7 @@ $ busctl introspect org.freedesktop.systemd1 \
       <programlisting>
 $ gdbus introspect --system --dest org.freedesktop.systemd1 \
   --object-path /org/freedesktop/systemd1/job/1292
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/org.freedesktop.timedate1.xml b/man/org.freedesktop.timedate1.xml
index d0271145f9f2351911480adb052c416e23c7d672..d5044eac71a1b243358ac182609ba34e8b81b46b 100644 (file)
--- a/man/org.freedesktop.timedate1.xml
+++ b/man/org.freedesktop.timedate1.xml
@@ -66,7 +66,7 @@ node /org/freedesktop/timedate1 {
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
 };
-    </programlisting>
+</programlisting>
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
@@ -186,7 +186,7 @@ node /org/freedesktop/timedate1 {
 $ gdbus introspect --system \
   --dest org.freedesktop.timedate1 \
   --object-path /org/freedesktop/timedate1
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index d6fc6bb8b8d4ece127ae1789c8263e97739b54bf..40f07bf13b0ee4f4f597216dc8f3e7f87590d5f4 100644 (file)
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -393,7 +393,7 @@ pam_set_data(handle, "systemd.tasks_max",  (void *)"50",   cleanup);
 pam_set_data(handle, "systemd.cpu_weight", (void *)"100",  cleanup);
 pam_set_data(handle, "systemd.io_weight",  (void *)"340",  cleanup);
 pam_set_data(handle, "systemd.runtime_max_sec", (void *)"3600", cleanup);
-      </programlisting>
+</programlisting>
     </para>
 
   </refsect1>

diff --git a/man/pam_systemd_loadkey.xml b/man/pam_systemd_loadkey.xml
index 13d1686bd1e6e4340fa504058f69e30fbabb509a..1cc0ddb8829e450ed1c5d6daa493ff01dc62cdfc 100644 (file)
--- a/man/pam_systemd_loadkey.xml
+++ b/man/pam_systemd_loadkey.xml
@@ -119,14 +119,14 @@
 -auth       optional    pam_gnome_keyring.so
 -session    optional    pam_gnome_keyring.so auto_start
 -session    optional    pam_kwallet5.so auto_start
-    </programlisting>
+</programlisting>
 
     <para>And add the following lines to your display manager's systemd service file, so it can access root's keyring:</para>
 
     <programlisting>
 [Service]
 KeyringMode=inherit
-    </programlisting>
+</programlisting>
 
     <para>In this setup, early during the boot process,
     <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>

diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
index 64c52ffefe73347b37e5c82226cfaf174056b1a2..57d78ad503cc2ee03a9bd77adaad6095b957ee6c 100644 (file)
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -194,12 +194,12 @@ sd_bus_message_append(m, "ynqiuxtd", y, n, q, i, u, x, t, d);</programlisting>
      <para>Append a structure composed of a string and a D-Bus path:</para>
 
      <programlisting>sd_bus_message_append(m, "(so)", "a string", "/a/path");
-    </programlisting>
+</programlisting>
 
      <para>Append an array of UNIX file descriptors:</para>
 
      <programlisting>sd_bus_message_append(m, "ah", 3, STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO);
-    </programlisting>
+</programlisting>
 
      <para>Append a variant, with the real type "g" (signature),
      and value "sdbusisgood":</para>
@@ -210,7 +210,7 @@ sd_bus_message_append(m, "ynqiuxtd", y, n, q, i, u, x, t, d);</programlisting>
      </para>
 
      <programlisting>sd_bus_message_append(m, "a{is}", 3, 1, "a", 2, "b", 3, NULL);
-     </programlisting>
+</programlisting>
   </refsect1>
 
   <refsect1>

diff --git a/man/sd_bus_message_dump.xml b/man/sd_bus_message_dump.xml
index 183fffd36ad42e332c9a500d17221a72cd376f65..1ebeece8f16577d58cda2c8ffb6da0fcd4c33277 100644 (file)
--- a/man/sd_bus_message_dump.xml
+++ b/man/sd_bus_message_dump.xml
@@ -83,7 +83,7 @@
                   STRING "AnExplicitProperty";
           };
   };
-    </programlisting>
+</programlisting>
     </para>
   </refsect1>
 

diff --git a/man/sd_bus_message_read.xml b/man/sd_bus_message_read.xml
index 7d10ce4f3a2537c749fa948c4af195b1b293a07c..7ee34489685ad336b37513d057f121ba412a4c88 100644 (file)
--- a/man/sd_bus_message_read.xml
+++ b/man/sd_bus_message_read.xml
@@ -249,7 +249,7 @@ sd_bus_message_read(m, "v", "gt", &amp;s, &amp;v);</programlisting>
 const char *s, *t, *u;
 
 sd_bus_message_read(m, "a{is}", 3, &amp;i, &amp;s, &amp;j, &amp;t, &amp;k, &amp;u);
-     </programlisting>
+</programlisting>
 
      <para>Read a single file descriptor, and duplicate it in order to keep it open after the message is
      freed.</para>

diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index 95bb0bef4631ab4c2b68b3cc1c7dbdcd52d07916..12f56287833a9ab1a36394b371acfb82c9937b5b 100644 (file)
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -262,7 +262,7 @@
              |
              v
           FINISHED
-    </programlisting>
+</programlisting>
   </refsect1>
 
   <refsect1>

diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 35c450b12815f6fbcb4b7b40dedc2ba8f677b20e..d4ac7e70dc501660f7ee21d9b48c7af81dcc5b29 100644 (file)
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -581,7 +581,7 @@ sd_notifyf(0, "STATUS=Failed to start up: %s\n"
 sd_notify(0, "READY=1");
 /* set timeout to 5 seconds */
 sd_notify_barrier(0, 5 * 1000000);
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/systemctl.xml b/man/systemctl.xml
index bea596536fc7d839fb3f2149ee11dd0b1068b006..3dc1cca82f5be1a36a996ea328ad982cc12e3aae 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -192,7 +192,7 @@ NEXT                         LEFT          LAST                         PASSED
 Sun 2017-02-26 18:55:42 EST  1min 14s left Thu 2017-02-23 13:54:44 EST  3 days ago systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.service
 Sun 2017-02-26 20:37:16 EST  1h 42min left Sun 2017-02-26 11:56:36 EST  6h ago     apt-daily.timer              apt-daily.service
 Sun 2017-02-26 20:57:49 EST  2h 3min left  Sun 2017-02-26 11:56:36 EST  6h ago     snapd.refresh.timer          snapd.refresh.service
-            </programlisting>
+</programlisting>
             </para>
 
             <para><emphasis>NEXT</emphasis> shows the next time the timer will run.</para>
@@ -2883,7 +2883,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
 [Unit]
 AllowedCPUs=7,11
 EOF
-          </programlisting>
+</programlisting>
 
           <para>Multiple drop-ins may be "edited" in this mode; the same contents will be written to all of
           them.</para>

diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 9a4b0cada41acd88b8a583ee1967ecf40fc7ac13..f1608dc6b7c25a1886d5a8ad019c7c6154fb0c59 100644 (file)
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -252,7 +252,7 @@ multi-user.target reached after 47.820s in userspace
             23ms sysroot.mount
             11ms initrd-udevadm-cleanup-db.service
              3ms sys-kernel-config.mount
-        </programlisting>
+</programlisting>
       </example>
     </refsect2>
 
@@ -621,7 +621,7 @@ NAutoVTs=8
 
 # /etc/systemd/logind.conf.d/50-override.conf
 ... some administrator override
-        </programlisting>
+</programlisting>
       </example>
     </refsect2>
 
@@ -667,7 +667,7 @@ $ systemd-analyze compare-versions 1 lt 2; echo $?
 0
 $ systemd-analyze compare-versions 1 ge 2; echo $?
 1
-        </programlisting>
+</programlisting>
       </example>
     </refsect2>
 
@@ -717,7 +717,7 @@ Error: org.freedesktop.systemd1.LoadFailed:
    No such file or directory.
 Failed to create user.slice/start: Invalid argument
 user.slice: man nosuchfile(1) command failed with code 16
-        </programlisting>
+</programlisting>
       </example>
 
       <example>
@@ -736,7 +736,7 @@ Accept=yes
 $ systemd-analyze verify ./a.socket ./b.socket
 Service a.service not loaded, a.socket cannot be started.
 Service b@0.service not loaded, b.socket cannot be started.
-        </programlisting>
+</programlisting>
       </example>
 
       <example>
@@ -756,7 +756,7 @@ Failed to prepare filename /tmp/source: Invalid argument
 
 $ systemd-analyze verify /tmp/source:alias.service
 alias.service:7: Unknown key name 'MysteryKey' in section 'Service', ignoring.
-        </programlisting>
+</programlisting>
       </example>
 
     </refsect2>
@@ -835,7 +835,7 @@ alias.service:7: Unknown key name 'MysteryKey' in section 'Service', ignoring.
                 "buildId" : "b5e428254abf14237b0ae70ed85fffbb98a78f88"
         }
 }
-        </programlisting>
+</programlisting>
       </example>
     </refsect2>
 
@@ -1617,7 +1617,7 @@ x86-64      native</programlisting>
     "range": 1
     }
 }
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index 82f1bcd295dd42b9b301a0a0b2b68e6153b99f4d..737b80de9ae181cd0b76570b48a6c8e1867a7efe 100644 (file)
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -172,7 +172,7 @@ COREDUMP_CMDLINE=/usr/lib64/firefox/firefox -contentproc -childID 5 -isForBrowse
 COREDUMP_CGROUP=/user.slice/user-1000.slice/user@1000.service/app.slice/app-….scope
 COREDUMP_FILENAME=/var/lib/systemd/coredump/core.Web….552351.….zst
 …
-    </programlisting>
+</programlisting>
 
     <para>The following fields are saved (if known) with the journal entry</para>
 
@@ -305,7 +305,7 @@ flags:   ...
 pos:     ...
 flags:   ...
 ...
-        </programlisting>
+</programlisting>
 
         <para>The first line contains the file descriptor number <replaceable>fd</replaceable> and the path,
         while subsequent lines show the contents of

diff --git a/man/systemd-id128.xml b/man/systemd-id128.xml
index e23532d65d883b0d3b5969000de13729930d590e..c5b00874774283ab8f0dee446f17672f86fbccfc 100644 (file)
--- a/man/systemd-id128.xml
+++ b/man/systemd-id128.xml
@@ -174,7 +174,7 @@ $ systemd-id128 show --value --uuid user-home
 $ systemd-id128 show 773f91ef-66d4-49b5-bd83-d683bf40ad16
 NAME      ID
 user-home 773f91ef66d449b5bd83d683bf40ad16
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -193,7 +193,7 @@ $ systemd-id128 machine-id -u -a 1fb8f24b-02df-458d-9659-cc8ace68e28a
 $ systemd-id128 -Pu show 3a9d668b-4db7-4939-8a4a-5e78a03bffb7 \
     -a 1fb8f24b-02df-458d-9659-cc8ace68e28a
 47b82cb1-5339-43da-b2a6-1c350aef1bd1
-      </programlisting>
+</programlisting>
 
       <para>On a given machine with the ID 3a9d668b-4db7-4939-8a4a-5e78a03bffb7, for the application
       1fb8f24b-02df-458d-9659-cc8ace68e28a, we generate an application-specific machine ID

diff --git a/man/systemd-journal-remote.service.xml b/man/systemd-journal-remote.service.xml
index a49ca126b5f1c522887ab369ed1b99634bb85a82..be195a05086555809bb29c5057c799eff967514a 100644 (file)
--- a/man/systemd-journal-remote.service.xml
+++ b/man/systemd-journal-remote.service.xml
@@ -343,7 +343,7 @@
     <para>Copy local journal events to a different journal directory:
     <programlisting>
 journalctl -o export | systemd-journal-remote -o /tmp/dir/foo.journal -
-    </programlisting>
+</programlisting>
     </para>
 
     <para>Retrieve all available events from a remote
@@ -352,7 +352,7 @@ journalctl -o export | systemd-journal-remote -o /tmp/dir/foo.journal -
     <filename>/var/log/journal/remote/remote-some.host.journal</filename>:
     <programlisting>
 systemd-journal-remote --url http://some.host:19531/
-    </programlisting>
+</programlisting>
     </para>
 
     <para>Retrieve current boot events and wait for new events from a remote
@@ -361,7 +361,7 @@ systemd-journal-remote --url http://some.host:19531/
     <filename>/var/log/journal/remote/remote-some.host.journal</filename>:
     <programlisting>
 systemd-journal-remote --url http://some.host:19531/entries?boot&amp;follow
-    </programlisting>
+</programlisting>
     </para>
 </refsect1>
 

diff --git a/man/systemd-measure.xml b/man/systemd-measure.xml
index 8ea667426edb8a982e5153a7d96319b405355661..c7eca1b103d158568de70cf181f5af1fa7538152 100644 (file)
--- a/man/systemd-measure.xml
+++ b/man/systemd-measure.xml
@@ -369,7 +369,7 @@ $ openssl rsa -pubout -in tpm2-pcr-initrd-private.pem -out tpm2-pcr-initrd-publi
 --public-key=tpm2-pcr-initrd-public.pem \
 --phase=enter-initrd
 Wrote unsigned vmlinux-1.2.3.efi
-      </programlisting>
+</programlisting>
 
       <para><command>ukify</command> prints out both invocations of <command>systemd-measure</command> as
       informative output (the lines starting with <literal>+</literal>); this allows us to see how

diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index 6816b85d46161b680bc78aed605b4f4d0fdf19c0..8a24f09819d3ad2eab4491c3fea4a310b0aa941d 100644 (file)
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -263,7 +263,7 @@
       send them out over the network using the usual rules for multi-label name routing <footnote><para>For
       example, if <filename>/etc/resolv.conf</filename> has <programlisting>nameserver 127.0.0.53
 search foobar.com barbar.com
-      </programlisting>and we look up <literal>localhost</literal>, <filename>nss-dns</filename> will send
+</programlisting>and we look up <literal>localhost</literal>, <filename>nss-dns</filename> will send
       the following queries to <filename>systemd-resolved</filename> listening on 127.0.0.53:53: first
       <literal>localhost.foobar.com</literal>, then <literal>localhost.barbar.com</literal>, and finally
       <literal>localhost</literal>. If (hopefully) the first two queries fail,

diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index e1986c1f52fdc51fe4d1b483f75e37ab7a650139..27a4af71bc528768d0b14489f5a43f35480abb2a 100644 (file)
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -654,7 +654,7 @@ There is a screen on:
 
       <programlisting>$ systemd-run -t echo "&lt;${INVOCATION_ID}>" '&lt;${INVOCATION_ID}>'
       &lt;> &lt;5d0149bfa2c34b79bccb13074001eb20>
-      </programlisting>
+</programlisting>
 
       <para>The first argument is expanded by the shell (double quotes), but the second one is not expanded
       by the shell (single quotes).
@@ -680,7 +680,7 @@ There is a screen on:
       <programlisting>$ systemd-run --expand-environment=no -t bash \
       -c 'echo $SHELL $$ >/dev/stdout'
 /bin/bash 12345
-      </programlisting>
+</programlisting>
 
       <para>The last argument is passed verbatim to the
       <citerefentry project='man-pages'><refentrytitle>bash</refentrytitle><manvolnum>1</manvolnum></citerefentry>

diff --git a/man/systemd-vmspawn.xml b/man/systemd-vmspawn.xml
index 19dce8a517dff0ed354198d6e901bf80ed048019..035d7517f48ba708068f2ea38d2606dee3e5319a 100644 (file)
--- a/man/systemd-vmspawn.xml
+++ b/man/systemd-vmspawn.xml
@@ -508,7 +508,7 @@
       <programlisting>
 $ mkosi -d arch -p systemd -p linux --autologin -o image.raw -f build
 $ systemd-vmspawn --image=image.raw
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -523,7 +523,7 @@ $ gpgv --keyring ./fedora.gpg Fedora-Cloud-&fedora_latest_version;-&fedora_cloud
 $ sha256sum -c Fedora-Cloud-&fedora_latest_version;-&fedora_cloud_release;-x86_64-CHECKSUM
 # machinectl import-raw Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz fedora-&fedora_latest_version;-cloud
 # systemd-vmspawn -M fedora-&fedora_latest_version;-cloud
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -537,9 +537,10 @@ $ systemd-vmspawn \
     --linux mkosi.output/system.efi \
     --forward-journal=vm.journal \
     enforcing=0
-      </programlisting>
+</programlisting>
 
-      <para>Note: this example also uses a kernel command line argument to ensure SELinux isn't started in enforcing mode.</para>
+      <para>Note: this example also uses a kernel command line argument to ensure SELinux isn't started in
+      enforcing mode.</para>
     </example>
 
     <example>
@@ -555,7 +556,7 @@ $ systemd-vmspawn \
     --vsock-cid $my_vsock_cid \
     enforcing=0
 $ ssh root@vsock/$my_vsock_cid -i /run/user/$UID/systemd/vmspawn/machine-*-system-ed25519
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 9dc5a070dcb31dcfa52f422692e18e9e0d4cef8d..7acb15ec5aee8aa513aa762682832fd3b5d1d7f4 100644 (file)
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -4600,7 +4600,7 @@ OnFailure=myhandler.service
 
 [Service]
 ExecStart=/bin/myprogram
-        </programlisting>
+</programlisting>
 
         <para>A service <filename index="false">mysuccess.service</filename> which can trigger an
         <varname>OnSuccess=</varname> dependency.</para>
@@ -4612,7 +4612,7 @@ OnSuccess=myhandler.service
 
 [Service]
 ExecStart=/bin/mysecondprogram
-        </programlisting>
+</programlisting>
 
         <para>A service <filename index="false">myhandler.service</filename> which can be triggered
         by any of the above services.</para>
@@ -4623,7 +4623,7 @@ Description=Acts on service failing or succeeding
 
 [Service]
 ExecStart=/bin/bash -c "echo $MONITOR_SERVICE_RESULT $MONITOR_EXIT_CODE $MONITOR_EXIT_STATUS $MONITOR_INVOCATION_ID $MONITOR_UNIT"
-        </programlisting>
+</programlisting>
 
         <para>If <filename index="false">myfailer.service</filename> were to run and exit in failure,
         then <filename index="false">myhandler.service</filename> would be triggered and the
@@ -4635,7 +4635,7 @@ MONITOR_EXIT_CODE=exited
 MONITOR_EXIT_STATUS=1
 MONITOR_INVOCATION_ID=cc8fdc149b2b4ca698d4f259f4054236
 MONITOR_UNIT=myfailer.service
-        </programlisting>
+</programlisting>
 
         <para>If <filename index="false">mysuccess.service</filename> were to run and exit in success,
         then <filename index="false">myhandler.service</filename> would be triggered and the
@@ -4647,7 +4647,7 @@ MONITOR_EXIT_CODE=exited
 MONITOR_EXIT_STATUS=0
 MONITOR_INVOCATION_ID=6ab9af147b8c4a3ebe36e7a5f8611697
 MONITOR_UNIT=mysuccess.service
-        </programlisting>
+</programlisting>
 
     </example>
 

diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
index 79312988c406402eaed120bfbfa40d15d93c9c52..7b7fb95903e59b2a87573e7feff719f340ad87db 100644 (file)
--- a/man/systemd.net-naming-scheme.xml
+++ b/man/systemd.net-naming-scheme.xml
@@ -597,7 +597,7 @@ ID_NET_NAME_PATH=enp0s31f6
 
       <programlisting>ID_NET_NAME_ONBOARD=eno1
 ID_NET_NAME_ONBOARD_LABEL=Ethernet Port 1
-      </programlisting>
+</programlisting>
     </example>
 
     <example>
@@ -690,7 +690,7 @@ net:naming:drvirtio_net:*
   ID_NET_NAME_ALLOW=1
   ID_NET_NAME_ALLOW_DEV_PORT=0
   ID_NET_NAME_ALLOW_PHYS_PORT_NAME=0
-      </programlisting>
+</programlisting>
     </example>
   </refsect1>
 

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 4fba78895069dc071ccca276047ef2722e497837..61854df64249b4f078cb4c1ae1355da79c73e454 100644 (file)
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -2770,7 +2770,7 @@ Kind=fou
 [FooOverUDP]
 Port=5555
 Protocol=4
-      </programlisting>
+</programlisting>
     </example>
     <example>
       <title>/etc/systemd/network/25-fou-ipip.netdev</title>
@@ -2784,7 +2784,7 @@ Local=10.65.208.212
 Remote=10.65.208.211
 FooOverUDP=yes
 FOUDestinationPort=5555
-      </programlisting>
+</programlisting>
     </example>
     <example>
       <title>/etc/systemd/network/25-tap.netdev</title>
@@ -2903,7 +2903,7 @@ Table=42</programlisting>
       <programlisting>[NetDev]
 Name=macvtap-test
 Kind=macvtap
-      </programlisting>
+</programlisting>
     </example>
     <example>
       <title>/etc/systemd/network/25-wireguard.netdev</title>

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 708c37d61775d2edc46770e27dd7c362ea7019e5..0283ffa3760bc6095e3289aeb7b849d01d93a9f6 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -6333,31 +6333,31 @@ Tunnel=ipip-tun
 Tunnel=sit-tun
 Tunnel=gre-tun
 Tunnel=vti-tun
-      </programlisting>
+</programlisting>
 
       <programlisting>/etc/systemd/network/25-tunnel-ipip.netdev
 [NetDev]
 Name=ipip-tun
 Kind=ipip
-      </programlisting>
+</programlisting>
 
       <programlisting>/etc/systemd/network/25-tunnel-sit.netdev
 [NetDev]
 Name=sit-tun
 Kind=sit
-      </programlisting>
+</programlisting>
 
       <programlisting>/etc/systemd/network/25-tunnel-gre.netdev
 [NetDev]
 Name=gre-tun
 Kind=gre
-      </programlisting>
+</programlisting>
 
       <programlisting>/etc/systemd/network/25-tunnel-vti.netdev
 [NetDev]
 Name=vti-tun
 Kind=vti
-      </programlisting>
+</programlisting>
 
       <para>This will bring interface <literal>ens1</literal> up and create an IPIP tunnel,
       a SIT tunnel, a GRE tunnel, and a VTI tunnel using it.</para>

diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 2ffc279a35f4eb6d34205efcb5f2f9d0f3e3176e..7007bb34ed44876247ba68914e310670715b5138 100644 (file)
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -105,7 +105,7 @@ CPUWeight=20   DisableControllers=cpu              /          \
                /      \
        b1.service   b2.service
                     CPUWeight=1000
-        </programlisting>
+</programlisting>
 
         <para>In this hierarchy, the <option>cpu</option> controller is enabled for all units shown except
         <filename>b1.service</filename> and <filename>b2.service</filename>. Because there is no explicit

diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index 885c4644cbf3d63940ffed589a8d6d74cf7911a7..2cd9cfb9c4b914004bf7f78f89d4d07db41fa00a 100644 (file)
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -266,7 +266,7 @@ tomorrow Pacific/Auckland → Thu 2012-11-23 19:00:00
       yearly → *-01-01 00:00:00
    quarterly → *-01,04,07,10-01 00:00:00
 semiannually → *-01,07-01 00:00:00
-   </programlisting>
+</programlisting>
 
     <para>Examples for valid timestamps and their
     normalized form:</para>

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index dfc9f6f9940ddfabaf6b8ecbb3674e731232a033..44d92aa3beebd35d11aed6daf83a8444f301958d 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -2626,7 +2626,7 @@ Description=My failure handler for %i
 Type=oneshot
 # Perform some special action for when %i exits unexpectedly.
 ExecStart=/usr/sbin/myfailurehandler %i
-     </programlisting>
+</programlisting>
 
      <para>We can then add an instance of
      <filename index='false'>failure-handler@.service</filename> as an
@@ -2637,7 +2637,7 @@ ExecStart=/usr/sbin/myfailurehandler %i
 
     <programlisting>[Unit]
 OnFailure=failure-handler@%N.service
-    </programlisting>
+</programlisting>
 
     <para>Now, after running <command>systemctl daemon-reload</command> all
     services will have acquired an <varname>OnFailure=</varname> dependency on
@@ -2655,7 +2655,7 @@ OnFailure=failure-handler@%N.service
 <command>mkdir /etc/systemd/system/failure-handler@.service.d/</command>
 <command>ln -s /dev/null /etc/systemd/system/failure-handler@.service.d/10-all.conf</command>
 <command>systemctl daemon-reload</command>
-    </programlisting>
+</programlisting>
 
     <para>This ensures that if a <filename index='false'>failure-handler@.service</filename> instance fails it will not trigger an instance named
     <filename index='false'>failure-handler@failure-handler.service</filename>.</para>

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index e0baf3824c53cc1d00e856a18b106bc6b28b723d..34d4f1067181a7476357bb7c6ed7d09ebad216ba 100644 (file)
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -816,7 +816,7 @@ d /run/uscreens 0755 root screen 10d12h
       <title>Create a directory with a SMACK attribute</title>
       <programlisting>D /run/cups - - - -
 t /run/cups - - - - security.SMACK64=printing user.attr-with-spaces="foo bar"
-      </programlisting>
+</programlisting>
 
       <para>The directory will be owned by root and have default mode. Its contents are
       not subject to time-based cleanup, but will be obliterated when

diff --git a/man/ukify.xml b/man/ukify.xml
index f17342e0567c2d90cd0655ca12ace75e4e3da8c1..43259afd3ae0f329c8bb6a9b41a61294ee1d215b 100644 (file)
--- a/man/ukify.xml
+++ b/man/ukify.xml
@@ -569,7 +569,7 @@
       --linux=/lib/modules/6.0.9-300.fc37.x86_64/vmlinuz \
       --initrd=/some/path/initramfs-6.0.9-300.fc37.x86_64.img \
       --cmdline='quiet rw'
-      </programlisting>
+</programlisting>
 
       <para>This creates an unsigned UKI <filename>./vmlinuz.unsigned.efi</filename>.</para>
     </example>
@@ -595,7 +595,7 @@
       --secureboot-certificate=sb.cert \
       --sign-kernel \
       --cmdline='quiet rw rhgb'
-      </programlisting>
+</programlisting>
 
       <para>This creates a signed UKI <filename index='false'>./vmlinuz.signed.efi</filename>.
       The initrd section contains two concatenated parts, <filename index='false'>early_cpio</filename>
@@ -639,7 +639,7 @@ Phases=enter-initrd:leave-initrd
 $ ukify -c ukify.conf build \
         --linux=/lib/modules/6.0.9-300.fc37.x86_64/vmlinuz \
         --initrd=/some/path/initramfs-6.0.9-300.fc37.x86_64.img
-      </programlisting>
+</programlisting>
 
       <para>One "initrd" (<filename index='false'>early_cpio</filename>) is specified in the config file, and
       the other initrd (<filename index='false'>initramfs-6.0.9-300.fc37.x86_64.img</filename>) is specified
@@ -657,7 +657,7 @@ $ ukify -c ukify.conf build \
       --sbat='sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
       uki-addon.author,1,UKI Addon for System,uki-addon.author,1,https://www.freedesktop.org/software/systemd/man/systemd-stub.html'
       --output=debug.addon.efi
-      </programlisting>
+</programlisting>
 
       <para>This creates a signed PE binary that contains the additional kernel command line parameter
       <literal>debug</literal> with SBAT metadata referring to the owner of the addon.</para>

diff --git a/tools/update-dbus-docs.py b/tools/update-dbus-docs.py
index ce7161c5f14f180bfa81dbfbc8cb7045a1462007..17006f3d86c9c83cc7ad3ca9fafe85558718a714 100755 (executable)
--- a/tools/update-dbus-docs.py
+++ b/tools/update-dbus-docs.py
@@ -228,7 +228,7 @@ def subst_output(document, programlisting, stats, missing_version):
     xml = etree.fromstring(out, parser=xml_parser())
 
     new_text, declarations, interfaces = xml_to_text(node, xml, only_interface=interface)
-    programlisting.text = '\n' + new_text + '    '
+    programlisting.text = '\n' + new_text
 
     if declarations:
         missing = check_documented(document, declarations, stats, interface, missing_version)