xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/man/xorg.conf.man |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 06268a0c55b7ce2737bdaa39f11cce07efa8bfa3
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Sat Jul 19 09:59:07 2014 -0700

    xfree86: Remove stale /usr/share/X11/xorg.conf.d hard-code from the xorg.conf man page
    
    I forgot that the old behavior of searching in /usr/share/X11/xorg.conf.d was
    documented in the man page.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Fixes: acc0b5edd1dc ("xfree86: Only support one sysconfigdir")
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index bc33df1..1631212 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -132,14 +132,14 @@ is the path specified with the
 .B \-configdir
 command line option (which may be absolute or relative).
 .PP
-Finally, configuration files will also be searched for in directories
-reserved for system use. These are to separate configuration files from
-the vendor or 3rd party packages from those of local administration.
-These files are found in the following directories:
+Finally, configuration files will also be searched for in a directory reserved
+for system use.
+This is to separate configuration files from the vendor or 3rd party packages
+from those of local administration.
+These files are found in the following directory:
 .PP
 .RS 4
 .nf
-.I /usr/share/X11/__xconfigdir__
 .I __datadir__/X11/__xconfigdir__
 .fi
 .RE