[PATCH v2 setxkbmap] man: multiple layouts can be specified (#34118)

Peter Hutterer peter.hutterer at who-t.net
Mon Feb 21 20:50:57 PST 2011


Same applies to variant.

X.Org Bug 34118 <http://bugs.freedesktop.org/show_bug.cgi?id=34118>

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
I guess the matching should be explained with an example somewhere, but for
now this will do

 man/setxkbmap.man |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/man/setxkbmap.man b/man/setxkbmap.man
index 1c0b87a..4548a02 100644
--- a/man/setxkbmap.man
+++ b/man/setxkbmap.man
@@ -61,8 +61,8 @@ a keyboard layout.
 .TP 8
 .B \-layout \fIname\fP
 Specifies the name of the layout used to determine the components which
-make up the keyboard description.  Only one layout may be specified on
-the command line.
+make up the keyboard description. The \fI-layout\fP option may only be used
+once. Multiple layouts can be specified as a comma-separated list.
 .TP 8
 .B \-model \fIname\fP
 Specifies the name of the keyboard model used to determine the components
@@ -106,8 +106,10 @@ a keyboard layout.
 .TP 8
 .B \-variant \fIname\fP
 Specifies which variant of the keyboard layout should be used to determine
-the components which make up the keyboard description.  Only one variant
-may be specified on the command line.
+the components which make up the keyboard description. The \fI-variant\fP
+option may only be used once. Multiple variants can be specified as a
+comma-separated list and will be matched with the layouts specified with
+\fI-layout\fP.
 .TP 8
 .B \-verbose|\-v [\fIlevel\fP]
 Specifies level of verbosity in output messages.  Valid levels range from
-- 
1.7.4


More information about the xorg-devel mailing list