summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-02-18 13:14:53 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-02-23 07:53:27 +1000
commit0c411a3f8697ce756847fe1c2abc8d07a8a51d09 (patch)
treed52b282541e9afbe6ee0600d0e20ea18c9fad6ff
parentae3a9348d5d42448ea6a73940a2ed5e19090a00d (diff)
man: multiple layouts can be specified (#34118)
Same applies to variant. X.Org Bug 34118 <http://bugs.freedesktop.org/show_bug.cgi?id=34118> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
-rw-r--r--man/setxkbmap.man10
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