Update to xorg-docs 1.6.

As with previous version, only manual pages in section 7 are
installed for now.
More work is needed to be able to format and install the docs
that have been converted to docbook xml.

1 files changed, 372 insertions, 216 deletions

diff --git a/doc/xorg-docs/MAINTAINERS b/doc/xorg-docs/MAINTAINERS
index 19f613da9..49fb70b6a 100644
--- a/doc/xorg-docs/MAINTAINERS
+++ b/doc/xorg-docs/MAINTAINERS
@@ -8,8 +8,8 @@ Maintainer guidelines:
   3) Make sure your changes compile!
 
 Rules:
-1) The first person to complain about an unresponsive maintainer
-   automatically assumes maintainership of the code in question.
+  1) The first person to complain about an unresponsive maintainer
+     automatically assumes maintainership of the code in question.
 
 Unlike the kernel maintainers file, this goes more or less alphabetically
 by component within each subsystem, rather than alphabetically on maintainer
@@ -27,52 +27,152 @@ S: Status, one of the following:
 			much other than throw the odd patch in. See below..
 	Unmaintained:	No current maintainer [but maybe you could take the
 			role as you write your new code].
+	Deactivated:	Package is about to be obsoleted. A deactivated
+			package will not receive general fixes unless a user
+			requires this package to be reactivated first.
 	Obsolete:	Old code. Something tagged obsolete generally means
 			it has been replaced by a better system and you
 			should be using that.
 
+For patch submission instructions, see:
+        http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+Send all patches for modules without a specific maintainer address listed
+to xorg-devel@lists.x.org
+
 Misc. core code
 ---------------
 DRM library
 P:	Adam Jackson
 M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
+PCI Access Library
+P:	Ian Romanick
+M:	?
+L:	xorg-devel@lists.x.org
+W:	http://wiki.freedesktop.org/wiki/PciRework
+S:	Supported
+
 X.Org apps
 ---------------
-compiz
-P:	David Reveman
-M:	davidr@novell.com
-L:	compiz@lists.freedesktop.org
-W:	http://wiki.freedesktop.org/wiki/Software_2fCompiz
+
+beforelight
+S:	Obsolete
+
+lbxproxy
+S:	Obsolete - use ssh X forwarding + compression instead
+
+makepsres
+S:	Obsolete - DPS support has been dropped
+
+mkcfm
+S:	Obsolete - CID font support has been dropped
+
+pclcomp
+S:	Obsolete - only used by Xprint
+
+rstart
+S:	Obsolete - use ssh instead
+
+xbiff
+P:	Matthieu Herrb
+M:	matthieu.herrb@laas.fr
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
+xcalc 
+P:	Matthieu Herrb
+M:	matthieu.herrb@laas.fr
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
+xclock
+P:	Matthieu Herrb
+M:	matthieu.herrb@laas.fr
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
+xconsole
+P:	Matthieu Herrb
+M:	matthieu.herrb@laas.fr
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
 S:	Maintained
 
 xdm
 P:	Alan Coopersmith
 M:	alan.coopersmith@sun.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
+xedit
+P:	Paulo César Pereira de Andrade
+M:	pcpa@mandriva.com.br
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
+xinput
+P:	Peter Hutterer
+M:	peter.hutterer@who-t.net
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xkbcomp
 P:	Daniel Stone
 M:	daniel@fooishbar.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	htp://wiki.x.org
 S:	Maintained
 S:	XKB being overhauled
 S:	Please contact Daniel if you're planning to work on this
 
+xload
+P:	Matthieu Herrb
+M:	matthieu.herrb@laas.fr
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
 
-all others
-P:	Jim Gettys
-M:	?
-L:	xorg@lists.freedesktop.org
+xman 
+P:	Matthieu Herrb
+M:	matthieu.herrb@laas.fr
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
+xmessage
+P:	Matthieu Herrb
+M:	matthieu.herrb@laas.fr
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
+xmh
+S:	Obsolete - use exmh instead
+
+xsetroot
+P:	Matthieu Herrb
+M:	matthieu.herrb@laas.fr
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
+all others
+P:	?
+M:	xorg-devel@lists.x.org
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Unmaintained
+
 X.Org libraries
 ---------------
 
@@ -83,14 +183,13 @@ SM
 WindowsWM
 XRes
 XScrnSaver
-XTrap
 Xau
 Xaw
 
 X11, Xcomposite, Xcursor, Xdamage, Xfixes, Xrandr, Xrender
 P:	Keith Packard
 M:	keith.packard@intel.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
