aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-29 00:17:36 +0100
committerMarc Haesen <marc@hc-consult.be>2011-12-29 00:17:36 +0100
commitd515b895dc5151d102f33b577cafbf63473bbafa (patch)
tree98986aec1f43152c3c5f4f8f8a19d29f88b42d83 /xorg-server/hw/xfree86
parentecb8be4d2a289c5308f3f23929116d2fe6aafa4b (diff)
parent9715b7fab0757c86e1bb151f3dce0b324bcff692 (diff)
downloadvcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.tar.gz
vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.tar.bz2
vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xfree86')
-rw-r--r--xorg-server/hw/xfree86/man/xorg.conf.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/man/xorg.conf.man b/xorg-server/hw/xfree86/man/xorg.conf.man
index 996798f1c..57901853b 100644
--- a/xorg-server/hw/xfree86/man/xorg.conf.man
+++ b/xorg-server/hw/xfree86/man/xorg.conf.man
@@ -2,7 +2,7 @@
.ds q \N'34'
.TH __xconfigfile__ __filemansuffix__ __vendorversion__
.SH NAME
-__xconfigfile__ and __xconfigdir__ \- configuration files for
+__xconfigfile__, __xconfigdir__ \- configuration files for
__xservername__ X server
.SH INTRODUCTION
.B __xservername__