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

[Ben Armstrong]

The following commit has been merged in the debian-next branch:
commit 687be589c22def8749cdc4be4d4ae5364b142d21
Author: Ben Armstrong <synrg at debian.org>
Date:   Fri Jul 27 17:24:18 2012 -0300

    Clarifying further that matching is one-to-one in order and blank values allowed.

diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 5c0f927..05fa767 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -63,9 +63,9 @@ 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, 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.
+Allows to change the keyboard variants. If more than one is specified, specify the same number of values as keyboard\-layouts values, as they will be matched one\-to\-one in the order specified. Blank values are allowed. 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.
+Allows to change the keyboard options. There is 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
 Allows to disable sysv services through update-rc.d.
 .IP "\fBlive\-config.x\-session\-manager=\fIX_SESSION_MANAGER\fR | \fBx\-session\-manager\fR=\fIX_SESSION_MANAGER\fR" 4

-- 
live-config