@@ -105,7 +204,7 @@ Xinerama
 Xi, xkbfile, xkbui
 P:	Daniel Stone
 M:	daniel@fooishbar.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	htp://wiki.x.org
 S:	Maintained
 S:	XKB being overhauled
@@ -134,133 +233,122 @@ lbxutil
 S:	Obsolete
 
 oldX
-S:	Obsolete
+S:	Obsolete - use libX11 instead
+
+XTrap
+S:	Obsolete - use libXtst instead
 
 xtrans
 P:      Bill Crawford
 M:      billcrawford1970@gmail.com
-L:      xorg@lists.freedesktop.org
+L:      xorg-devel@lists.x.org
 W:      http://wiki.x.org
 S:      Maintained
 
 X.Org core
 ----------
-Cfb subsystem
-P:	Adam Jackson
-M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
-W:	http://wiki.x.org
-S:	Obsolete
-
 Composite extension
 P:	Keith Packard
 M:	keith.packard@intel.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Configuration subsystem
 P:	Adam Jackson
 M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Damage extension
 P:	Keith Packard
 M:	keith.packard@intel.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Device Independent X (DIX)
 P:	Keith Packard
 M:	keith.packard@intel.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 DRI subsystem
 P:	Adam Jackson
 M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 EXA subsystem
 P:	Eric Anholt
 M:	anholt@freebsd.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 GL subsystem
 P:	Ian Romanick
 M:	idr@us.ibm.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 KDrive
 P:	Keith Packard
 M:	keith.packard@intel.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Loader subsystem
 P:	Adam Jackson
 M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Randr extension
 P:	Keith Packard
 M:	keith.packard@intel.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Render extension
 P:	Keith Packard
 M:	keith.packard@intel.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 XAA subsystem
 P:	Adam Jackson
 M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Obsolete
+S:	Despised
 
 XACE subsystem (security policy extensions framework)
 P:	Eamon Walsh
 M:	ewalsh@tycho.nsa.gov
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://people.freedesktop.org/~ewalsh/xace_proposal.html
 S:	Maintained
 
 Xfixes extension
 P:	Keith Packard
 M:	keith.packard@intel.com
-L:	xorg@lists.freedesktop.org
-W:	http://wiki.x.org
-S:	Maintained
-
-Xgl
-P:	David Reveman
-M:	davidr@novell.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 XKB
 P:	Daniel Stone
 M:	daniel@fooishbar.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained, being seriously overhauled
 S:	Please contact Daniel if you're planning to work on this
@@ -268,18 +356,18 @@ S:	Please contact Daniel if you're planning to work on this
 Input subsystem
 P:	Daniel Stone
 M:	daniel@fooishbar.org
-P:	Zepheniah E. Hull
-M:	warp@debian.org
-L:	xorg@lists.freedesktop.org
+P:	Peter Hutterer
+M:	peter.hutterer@who-t.net
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained, being overhauled
-S:	Please contact Daniel or Zepheniah if you're planning to work on this
+S:	Please contact Daniel or Peter if you're planning to work on this
 
 Xprint
 P:	Drew Parsons
 P:	Felix Schulte
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
@@ -288,396 +376,420 @@ X.Org OS ports
 FreeBSD
 P:	Eric Anholt
 M:	anholt@freebsd.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Linux/i386
 P:	Egbert Eich
 M:	eich@freedesktop.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Linux/x86_64
 P:	Egbert Eich
 M:	eich@freedesktop.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Linux/ia64
 P:	Jesse Barnes
 M:	jbarnes@virtuousgeek.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Linux/ppc
 P:	Benjamin Herrenschmidt
 M:	benh@kernel.crashing.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 Linux/sparc
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 LynxOS
-P:	?
-M:	?
-L:	xorg@lists.freedesktop.org
+S:	Obsolete / Removed
+
+Mac OS X (Xquartz)
+P:	Ben Byer
+M:	bbyer@apple.com
+P:	Jeremy Huddleston
+M:	jeremyhu@apple.com
+L:	xquartz-dev@lists.macosforge.org
+W:	http://xquartz.macosforge.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Maintained
 
-Mac OS X/Darwin
+NetBSD
 P:	?
-M:	?
-L:	xorg@lists.freedesktop.org
+M:	xorg-devel@lists.x.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 OpenBSD
 P:	Matthieu Herrb
 M:	matthieu.herrb@laas.fr
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 SCO (OpenServer 5)
 P:	Kean Johnston
 M:	jkj@freedesktop.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
-System V
+System V (other than Solaris & SCO)
 P:	?
