X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Flocale.conf.xml;h=06c0af0bf7a9c5b7a50f6f36bd6b6db20ee8bf40;hb=7e2c2bcf1285d124c9c656ff46cafa4db0a987c9;hp=bb7e1130e2bff0319827e40718871437d4e66537;hpb=1ead1cad4b63a5dc586ae5a630d3f2857d3a86a2;p=elogind.git
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index bb7e1130e..06c0af0bf 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -9,16 +9,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -44,7 +44,7 @@
locale.conf
- configuration file for locale settings
+ Configuration file for locale settings
@@ -55,7 +55,9 @@
Description
The /etc/locale.conf file
- configures system-wide locale settings.
+ configures system-wide locale settings. It is read at
+ early-boot by
+ systemd1.
The basic file format of
locale.conf is a
@@ -69,6 +71,7 @@
Note that the kernel command line options
locale.LANG=,
+ locale.LANGUAGE=,
locale.LC_CTYPE=,
locale.LC_NUMERIC=,
locale.LC_TIME=,
@@ -86,7 +89,7 @@
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
+ overridden or unset by individual programs or
individual users.
Depending on the operating system other
@@ -101,6 +104,7 @@
The following locale settings may be set using
/etc/locale.conf:
LANG=,
+ LANGUAGE=,
LC_CTYPE=,
LC_NUMERIC=,
LC_TIME=,
@@ -113,7 +117,7 @@
LC_TELEPHONE=,
LC_MEASUREMENT=,
LC_IDENTIFICATION=. Note that
- LC_ALL may not be be configured in
+ LC_ALL may not be configured in
this file. For details about the meaning and semantics
of these settings, refer to
locale7.
@@ -123,7 +127,7 @@
Example
- German locale with english messages
+ German locale with English messages
/etc/locale.conf:
@@ -137,7 +141,8 @@ LC_MESSAGES=C
See Also
systemd1,
- locale7
+ locale7,
+ systemd-localed.service8