From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 7 Nov 2025 15:41:05 +0000 (+0100)
Subject: man: stop inventing custom entity names for docbook
X-Git-Tag: v259-rc1~72^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e9a787a8677c8a7e014622a06152ead2d8c0638;p=thirdparty%2Fsystemd.git

man: stop inventing custom entity names for docbook

For some reason, the entity names configured in custom-entities.ent
used abbreviated names. This just creates unnecessary confusion, so update
to use the same name as the config dict.

Reword some surrounding sentences while at it.
---

diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in
index 9ec6ef92cc6..6338ad13f96 100644
--- a/man/custom-entities.ent.in
+++ b/man/custom-entities.ent.in
@@ -15,8 +15,8 @@
 <!ENTITY HIGH_RLIMIT_NOFILE "{{HIGH_RLIMIT_NOFILE}}">
 <!ENTITY DEFAULT_DNSSEC_MODE "{{DEFAULT_DNSSEC_MODE_STR}}">
 <!ENTITY DEFAULT_DNS_OVER_TLS_MODE "{{DEFAULT_DNS_OVER_TLS_MODE_STR}}">
-<!ENTITY DEFAULT_TIMEOUT "{{DEFAULT_TIMEOUT_SEC}} s">
-<!ENTITY DEFAULT_USER_TIMEOUT "{{DEFAULT_USER_TIMEOUT_SEC}} s">
-<!ENTITY DEFAULT_KEYMAP "{{SYSTEMD_DEFAULT_KEYMAP}}">
+<!ENTITY DEFAULT_TIMEOUT_SEC "{{DEFAULT_TIMEOUT_SEC}} s">
+<!ENTITY DEFAULT_USER_TIMEOUT_SEC "{{DEFAULT_USER_TIMEOUT_SEC}} s">
+<!ENTITY SYSTEMD_DEFAULT_KEYMAP "{{SYSTEMD_DEFAULT_KEYMAP}}">
 <!ENTITY fedora_latest_version "43">
 <!ENTITY fedora_cloud_release "1.6">
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index d3c345dbb4b..b7fe53dc9cf 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -581,9 +581,9 @@
         </para>
 
         <para><varname>DefaultTimeoutStartSec=</varname> and <varname>DefaultTimeoutStopSec=</varname>
-        default to &DEFAULT_TIMEOUT; in the system manager and &DEFAULT_USER_TIMEOUT; in the user manager.
-        <varname>DefaultTimeoutAbortSec=</varname> is not set by default so that all units fall back to
-        <varname>TimeoutStopSec=</varname>. <varname>DefaultRestartSec=</varname> defaults to 100 ms.
+        default to &DEFAULT_TIMEOUT_SEC; in the system manager and &DEFAULT_USER_TIMEOUT_SEC; in the user
+        manager. <varname>DefaultTimeoutAbortSec=</varname> is not set by default so that all units fall back
+        to <varname>TimeoutStopSec=</varname>. <varname>DefaultRestartSec=</varname> defaults to 100 ms.
         </para>
 
         <xi:include href="version-info.xml" xpointer="v209"/></listitem>
@@ -597,8 +597,8 @@
         and <filename>/etc/crypttab</filename> (see
         <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
-        Defaults to &DEFAULT_TIMEOUT; in the system manager and &DEFAULT_USER_TIMEOUT; in the user manager.
-        </para>
+        Defaults to &DEFAULT_TIMEOUT_SEC; in the system manager and &DEFAULT_USER_TIMEOUT_SEC; in the user
+        manager.</para>
 
         <xi:include href="version-info.xml" xpointer="v252"/></listitem>
       </varlistentry>
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index 5b3524d7290..e5e160cf3d5 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -75,11 +75,11 @@
         <term><varname>KEYMAP=</varname></term>
         <term><varname>KEYMAP_TOGGLE=</varname></term>
 
-        <listitem><para>Configures the key mapping table for the keyboard.  <varname>KEYMAP=</varname>
-        defaults to <literal>&DEFAULT_KEYMAP;</literal> if not set. Specially, if <literal>@kernel</literal>
-        is specified, no keymap will be loaded, i.e. the kernel's default keymap is used.  The
-        <varname>KEYMAP_TOGGLE=</varname> can be used to configure a second toggle keymap and is by default
-        unset.</para></listitem>
+        <listitem><para>Configures the key mapping table for the keyboard. <varname>KEYMAP=</varname>
+        defaults to <literal>&SYSTEMD_DEFAULT_KEYMAP;</literal> if not set. As a special case, if
+        <literal>@kernel</literal> is specified, no keymap will be loaded, i.e. the kernel's default keymap
+        will be used. The <varname>KEYMAP_TOGGLE=</varname> can be used to configure a second toggle keymap
+        and is by default unset.</para></listitem>
       </varlistentry>
 
       <varlistentry>