-M:	?
-L:	xorg@lists.freedesktop.org
+M:	xorg-devel@lists.x.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Unmaintained (libraries/apps) ; Obsolete/Removed (Xorg server)
 
 Solaris (x86 & sparc)
 P:	Alan Coopersmith
 M:	alan.coopersmith@sun.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org & http://opensolaris.org/os/community/x_win/
 S:	Maintained
 
 USL (UnixWare 7.1.x, OpenServer 6)
 P:	Kean Johnston
 M:	jkj@freedesktop.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
-Xwin (Cygwin/mingw port)
-P:	Alan Hourihane
-M:	alanh@freedesktop.org
-L:	xorg@lists.freedesktop.org
+Cygwin
+P:	Jon TURNEY
+M:	jon.turney@dronecode.org.uk
+P:	Yaakov Selkowitz
+M:	yselkowitz@users.sourceforge.net
+L:	cygwin-xfree@cygwin.com
+W:	http://x.cygwin.com/
+S:	Maintained
+
+MinGW
+P:	Colin Harrison
+M:	colin.harrison@virgin.net
+W:	http://www.straightrunning.com/XmingNotes/
+S:	Maintained
+
+GNU/Hurd
+P:	Samuel Thibault
+M:	samuel.thibault@ens-lyon.org
 W:	http://wiki.x.org
+L:	bug-hurd@gnu.org
 S:	Maintained
 
 Drivers
 -------
 xf86-input-acecad
-P:	?
-M:	?
-L:	xorg@lists.freedesktop.org
+P:	Giuseppe Bilotta
+M:	giuseppe.bilotta@gmail.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Maintained
 
 xf86-input-aiptek
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-input-calcomp
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-citron
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-digitaledge
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-dmc
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-dynapro
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-elo2300
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-elographics
-P:	?
-M:	?
-L:	xorg@lists.freedesktop.org
+P:	Marc Balmer
+M:	marc.balmer@arcapos.com
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Maintained
 
 xf86-input-evdev
-P:	Zephaniah E. Hull
-M:	warp@aehallh.com
-L:	xorg@lists.freedesktop.org
+P:	Peter Hutterer
+M:	peter.hutterer@who-t.net
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-input-fpit
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-input-hyperpen
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-input-jamstudio
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-joystick
-P:	?
-M:	?
-L:	xorg@lists.freedesktop.org
+P:	Sascha Hlusiak
+M:	saschahlusiak@arcor.de
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Maintained
 
 xf86-input-keyboard
-P:	?
-M:	?
-L:	xorg@lists.freedesktop.org
+P:	Alan Coopersmith
+M:	alan.coopersmith@sun.com
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Maintained
 
 xf86-input-magellan
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-magictouch
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-microtouch
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-input-mouse
-P:	Egbert Eich
-M:	eich@freedesktop.org
-L:	xorg@lists.freedesktop.org
+P:	Alan Coopersmith
+M:	alan.coopersmith@sun.com
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-input-mutouch
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-input-palmax
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-penmount
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-input-sample
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Obsolete
 
 xf86-input-spaceorb
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-summa
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
+
+xf86-input-synaptics
+P:	Christoph Brill
+M:	egore911@egore911.de
+P:	Peter Hutterer
+M:	peter.hutterer@who-t.net
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
 
 xf86-input-tek4957
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-ur98
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Deactivated
 
 xf86-input-vmmouse
-P:	Philip Langdale
-M:	plangdale@vmware.com
-L:	xorg@lists.freedesktop.org
+P:	Thomas Hellstrom
+M:	thellstrom@vmware.com
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-input-void
-P:	Adam Jackson
-M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
+P:	Peter Hutterer
+M:	peter.hutterer@who-t.net
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-apm
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-ark
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-ast
 P:	Y.C. Chen
 M:	yc_chen@aspeedtech.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
-xf86-video-ati/atimisc
-P:      Luc Verhaegen
-M:      libv@skynet.be
-L:      xorg@lists.freedesktop.org
-W:      http://wiki.x.org
-S:      Maintained, being overhauled
-
-xf86-video-ati/r128, radeon
+xf86-video-ati
 P:	Alex Deucher
 P:      Ben Herrenschmidt
 P:      et al
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-chips
 P:	Egbert Eich
 M:	eich@freedesktop.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-cirrus
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-cyrix
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-dummy
 P:	Adam Jackson
 M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-fbdev
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-glide
-P:	?
-M:	?
-L:	xorg@lists.freedesktop.org
+P:	Guillem Jover
+M:	guillem@hadrons.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Obsolete
+S:	Obsolete, yet still somehow maintained
 
 xf86-video-glint
 P:	Alan Hourihane
 M:	alanh@fairlite.demon.co.uk
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-i128
 P:	Adam Jackson
 M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
