[SCM] live-config branch, debian-next, updated. debian/3.0_b1-1-7-g12dad74

[Ben Armstrong]

The following commit has been merged in the debian-next branch:
commit 12dad74adbfa85a6f33477ddbfd568cc8b69ea03
Author: Ben Armstrong <synrg at debian.org>
Date:   Fri Jul 27 14:39:45 2012 -0300

    Clarifying that keyboard variants and layouts are matched.

diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 88d3c12..5c0f927 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -63,7 +63,7 @@ Allows to change the keyboard model. There is no default value set.
 .IP "\fBlive\-config.keyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR | \fBkeyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR" 4
 Allows to change the keyboard layouts. If more than one is specified, the tools of the desktop environment will allow to switch it under X11. There is no default value set.
 .IP "\fBlive\-config.keyboard\-variants\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR | \fBkeyboard\-variants\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR" 4
-Allows to change the keyboard variants. If more than one is specified, the tools of the desktop environment will allow to switch it under X11. There is no default value set.
+Allows to change the keyboard variants. If more than one is specified, each value will be matched to the corresponding keyboard\-layouts value and the tools of the desktop environment will allow to switch between each layout+variant pair under X11. There is no default value set.
 .IP "\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR | \fBkeyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
 Allows to change the keyboard options. There are no default value set.
 .IP "\fBlive\-config.sysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR | \fBsysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR" 4

-- 
live-config