diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 09:18:19 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 09:18:19 +0100 |
| commit | ad7d3734fae59b63a1afe2d8e11411ac32a40f30 (patch) | |
| tree | 80af4bcc936f46b31ba17a71905f20deeca066f5 /xorg-server/hw/xfree86/man | |
| parent | c4583f59d8460f05ee211c2f8ed6208addfe3087 (diff) | |
| parent | 8add148a4cf71b8bdab05a6b7e14824b5062da5e (diff) | |
| download | vcxsrv-ad7d3734fae59b63a1afe2d8e11411ac32a40f30.tar.gz vcxsrv-ad7d3734fae59b63a1afe2d8e11411ac32a40f30.tar.bz2 vcxsrv-ad7d3734fae59b63a1afe2d8e11411ac32a40f30.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver git update 13 Feb 2013
Diffstat (limited to 'xorg-server/hw/xfree86/man')
| -rw-r--r-- | xorg-server/hw/xfree86/man/xorg.conf.man | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/xorg-server/hw/xfree86/man/xorg.conf.man b/xorg-server/hw/xfree86/man/xorg.conf.man index 5d92bbe8b..9361ce978 100644 --- a/xorg-server/hw/xfree86/man/xorg.conf.man +++ b/xorg-server/hw/xfree86/man/xorg.conf.man @@ -1821,9 +1821,7 @@ sections have the following format: .PP The .B Identifier -and -.B Device -entries are mandatory. +entry is mandatory. All others are optional. .PP The @@ -1841,11 +1839,10 @@ The entries available for this section are: .TP 7 .BI "Device \*q" device\-id \*q -This mandatory entry specifies the +This entry specifies the .B Device -section to be used for this screen. -This is what ties a specific graphics card to a screen. -The +section to be used for this screen. When multiple graphics cards are +present, this is what ties a specific card to a screen. The .I device\-id must match the .B Identifier |