Imported Debian patch 2:1.15.1-0ubuntu2.6
[deb_xorg-server.git] / debian / patches / xfree86_add_matchseat_key_description_to_xorg_conf_man.patch
1 From a6f5ffd5879e7fb052d343592951cc476b699bb4 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= <lbsousajr@gmail.com>
3 Date: Thu, 3 Apr 2014 11:19:15 -0300
4 Subject: [PATCH] xfree86: add short description about MatchSeat key in
5 xorg.conf man page
6 MIME-Version: 1.0
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
9
10 Signed-off-by: LaƩrcio de Sousa <lbsousajr@gmail.com>
11 Reviewed-by: Dave Airlie <airlied@redhat.com>
12 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
13 ---
14 hw/xfree86/man/xorg.conf.man | 24 ++++++++++++++++++++++++
15 1 file changed, 24 insertions(+)
16
17 diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
18 index 6d2652e..cadd87b 100644
19 --- a/hw/xfree86/man/xorg.conf.man
20 +++ b/hw/xfree86/man/xorg.conf.man
21 @@ -1378,6 +1378,14 @@ for the regular text mode.
22 The frequency is specified in MHz.
23 This is rarely used.
24 .TP 7
25 +.BI "MatchSeat " "seat\-id"
26 +Only apply this
27 +.B Device
28 +section if X server was started with
29 +.B -seat
30 +.I seat\-id
31 +option.
32 +.TP 7
33 .BI "Option \*qModeDebug\*q \*q" boolean \*q
34 Enable printing of additional debugging information about modesetting to
35 the server log.
36 @@ -1900,6 +1908,14 @@ The only case where there is even a choice in this value is for depth 24,
37 where some hardware supports both a packed 24 bit framebuffer layout and a
38 sparse 32 bit framebuffer layout.
39 .TP 7
40 +.BI "MatchSeat " "seat\-id"
41 +Only apply this
42 +.B Screen
43 +section if X server was started with
44 +.B -seat
45 +.I seat\-id
46 +option.
47 +.TP 7
48 .B Options
49 Various
50 .B Option
51 @@ -2295,6 +2311,14 @@ and the first two should normally be used to indicate the core pointer
52 and core keyboard devices respectively.
53 .RE
54 .TP 7
55 +.BI "MatchSeat " "seat\-id"
56 +Only apply this
57 +.B ServerLayout
58 +section if X server was started with
59 +.B -seat
60 +.I seat\-id
61 +option.
62 +.TP 7
63 .B Options
64 In addition to the following, any option permitted in the
65 .B ServerFlags
66 --
67 2.0.4
68