@@ -685,242 +797,286 @@ xf86-video-i740
 P:	Egbert Eich
 P:	??
 M:	eich@freedesktop.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
-xf86-video-i810
-P:	Alan Hourihane
-M:	alanh@fairlite.demon.co.uk
-L:	xorg@lists.freedesktop.org
+xf86-video-intel
+P:	Eric Anholt
+M:	eric@anholt.net
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
+xf86-video-mach64
+P:      Luc Verhaegen
+M:      libv@skynet.be
+L:      xorg-devel@lists.x.org
+W:      http://wiki.x.org
+S:	Maintained
+
 xf86-video-imstt
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-mga
-P:	?
+P:	Ian Romanick
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Maintained
 
 xf86-video-neomagic
 P:	Egbert Eich
 M:	eich@freedesktop.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-newport
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-nsc
 P:	Alan Hourihane
 M:	alanh@fairlite.demon.co.uk
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-nv
 P:	Aaron Plattner
 M:	aplattner@freedesktop.org
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-rendition
 P:	Adam Jackson
 M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Odd fixes.
 
+xf86-video-r128
+P:	Alex Deucher
+P:      Ben Herrenschmidt
+P:      et al
+M:	?
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
+xf86-video-radeon
+P:	Alex Deucher
+P:      Ben Herrenschmidt
+P:      et al
+M:	?
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
 xf86-video-s3
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-s3virge
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-savage
 P:	Alex Deucher
 M:	agd5f@yahoo.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-siliconmotion
 P:	Alex Deucher
 M:	agd5f@yahoo.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-sis
-P:	Thomas Winischhofer
+P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Maintained
+S:	Unmaintained
 
 xf86-video-sisusb
-P:	Thomas Winischhofer
+P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Maintained
+S:	Unmaintained
 
 xf86-video-sunbw2
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-suncg14
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-suncg3
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-suncg6
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-sunffb
 P:	David S. Miller
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Odd fixes
 
 xf86-video-sunleo
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-suntcx
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-tdfx
 P:	Adam Jackson
 M:	ajax@nwnk.net
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-tga
 P:	Alan Hourihane
 M:	alanh@fairlite.demon.co.uk
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-trident
 P:	Alan Hourihane
 M:	alanh@fairlite.demon.co.uk
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-tseng
 P:	Luc Verhaegen
 M:	libv@skynet.be
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-v4l
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
 xf86-video-vesa
-P:	?
-M:	?
-L:	xorg@lists.freedesktop.org
+P:	Adam Jackson
+M:	ajax@nwnk.net
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Maintained
 
 xf86-video-vga
 P:	?
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
-S:	Unmaintained
+S:	Obsolete - use xf86-video-vesa instead
 
 xf86-video-via
 P:	Luc Verhaegen
 P:      Thomas Hellström
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 W:      http://unichrome.sf.net
 S:	Unmaintained
 
 xf86-video-vmware
-P:	Philip Langdale
-M:	plangdale@vmware.com
-L:	xorg@lists.freedesktop.org
+P:	Thomas Hellstrom
+M:	thellstrom@vmware.com
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-voodoo
 P:	Alan Cox
 M:	?
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Odd fixes
 
 xf86-video-wsfb
 P:	Matthieu Herrb
 M:	matthieu.herrb@laas.fr
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
+xf86-video-xgi
+P:	Ian Romanick
+M:	?
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
+Other modules
+-------------
+
+data/bitmaps, data/cursors, doc/*, fonts/*, util/*
+P:	?
+M:	xorg-devel@lists.x.org
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Unmaintained
+
+xkbdata
+S:	Obsolete - use xkeyboard-config instead
 
 Developer relations & services
 ------------------------------
 
 Mailing lists (lists.x.org)
-P:	Mike Harris
+P:	?
 M:	mailman@lists.x.org
 L:	mailman@lists.x.org
 W:	http://lists.x.org/mailman/listinfo/
@@ -929,14 +1085,14 @@ S:	Maintained
 Website (www.x.org)
 P:	Stuart Anderson
 M:	anderson@netsweng.com
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://www.x.org/
 S:	Maintained
 
 Supply of pastries, other food, beverages
 P:	Luc Verhaegen
 M:	libv@skynet.be
-L:	xorg@lists.freedesktop.org
+L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Disrepair
 S:	'Other food' may induce illness.  Beware.