xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/doc/man/Makefile.am     |    2 +-
 hw/xfree86/doc/man/xorg.conf.d.man |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bbdf81a056be0ea645da17a642dad5eadef3a906
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 18 19:26:20 2011 -0800

    Add xorg.conf.d shadow man page pointing to xorg.conf man page
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Gaetan Nadon <memsize at videotron.ca>
    Tested-by: Gaetan Nadon <memsize at videotron.ca>
    Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/doc/man/Makefile.am b/hw/xfree86/doc/man/Makefile.am
index fe330a7..80e22cb 100644
--- a/hw/xfree86/doc/man/Makefile.am
+++ b/hw/xfree86/doc/man/Makefile.am
@@ -1,3 +1,3 @@
 include $(top_srcdir)/manpages.am
 appman_PRE = Xorg.man
-fileman_PRE = xorg.conf.man
+fileman_PRE = xorg.conf.man xorg.conf.d.man
diff --git a/hw/xfree86/doc/man/xorg.conf.d.man b/hw/xfree86/doc/man/xorg.conf.d.man
new file mode 100644
index 0000000..6b3379e
--- /dev/null
+++ b/hw/xfree86/doc/man/xorg.conf.d.man
@@ -0,0 +1 @@
+.so man__filemansuffix__/xorg.conf.__filemansuffix__