[SCM] live-manual branch, debian-next, updated. debian/3.0_a13-1-21-g49ae0ee

[Ben Armstrong]

The following commit has been merged in the debian-next branch:
commit 49ae0ee8f903bed0c235a1966334751d8769f30e
Author: Ben Armstrong <synrg at debian.org>
Date:   Wed Jul 18 08:15:57 2012 -0300

    Updating and clarifying locale and keyboard configuration.

diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index 50660f4..5206181 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -33,15 +33,13 @@ One possible way of changing the default password is by means of a hook as descr
 
 2~customizing-locale-and-language Customizing locale and language
 
-When the live system boots, language is involved in three steps:
+When the live system boots, language is involved in two steps:
 
 _* the locale generation
 
-_* setting the keyboard layout for the console
+_* setting the keyboard configuration
 
-_* setting the keyboard layout for X
-
-The default locale when building a Live system is "locales=en_US.UTF-8". To define the locale that should be generated, use the #{locales}# parameter in the #{--bootappend-live}# option of #{lb config}#, e.g.
+The default locale when building a Live system is #{locales=en_US.UTF-8}#. To define the locale that should be generated, use the #{locales}# parameter in the #{--bootappend-live}# option of #{lb config}#, e.g.
 
 code{
 
@@ -49,35 +47,38 @@ code{
 
 }code
 
-This parameter can also be used at the kernel command line. You can specify a locale by a full #{language_country.encoding}# word.
-
-Both the console and X keyboard configuration depend on the #{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid options for X keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country codes). To find the value (the two characters) corresponding to a language try searching for the english name of the nation where the language is spoken, e.g:
-
-code{
-
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+Multiple locales may be specified as a comma-delimited list.
 
-}code
+This parameter, as well as the keyboard configuration parameters indicated below, can also be used at the kernel command line. You can specify a locale by #{language_country}# (in which case the default encoding is used) or the full #{language_country.encoding}# word. A list of supported locales and the encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
 
-To get the locale files for German and Swiss German keyboard layout in X use:
+Both the console and X keyboard configuration are performed by #{live-config}# using the #{console-setup}# package. To configure them, use the #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# boot parameters via the #{--bootappend-live}# option. Valid options for these can be found in #{/usr/share/X11/xkb/rules/base.lst}#. To find layouts and variants for a given language, try searching for the English name of the language and/or the country where the language is spoken, e.g:
 
 code{
 
- $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst 
+ ! model
+ ! layout
+   ch              German (Switzerland)
+ ! variant
+   legacy          ch: German (Switzerland, legacy)
+   de_nodeadkeys   ch: German (Switzerland, eliminate dead keys)
+   de_sundeadkeys  ch: German (Switzerland, Sun dead keys)
+   de_mac          ch: German (Switzerland, Macintosh)
+ ! option
 
 }code
 
-A list of the valid values of the keyboards for the console can be figured with the following command:
+Note that each variant lists the layout to which it applies in the description.
+
+Often, only the layout needs to be configured. For example, to get the locale files for German and Swiss German keyboard layout in X use:
 
 code{
 
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
-     do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
 
 }code
 
-Alternatively, you can use the #{console-setup}# package, a tool to let you configure console layout using X (XKB) definitions; you can then set your keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use also these parameters for X configuration. For example, to set up a French system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, both in console and X11, use:
+However, for very specific use cases, you may wish to include other parameters. For example, to set up a French system with a French-Dvorak layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
 
 code{
 
@@ -86,6 +87,8 @@ code{
 
 }code
 
+Multiple values may be specified as comma-delimited lists for each of the keyboard configuration variables. Please see the #{keyboard(5)}# man page for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #{XKBOPTIONS}# variables which correspond to the similarly-named #{live-config}# variables described above.
+
 2~persistence Persistence
 
 A live cd paradigm is a pre-installed system which runs from read-only media, like a cdrom, where writes and modifications do not survive reboots of the host hardware which runs it.

-- 
live-manual