diff --git a/Makefile.am b/Makefile.am
index 1ed4054a59a..06cd3c55c6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -507,7 +507,8 @@ MANPAGES = \
man/systemd.conf.5 \
man/tmpfiles.d.5 \
man/hostname.5 \
- man/vconsole.conf.5
+ man/vconsole.conf.5 \
+ man/locale.conf.5
MANPAGES_ALIAS = \
man/reboot.8 \
diff --git a/TODO b/TODO
index 3101db2fe81..7de0ebb7013 100644
--- a/TODO
+++ b/TODO
@@ -53,7 +53,7 @@
* readahead: btrfs/LVM SSD detection
-* man pages for: locale.conf, vconsole.conf, modules-load.d, /etc/os-release
+* man pages for: modules-load.d, /etc/os-release
* when processes remain in a service even though the start command failed enter active
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
new file mode 100644
index 00000000000..fa446a8e17f
--- /dev/null
+++ b/man/locale.conf.xml
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+ locale.conf
+ systemd
+
+
+
+ Developer
+ Lennart
+ Poettering
+ lennart@poettering.net
+
+
+
+
+
+ locale.conf
+ 5
+
+
+
+ locale.conf
+ configuration file for locale settings
+
+
+
+ /etc/locale.conf
+
+
+
+ Description
+
+ The /etc/locale.conf file
+ configures system-wide locale settings.
+
+ The basic file format of
+ locale.conf is a
+ newline-separated list of environment-like
+ shell-compatible variable assignments. It is possible
+ to source the configuration from shell scripts,
+ however, beyond mere variable assignments no shell
+ features are supported, allowing applications to read
+ the file without implementing a shell compatible
+ execution engine.
+
+ Note that the kernel command line options
+ locale.LANG=,
+ locale.LC_CTYPE=,
+ locale.LC_NUMERIC=,
+ locale.LC_TIME=,
+ locale.LC_COLLATE=,
+ locale.LC_MONETARY=,
+ locale.LC_MESSAGES=,
+ locale.LC_PAPER=,
+ locale.LC_NAME=,
+ locale.LC_ADDRESS=,
+ locale.LC_TELEPHONE=,
+ locale.LC_MEASUREMENT=,
+ locale.LC_IDENTIFICATION= may be
+ used to override the locale settings at boot.
+
+ The locale settings configured in
+ /etc/locale.conf are system-wide
+ and are inherited by every service or user, unless
+ overriden or unset by individual programs or
+ individual users.
+
+ Depending on the operating system other
+ configuration files might be checked for locale
+ configuration as well, however only as
+ fallback.
+
+
+
+ Options
+
+ The following locale settings may be set using
+ /etc/locale.conf:
+ LANG=,
+ LC_CTYPE=,
+ LC_NUMERIC=,
+ LC_TIME=,
+ LC_COLLATE=,
+ LC_MONETARY=,
+ LC_MESSAGES=,
+ LC_PAPER=,
+ LC_NAME=,
+ LC_ADDRESS=,
+ LC_TELEPHONE=,
+ LC_MEASUREMENT=,
+ LC_IDENTIFICATION=. Note that
+ LC_ALL may not be be configured in
+ this file. For details about the meaning and semantics
+ of these settings, refer to
+ locale7.
+
+
+
+
+ See Also
+
+ systemd1,
+ locale7
+
+
+
+
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index 1926f337bb7..d6ac579918e 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -22,7 +22,7 @@
along with systemd; If not, see .
-->
-
+
vconsole.conf
systemd
@@ -59,20 +59,21 @@
and console font.
The basic file format of the
- vconsole.conf is a set of
- environment-like shell-compatible variable
- assignments. It is possible to source the
- configuration from shell scripts, however, beyond mere
- variable assignments no shell features are supported,
- allowing applications to read the file without
- containing a shell compatible execution engine.
+ vconsole.conf is a
+ newline-separated list environment-like
+ shell-compatible variable assignments. It is possible
+ to source the configuration from shell scripts,
+ however, beyond mere variable assignments no shell
+ features are supported, allowing applications to read
+ the file without implementing a shell compatible
+ execution engine.
Note that the kernel command line options
vconsole.keymap=,
vconsole.keymap.toggle=,
vconsole.font=,
vconsole.font.map=,
- vconsole.font.unimap= can be used
+ vconsole.font.unimap= may be used
to override the console settings at boot.
Depending on the operating system other