xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xfree86/man/xorg.conf.man |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8dedf9831bd80514d800f0085213296a3726dba7
Merge: cfc4c3d... cf96183...
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Dec 27 13:13:48 2011 -0800

    Merge remote-tracking branch 'kibi/master'

commit cf96183122a85e3376e560f0360b38b5676e57a9
Author: Cyril Brulebois <kibi at debian.org>
Date:   Wed Nov 2 12:41:20 2011 +0100

    xorg.conf.man: Fix bad whatis entry.
    
    Debian's QA tool “lintian” reported a bad whatis entry for the
    xorg.conf(.d) manpages.
    
    It comes with the following pointers:
      For manual pages that document multiple programs, functions, files, or
      other things, the part before "\-" should list each separated by a
      comma and a space. […]
    
      Refer to the lexgrog(1) manual page, the groff_man(7) manual page, and
      the groff_mdoc(7) manual page for details.
    
    Indeed, the current situation is:
      $ whatis xorg.conf; whatis xorg.conf.d
      xorg.conf (5)        - (unknown subject)
      xorg.conf.d (5)      - (unknown subject)
    
    With this patch:
      xorg.conf (5)        - configuration files for Xorg X server
      xorg.conf.d (5)      - configuration files for Xorg X server
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Cyril Brulebois <kibi at debian.org>

diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 996798f..5790185 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__