aboutsummaryrefslogtreecommitdiff
path: root/doc/guix.texi
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-02-10 11:01:54 +0100
committerLudovic Courtès <ludo@gnu.org>2016-02-10 15:15:17 +0100
commitf5582b2c1d7cb73f36d5278bec99d7279f813a39 (patch)
tree1af4e61e8aa258338e4eeb9e0b5d4c78fe3a7a8f /doc/guix.texi
parent32e16112064ae3f7bad729802834c965b270bbc0 (diff)
downloadguix-f5582b2c1d7cb73f36d5278bec99d7279f813a39.tar
guix-f5582b2c1d7cb73f36d5278bec99d7279f813a39.tar.gz
system: Selected locale is automatically built.
Fixes <http://bugs.gnu.org/22572>. Reported by Mark H Weaver <mhw@netris.org>. * gnu/system/locale.scm (%not-dot): New variable. (denormalize-codeset, locale-name->definition): New procedures. * gnu/system.scm (locale-name->definition*): New procedure. (operating-system-locale-directory): Instead of raising an error, add the missing locale. * doc/guix.texi (Locales): Adjust accordingly.
Diffstat (limited to 'doc/guix.texi')
-rw-r--r--doc/guix.texi22
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 80a1621b45..bcb51c556e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -6452,17 +6452,17 @@ Usually, you will want to specify the default locale for the machine
using the @code{locale} field of the @code{operating-system} declaration
(@pxref{operating-system Reference, @code{locale}}).
-That locale must be among the @dfn{locale definitions} that are known to
-the system---and these are specified in the @code{locale-definitions}
-slot of @code{operating-system}. The default value includes locale
-definitions for some widely used locales, but not for all the available
-locales, in order to save space.
-
-If the locale specified in the @code{locale} field is not among the
-definitions listed in @code{locale-definitions}, @command{guix system}
-raises an error. In that case, you should add the locale definition to
-the @code{locale-definitions} field. For instance, to add the North
-Frisian locale for Germany, the value of that field may be:
+The selected locale is automatically added to the @dfn{locale
+definitions} known to the system if needed, with its codeset inferred
+from its name---e.g., @code{bo_CN.utf8} will be assumed to use the
+@code{UTF-8} codeset. Additional locale definitions can be specified in
+the @code{locale-definitions} slot of @code{operating-system}---this is
+useful, for instance, if the codeset could not be inferred from the
+locale name. The default set of locale definitions includes some widely
+used locales, but not all the available locales, in order to save space.
+
+For instance, to add the North Frisian locale for Germany, the value of
+that field may be:
@example
(cons (locale-definition