summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-12-27 13:13:48 -0800
committerKeith Packard <keithp@keithp.com>2011-12-27 13:13:48 -0800
commit8dedf9831bd80514d800f0085213296a3726dba7 (patch)
tree09b70e99d9bb70672fdf6e73a0c2537138c941a4 /hw
parentcfc4c3d7fa8bd4da4c08b2ab8e6f85435f75353a (diff)
parentcf96183122a85e3376e560f0360b38b5676e57a9 (diff)
Merge remote-tracking branch 'kibi/master'
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/man/xorg.conf.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 996798f1c..57901853b 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/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__