man: vconsole.conf: replace the hardcoded keymap with build-time default

Follow-up for #26089

diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in
index aa0e1ef1ae36c54d031847f5067985fc4813522d..e5aae04f4f73496249cdd4e9095c0d300e6fe303 100644 (file)
--- a/man/custom-entities.ent.in
+++ b/man/custom-entities.ent.in
@@ -17,5 +17,6 @@
 <!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 fedora_latest_version "37">
 <!ENTITY fedora_cloud_release "1.7">

diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index e4e2864ff219096f03d1b281b250d9fde69d03a1..b03a3de04076317a58a5fbb3d7eaf4d2927dfa7d 100644 (file)
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -1,6 +1,9 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
 <refentry id="vconsole.conf" conditional='ENABLE_VCONSOLE'>
@@ -72,7 +75,7 @@
         <term><varname>KEYMAP_TOGGLE=</varname></term>
 
         <listitem><para>Configures the key mapping table for the keyboard.
-        <varname>KEYMAP=</varname> defaults to <literal>us</literal> if not set. The
+        <varname>KEYMAP=</varname> defaults to <literal>&DEFAULT_KEYMAP;</literal> if not set. The
         <varname>KEYMAP_TOGGLE=</varname> can be used to configure a second toggle keymap and is by
         default unset.</para></listitem>
       </varlistentry>