From ad29b8897e6227c25fbea85f659903e157f38b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 28 Jun 2017 22:34:36 -0400
Subject: [PATCH 1/2] localed: improve the comment in 00-keyboard.conf

---
 src/locale/keymap-util.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
index da72bee4a9..105d9b0ee4 100644
--- a/src/locale/keymap-util.c
+++ b/src/locale/keymap-util.c
@@ -361,8 +361,9 @@ int x11_write_data(Context *c) {
 
         fchmod(fileno(f), 0644);
 
-        fputs("# Read and parsed by systemd-localed. It's probably wise not to edit this file\n"
-              "# manually too freely.\n"
+        fputs("# Written by systemd-localed(8), read by systemd-localed and Xorg. It's\n"
+              "# probably wise not to edit this file manually. Use localectl(1) to\n"
+              "# instruct systemd-localed to update it.\n"
               "Section \"InputClass\"\n"
               "        Identifier \"system-keyboard\"\n"
               "        MatchIsKeyboard \"on\"\n", f);

From 8968e36f21ec831e78ac55bf47c2f282253b2ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 28 Jun 2017 22:47:55 -0400
Subject: [PATCH 2/2] man: mention localed and localectl in locale.conf(5) and
 vconsole.conf(5)

Fixes #295.

(We cannot add a comment to either of those files because they are documented
to "only support variable assignments", so it's better to add an explanation
in the man page instead.)
---
 man/locale.conf.xml   | 8 +++++---
 man/vconsole.conf.xml | 7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index 2fe731113a..1405dda3fd 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -91,12 +91,14 @@
     might be checked for locale configuration as well, however only as
     fallback.</para>
 
-    <para><citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    <para><filename>/etc/vconsole.conf</filename> is usually created and updated
+    using
+    <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+    <citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     may be used to alter the settings in this file during runtime from
     the command line. Use
     <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    to initialize them on mounted (but not booted) system
-    images.</para>
+    to initialize them on mounted (but not booted) system images.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index fa30ca6569..4a6672cbae 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -78,6 +78,13 @@
     <para>Depending on the operating system other configuration files
     might be checked for configuration of the virtual console as well,
     however only as fallback.</para>
+
+    <para><filename>/etc/vconsole.conf</filename> is usually created and updated
+    using
+    <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+    <citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    may be used to instruct <command>systemd-localed.service</command> to
+    query or update configuration.</para>
   </refsect1>
 
   <refsect1>