diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-11-08 17:17:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-11-08 17:17:37 +0100 |
commit | 347def981b9861f508af663cbffffaff4e6df3c4 (patch) | |
tree | a779fb88848b886e0b46cbddd2d0f1a36c6d320c | |
parent | mount-util: make path_get_mount_info() work arbitrary inode (diff) | |
parent | man: drop whitespace from final <programlisting> lines (diff) | |
download | systemd-347def981b9861f508af663cbffffaff4e6df3c4.tar.xz systemd-347def981b9861f508af663cbffffaff4e6df3c4.zip |
News and f41 and formatting (#35078)
46 files changed, 156 insertions, 156 deletions
@@ -81,14 +81,13 @@ CHANGES WITH 257 in spe: * To work around limitations of X11's keyboard handling systemd's keyboard mapping hardware database (hwdb.d/60-keyboard.hwdb) so far mapped the microphone mute and touchpad on/off/toggle keys to the - function keys F20, F21, F22, F23 instead of their correct key - codes. This key code mangling will be removed in the next systemd - release v258. To maintain compatibility with X11 applications that - rely on the old function key code mappings, this mangling has now - been moved to the relevant X11 keyboard driver modules instead. Thus, - in order to ensure these keys continue to work as before, make sure - to update the xf86-input-evdev and xf86-input-libinput packages to - the newest version before updating systemd to v258. + function keys F20, F21, F22, F23 instead of their correct key codes. + This key code mangling will be removed in the next systemd release. + To maintain compatibility with X11 applications that rely on the old + function key code mappings, this mangling has now been moved to the + relevant X11 keyboard driver modules. In order to ensure these keys + continue to work, update to xf86-input-evdev >= 2.11.0 and + xf86-input-libinput >= 1.5.0 before updating to systemd >= 258. * Support for the SystemdOptions EFI variable is deprecated. 'bootctl systemd-efi-options' will emit a warning when used. It seems diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in index 8dfc1eb98c..b1f401bc90 100644 --- a/man/custom-entities.ent.in +++ b/man/custom-entities.ent.in @@ -18,5 +18,5 @@ <!ENTITY DEFAULT_TIMEOUT "{{DEFAULT_TIMEOUT_SEC}} s"> <!ENTITY DEFAULT_USER_TIMEOUT "{{DEFAULT_USER_TIMEOUT_SEC}} s"> <!ENTITY DEFAULT_KEYMAP "{{SYSTEMD_DEFAULT_KEYMAP}}"> -<!ENTITY fedora_latest_version "40"> -<!ENTITY fedora_cloud_release "1.10"> +<!ENTITY fedora_latest_version "41"> +<!ENTITY fedora_cloud_release "1.4"> diff --git a/man/environment.d.xml b/man/environment.d.xml index 942122ed42..288450f934 100644 --- 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 ef34571dd6..de41d2bf72 100644 --- a/man/libsystemd.xml +++ b/man/libsystemd.xml @@ -36,7 +36,7 @@ #include <systemd/sd-messages.h> #include <systemd/sd-path.h> #include <systemd/sd-varlink.h> - </programlisting> +</programlisting> <cmdsynopsis> <command>pkg-config --cflags --libs libsystemd</command> diff --git a/man/loader.conf.xml b/man/loader.conf.xml index 068aa3b54a..8e67c2bc1a 100644 --- 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 135e8bc8de..4cc66ef030 100644 --- 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 9334f1a596..dd947a3ed4 100644 --- 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) << 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 6c329cbd2c..9e712c94c2 100644 --- 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 cfcf133975..146adf6bcf 100644 --- 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 0fd8876ca8..4e42c29070 100644 --- 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 750d68518e..a69a8ecb35 100644 --- a/man/org.freedesktop.login1.xml +++ b/man/org.freedesktop.login1.xml @@ -289,7 +289,7 @@ node /org/freedesktop/login1 { interface org.freedesktop.DBus.Introspectable { ... }; interface org.freedesktop.DBus.Properties { ... }; }; - </programlisting> +</programlisting> <!--property SleepOperation is not documented!--> @@ -673,7 +673,7 @@ node /org/freedesktop/login1 { #define SD_LOGIND_SOFT_REBOOT (UINT64_C(1) << 2) #define SD_LOGIND_SOFT_REBOOT_IF_NEXTROOT_SET_UP (UINT64_C(1) << 3) #define SD_LOGIND_SKIP_INHIBITORS (UINT64_C(1) << 4) - </programlisting> +</programlisting> <para>When the <varname>flags</varname> is 0 then these methods behave just like the versions without flags. Since systemd version 257 active inhibitors are honoured by default for privileged users too. <constant>SD_LOGIND_ROOT_CHECK_INHIBITORS</constant> (0x01) now only applies to weak inhibitors, to @@ -945,7 +945,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--> @@ -1065,7 +1065,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--> @@ -1260,7 +1260,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--> @@ -1566,12 +1566,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> @@ -1579,12 +1579,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 @@ -1596,12 +1596,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> @@ -1609,12 +1609,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 50d9aa6792..7792320546 100644 --- 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 c7f1a68798..0b7a6b5ed3 100644 --- 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 4b61119d6b..3c9958315c 100644 --- 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 af5e303e6e..6ba1a33912 100644 --- 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) << 0) #define SD_SYSTEMD_PORTABLE_FORCE_ATTACH (UINT64_C(1) << 1) #define SD_SYSTEMD_PORTABLE_FORCE_EXTENSION (UINT64_C(1) << 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 07c0528b5c..a9c121d12f 100644 --- 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 e554e860ca..7e8b124c09 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -568,7 +568,7 @@ node /org/freedesktop/systemd1 { interface org.freedesktop.DBus.Introspectable { ... }; interface org.freedesktop.DBus.Properties { ... }; }; - </programlisting> +</programlisting> <!--method GetUnitByInvocationID is not documented!--> @@ -1532,7 +1532,7 @@ node /org/freedesktop/systemd1 { #define SD_SYSTEMD_UNIT_RUNTIME (UINT64_C(1) << 0) #define SD_SYSTEMD_UNIT_FORCE (UINT64_C(1) << 1) #define SD_SYSTEMD_UNIT_PORTABLE (UINT64_C(1) << 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 @@ -2140,7 +2140,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!--> @@ -3390,7 +3390,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!--> @@ -4856,7 +4856,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <programlisting> #define SD_EXEC_DIRECTORY_READ_ONLY (UINT64_C(1) << 0) - </programlisting> +</programlisting> <para><varname>ExtraFileDescriptorNames</varname> contains file descriptor names passed to the service via the <varname>ExtraFileDescriptors</varname> property in the <function>StartTransientUnit()</function> @@ -5575,7 +5575,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!--> @@ -6927,7 +6927,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> @@ -6950,7 +6950,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--> @@ -7582,7 +7582,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!--> @@ -8771,7 +8771,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!--> @@ -8862,7 +8862,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!--> @@ -9556,7 +9556,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!--> @@ -10721,7 +10721,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!--> @@ -10983,7 +10983,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!--> @@ -11615,7 +11615,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!--> @@ -12114,7 +12114,7 @@ node /org/freedesktop/systemd1/job/666 { interface org.freedesktop.DBus.Introspectable { ... }; interface org.freedesktop.DBus.Properties { ... }; }; - </programlisting> +</programlisting> <!--method GetAfter is not documented!--> @@ -12186,7 +12186,7 @@ node /org/freedesktop/systemd1/job/666 { $ gdbus introspect --system \ --dest org.freedesktop.systemd1 \ --object-path /org/freedesktop/systemd1 - </programlisting> +</programlisting> </example> <example> @@ -12198,7 +12198,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> @@ -12207,7 +12207,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.sysupdate1.xml b/man/org.freedesktop.sysupdate1.xml index a109cef04a..651422477a 100644 --- a/man/org.freedesktop.sysupdate1.xml +++ b/man/org.freedesktop.sysupdate1.xml @@ -53,7 +53,7 @@ node /org/freedesktop/sysupdate1 { interface org.freedesktop.DBus.Introspectable { ... }; interface org.freedesktop.DBus.Properties { ... }; }; - </programlisting> +</programlisting> <!--Autogenerated cross-references for systemd.directives, do not edit--> @@ -149,7 +149,7 @@ node /org/freedesktop/sysupdate1/target/host { interface org.freedesktop.DBus.Introspectable { ... }; interface org.freedesktop.DBus.Properties { ... }; }; - </programlisting> +</programlisting> <!--Autogenerated cross-references for systemd.directives, do not edit--> @@ -194,7 +194,7 @@ node /org/freedesktop/sysupdate1/target/host { <programlisting> #define SD_SYSUPDATE_OFFLINE (UINT64_C(1) << 0) - </programlisting> +</programlisting> <para>When <constant>SD_SYSUPDATE_OFFLINE</constant> is set, this method returns only the versions installed locally. Otherwise, this method pulls metadata from the network and returns all versions @@ -452,7 +452,7 @@ node /org/freedesktop/sysupdate1/job/_1 { interface org.freedesktop.DBus.Introspectable { ... }; interface org.freedesktop.DBus.Properties { ... }; }; - </programlisting> +</programlisting> <!--Autogenerated cross-references for systemd.directives, do not edit--> @@ -525,7 +525,7 @@ node /org/freedesktop/sysupdate1/job/_1 { <programlisting>$ gdbus introspect --system \ --dest org.freedesktop.sysupdate1 \ --object-path /org/freedesktop/sysupdate1 - </programlisting> +</programlisting> </example> <example> @@ -534,7 +534,7 @@ node /org/freedesktop/sysupdate1/job/_1 { <programlisting>$ gdbus introspect --system \ --dest org.freedesktop.sysupdate1 \ --object-path /org/freedesktop/sysupdate1/target/host - </programlisting> +</programlisting> </example> <example> @@ -543,7 +543,7 @@ node /org/freedesktop/sysupdate1/job/_1 { <programlisting>$ gdbus introspect --system \ --dest org.freedesktop.sysupdate1 \ --object-path /org/freedesktop/sysupdate1/job/_1 - </programlisting> +</programlisting> </example> </refsect1> diff --git a/man/org.freedesktop.timedate1.xml b/man/org.freedesktop.timedate1.xml index d0271145f9..d5044eac71 100644 --- 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/org.freedesktop.timesync1.xml b/man/org.freedesktop.timesync1.xml index 70f8b70b3a..a6aa06c842 100644 --- a/man/org.freedesktop.timesync1.xml +++ b/man/org.freedesktop.timesync1.xml @@ -68,7 +68,7 @@ node /org/freedesktop/timesync1 { interface org.freedesktop.DBus.Introspectable { ... }; interface org.freedesktop.DBus.Properties { ... }; }; - </programlisting> +</programlisting> <!--method SetRuntimeNTPServers is not documented!--> @@ -146,7 +146,7 @@ node /org/freedesktop/timesync1 { $ gdbus introspect --system \ --dest org.freedesktop.timesync1 \ --object-path /org/freedesktop/timesync1 - </programlisting> +</programlisting> </example> </refsect1> diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index c55cdee894..91710a4dd8 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -409,7 +409,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 13d1686bd1..1cc0ddb882 100644 --- 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 64c52ffefe..57d78ad503 100644 --- 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 183fffd36a..1ebeece8f1 100644 --- 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 7d10ce4f3a..7ee3448968 100644 --- 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", &s, &v);</programlisting> const char *s, *t, *u; sd_bus_message_read(m, "a{is}", 3, &i, &s, &j, &t, &k, &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 95bb0bef46..12f5628783 100644 --- 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 0c993e31f7..6aaaa64b3f 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -632,7 +632,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 5820478335..a7566b8904 100644 --- 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> @@ -2867,7 +2867,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 4372ea8abf..68d006a1ce 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -271,7 +271,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> @@ -670,7 +670,7 @@ NAutoVTs=8 # /etc/systemd/logind.conf.d/50-override.conf ... some administrator override - </programlisting> +</programlisting> </example> </refsect2> @@ -716,7 +716,7 @@ $ systemd-analyze compare-versions 1 lt 2; echo $? 0 $ systemd-analyze compare-versions 1 ge 2; echo $? 1 - </programlisting> +</programlisting> </example> </refsect2> @@ -768,7 +768,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> @@ -787,7 +787,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> @@ -807,7 +807,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> @@ -886,7 +886,7 @@ alias.service:7: Unknown key name 'MysteryKey' in section 'Service', ignoring. "buildId" : "b5e428254abf14237b0ae70ed85fffbb98a78f88" } } - </programlisting> +</programlisting> </example> </refsect2> @@ -1762,7 +1762,7 @@ io.systemd.credential:vmm.notify_socket=vsock-stream:2:254570042 "range": 1 } } - </programlisting> +</programlisting> </example> </refsect1> diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml index 82f1bcd295..737b80de9a 100644 --- 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 126facf7e9..27ad753048 100644 --- a/man/systemd-id128.xml +++ b/man/systemd-id128.xml @@ -186,7 +186,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> @@ -205,7 +205,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 a49ca126b5..be195a0508 100644 --- 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&follow - </programlisting> +</programlisting> </para> </refsect1> diff --git a/man/systemd-measure.xml b/man/systemd-measure.xml index 5ca373f181..1caca9cab0 100644 --- a/man/systemd-measure.xml +++ b/man/systemd-measure.xml @@ -397,7 +397,7 @@ $ ukify build \ --public-key=tpm2-pcr-public-key-initrd.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 b7673dc6c4..e1ae8d5ab8 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -265,7 +265,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 77e61e6881..4301c2ad81 100644 --- a/man/systemd-run.xml +++ b/man/systemd-run.xml @@ -647,7 +647,7 @@ There is a screen on: <programlisting>$ systemd-run -t echo "<${INVOCATION_ID}>" '<${INVOCATION_ID}>' <> <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). @@ -673,7 +673,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 19dce8a517..75da236082 100644 --- a/man/systemd-vmspawn.xml +++ b/man/systemd-vmspawn.xml @@ -508,11 +508,11 @@ <programlisting> $ mkosi -d arch -p systemd -p linux --autologin -o image.raw -f build $ systemd-vmspawn --image=image.raw - </programlisting> +</programlisting> </example> <example> - <title>Import and run a Fedora 39 Cloud image using machinectl</title> + <title>Import and run a Fedora &fedora_latest_version; Cloud image using machinectl</title> <programlisting> $ curl -L \ @@ -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 a955f767e4..607c88128d 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -4722,7 +4722,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> @@ -4734,7 +4734,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> @@ -4745,7 +4745,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 @@ -4757,7 +4757,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 @@ -4769,7 +4769,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 2a71a9a23f..f2181846d4 100644 --- a/man/systemd.net-naming-scheme.xml +++ b/man/systemd.net-naming-scheme.xml @@ -606,7 +606,7 @@ ID_NET_NAME_PATH=enp0s31f6 <programlisting>ID_NET_NAME_ONBOARD=eno1 ID_NET_NAME_ONBOARD_LABEL=Ethernet Port 1 - </programlisting> +</programlisting> </example> <example> @@ -699,7 +699,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 b0058c11c8..a168e7691e 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -2804,7 +2804,7 @@ Kind=fou [FooOverUDP] Port=5555 Protocol=4 - </programlisting> +</programlisting> </example> <example> <title>/etc/systemd/network/25-fou-ipip.netdev</title> @@ -2818,7 +2818,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> @@ -2937,7 +2937,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 5090d3fb63..ef7f61719a 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -6454,31 +6454,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 ce4dfabfdd..f52371ef88 100644 --- 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 885c4644cb..2cd9cfb9c4 100644 --- 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 73b28a47d8..9b7a058842 100644 --- 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 4e6652dc01..8fb7aca7c6 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -819,7 +819,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 c42d6ae5c7..14dbb2a954 100644 --- a/man/ukify.xml +++ b/man/ukify.xml @@ -617,7 +617,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> @@ -643,7 +643,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> @@ -687,7 +687,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 @@ -705,7 +705,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> @@ -749,7 +749,7 @@ Writing public key for PCR signing to /etc/systemd/tpm2-pcr-public-key-system.pe <programlisting>$ ukify build \ --profile='TITLE=Base' \ --output=profile0.efi - </programlisting> +</programlisting> <para>Add a second profile (@1):</para> @@ -758,7 +758,7 @@ Writing public key for PCR signing to /etc/systemd/tpm2-pcr-public-key-system.pe ID=storagetm' \ --cmdline='quiet rw rd.systemd.unit=stroage-target-mode.target' \ --output=profile1.efi - </programlisting> +</programlisting> <para>Add a third profile (@2):</para> @@ -767,7 +767,7 @@ ID=storagetm' \ ID=factory-reset' \ --cmdline='quiet rw systemd.unit=factory-reset.target' \ --output=profile2.efi - </programlisting> +</programlisting> <para>Then, create a UKI and include all the generated profiles:</para> @@ -779,7 +779,7 @@ ID=factory-reset' \ --join-profile=profile1.efi \ --join-profile=profile2.efi \ --output=base.efi - </programlisting> +</programlisting> <para>The resulting UKI <filename>base-with-profile-0-1-2.efi</filename> will now contain three profiles.</para> </example> diff --git a/tools/update-dbus-docs.py b/tools/update-dbus-docs.py index ce7161c5f1..17006f3d86 100755 --- 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) |