MAINTAINERS: update format

Combine P: & M: lines into single M: line for maintainer.
Add definitions of C:, T:, F:, & X: lines

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 215 insertions, 358 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 2199b14..098b023 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15,14 +15,13 @@ Unlike the kernel maintainers file, this goes more or less alphabetically
 by component within each subsystem, rather than alphabetically on maintainer
 name.
 
-P: Person
-M: Mail patches to (but cc the mailing list as well)
+M: Maintainer
 L: Mailing list that is relevant to this area
 W: Web-page with status/info
 S: Status, one of the following:
 
 	Supported:	Someone is actually paid to look after this.
-	Maintained:     Someone actually looks after it.
+	Maintained:	Someone actually looks after it.
 	Odd Fixes:	It has a maintainer but they don't have time to do
 			much other than throw the odd patch in. See below..
 	Unmaintained:	No current maintainer [but maybe you could take the
@@ -33,9 +32,16 @@ S: Status, one of the following:
 	Obsolete:	Old code. Something tagged obsolete generally means
 			it has been replaced by a better system and you
 			should be using that.
+C: URI for *chat* protocol, server and channel where developers
+   usually hang out, for example irc://server/channel.
+T: SCM tree location.
+F: Files and directories wildcard patterns.
+   One pattern per line.  Multiple F: lines acceptable.
+X: Excluded files and directories that are NOT maintained
+   One pattern per line.  Multiple F: lines acceptable.
 
 For patch submission instructions, see:
-        https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+	https://www.x.org/wiki/Development/Documentation/SubmittingPatches
 
 Send all patches for modules without a specific maintainer address listed
 to xorg-devel@lists.x.org
@@ -43,17 +49,15 @@ to xorg-devel@lists.x.org
 Misc. core code
 ---------------
 DRM library
-P:	Adam Jackson
-M:	ajax@nwnk.net
+M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/mesa/drm
+T:	https://gitlab.freedesktop.org/mesa/drm
 S:	Maintained
 
 PCI Access Library
-P:	Ian Romanick
-M:	?
+M:	Ian Romanick
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/lib/libpciaccess
+T:	https://gitlab.freedesktop.org/xorg/lib/libpciaccess
 S:	Supported
 
 X.Org apps
@@ -81,89 +85,77 @@ rstart
 S:	Obsolete - use ssh instead
 
 xauth
-P:	Dr. Tilmann Bubeck
-M:	t.bubeck@reinform.de
+M:	Dr. Tilmann Bubeck <t.bubeck@reinform.de>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xauth
+T:	https://gitlab.freedesktop.org/xorg/app/xauth
 S:	Maintained
 
 xbiff
-P:	Matthieu Herrb
-M:	matthieu.herrb@laas.fr
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xbiff
+T:	https://gitlab.freedesktop.org/xorg/app/xbiff
 S:	Maintained
 
-xcalc 
-P:	Matthieu Herrb
-M:	matthieu.herrb@laas.fr
+xcalc
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xcalc
+T:	https://gitlab.freedesktop.org/xorg/app/xcalc
 S:	Maintained
 
 xclock
-P:	Matthieu Herrb
-M:	matthieu.herrb@laas.fr
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xclock
+T:	https://gitlab.freedesktop.org/xorg/app/xclock
 S:	Maintained
 
 xconsole
-P:	Matthieu Herrb
-M:	matthieu.herrb@laas.fr
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xconsole
+T:	https://gitlab.freedesktop.org/xorg/app/xconsole
 S:	Maintained
 
 xdm
-P:	?
-M:	xorg-devel@lists.x.org
+M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xdm
+T:	https://gitlab.freedesktop.org/xorg/app/xdm
 S:	Unmaintained
 
 xedit
-P:	Paulo César Pereira de Andrade
-M:	pcpa@mandriva.com.br
+M:	Paulo César Pereira de Andrade <pcpa@mandriva.com.br>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xedit
+T:	https://gitlab.freedesktop.org/xorg/app/xedit
 S:	Maintained
 
 xinput
-P:	Peter Hutterer
-M:	peter.hutterer@who-t.net
+M:	Peter Hutterer <peter.hutterer@who-t.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xinput
+T:	https://gitlab.freedesktop.org/xorg/app/xinput
 S:	Maintained
 
 xkbcomp
-P:	Daniel Stone
-M:	daniel@fooishbar.org
+M:	Daniel Stone <daniel@fooishbar.org>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xkbcomp
+T:	https://gitlab.freedesktop.org/xorg/app/xkbcomp
 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
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xload
+T:	https://gitlab.freedesktop.org/xorg/app/xload
 S:	Maintained
 
-xman 
-P:	Matthieu Herrb
-M:	matthieu.herrb@laas.fr
+xman
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xman
+T:	https://gitlab.freedesktop.org/xorg/app/xman
 S:	Maintained
 
 xmessage
-P:	Matthieu Herrb
-M:	matthieu.herrb@laas.fr
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xmessage
+T:	https://gitlab.freedesktop.org/xorg/app/xmessage
 S:	Maintained
 
 xmh
@@ -179,20 +171,18 @@ xsetpointer
 S:	Obsolete - use xinput instead (for Xorg < 1.4, can't work after that)
 
 xsetroot
-P:	Matthieu Herrb
-M:	matthieu.herrb@laas.fr
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app/xsetroot
+T:	https://gitlab.freedesktop.org/xorg/app/xsetroot
 S:	Maintained
 
 xtrap
 S:	Obsolete
 
 all others
-P:	?
-M:	xorg-devel@lists.x.org
+M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/app
+T:	https://gitlab.freedesktop.org/xorg/app
 S:	Unmaintained
 
 X.Org libraries
@@ -208,8 +198,7 @@ Xau
 S:	Unmaintained
 
 AppleWM
-P:	Jeremy Huddleston Sequoia
-M:	jeremyhu@apple.com
+M:	Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 L:	xquartz-dev@lists.macosforge.org
 W:	https://www.xquartz.org/
 L:	xorg-devel@lists.x.org
@@ -217,10 +206,9 @@ W:	https://wiki.x.org
 S:	Maintained
 
 X11, Xcomposite, Xcursor, Xdamage, Xfixes, Xrandr, Xrender
-P:	Keith Packard
-M:	keith.packard@intel.com
+M:	Keith Packard <keith.packard@intel.com>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/lib
+T:	https://gitlab.freedesktop.org/xorg/lib
 S:	Maintained
 
 Xdmcp
@@ -241,17 +229,15 @@ Xinerama
 S:	Unmaintained
 
 Xi
-P:	Peter Hutterer
-M:	peter.hutterer@who-t.net
+M:	Peter Hutterer <peter.hutterer@who-t.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/lib/libxi
+T:	https://gitlab.freedesktop.org/xorg/lib/libxi
 S:	Maintained
 
 xkbfile
-P:	Daniel Stone
-M:	daniel@fooishbar.org
+M:	Daniel Stone <daniel@fooishbar.org>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/lib/libxkbfile
+T:	https://gitlab.freedesktop.org/xorg/lib/libxkbfile
 S:	Maintained
 S:	XKB being overhauled
 S:	Please contact Daniel if you're planning to work on this
@@ -271,10 +257,9 @@ XprintAppUtil, XprintUtil
 S:	Obsolete
 
 Xt, Xaw, twm
-P:	Thomas E. Dickey
-M:	dickey@his.com
+M:	Thomas E. Dickey <dickey@his.com>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/lib/libxt
+T:	https://gitlab.freedesktop.org/xorg/lib/libxt
 S:	Maintained
 
 Xtst
@@ -302,177 +287,152 @@ XTrap
 S:	Obsolete - use libXtst instead
 
 xtrans
-P:      Bill Crawford
-M:      billcrawford1970@gmail.com
-L:      xorg-devel@lists.x.org
-W:      https://gitlab.freedesktop.org/xorg/lib/libxtrans
-S:      Maintained
+M:	Bill Crawford <billcrawford1970@gmail.com>
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/lib/libxtrans
+S:	Maintained
 
 X.Org core
 ----------
 Composite extension
-P:	Keith Packard
-M:	keith.packard@intel.com
+M:	Keith Packard <keith.packard@intel.com>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Configuration subsystem
-P:	Adam Jackson
-M:	ajax@nwnk.net
+M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Damage extension
-P:	Keith Packard
-M:	keith.packard@intel.com
+M:	Keith Packard <keith.packard@intel.com>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Device Independent X (DIX)
-P:	Keith Packard
-M:	keith.packard@intel.com
+M:	Keith Packard <keith.packard@intel.com>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 DRI subsystem
-P:	Adam Jackson
-M:	ajax@nwnk.net
+M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 EXA subsystem
-P:	Eric Anholt
-M:	anholt@freebsd.org
+M:	Eric Anholt <anholt@freebsd.org>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 GL subsystem
-P:	Ian Romanick
-M:	idr@us.ibm.com
+M:	Ian Romanick <idr@us.ibm.com>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 KDrive
-P:	Keith Packard
-M:	keith.packard@intel.com
+M:	Keith Packard <keith.packard@intel.com>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Loader subsystem
-P:	Adam Jackson
-M:	ajax@nwnk.net
+M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Randr extension
-P:	Keith Packard
-M:	keith.packard@intel.com
+M:	Keith Packard <keith.packard@intel.com>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Render extension
-P:	Keith Packard
-M:	keith.packard@intel.com
+M:	Keith Packard <keith.packard@intel.com>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 XAA subsystem
-P:	Adam Jackson
-M:	ajax@nwnk.net
+M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Despised
 
 XACE subsystem (security policy extensions framework)
-P:	Eamon Walsh
-M:	ewalsh@tycho.nsa.gov
+M:	Eamon Walsh <ewalsh@tycho.nsa.gov>
 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
+M:	Keith Packard <keith.packard@intel.com>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 XKB
-P:	Daniel Stone
-M:	daniel@fooishbar.org
+M:	Daniel Stone <daniel@fooishbar.org>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained, being seriously overhauled
 S:	Please contact Daniel if you're planning to work on this
 
 Input subsystem
-P:	Daniel Stone
-M:	daniel@fooishbar.org
-P:	Peter Hutterer
-M:	peter.hutterer@who-t.net
+M:	Daniel Stone <daniel@fooishbar.org>
+M:	Peter Hutterer <peter.hutterer@who-t.net>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained, being overhauled
 S:	Please contact Daniel or Peter if you're planning to work on this
 
 Xprint
-P:	Drew Parsons
-P:	Felix Schulte
-M:	?
+M:	Drew Parsons
+M:	Felix Schulte
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/xserver-xprint
+T:	https://gitlab.freedesktop.org/xorg/xserver-xprint
 S:	Deactivated
 
 X.Org OS ports
 --------------
 FreeBSD
-P:	Eric Anholt
-M:	anholt@freebsd.org
+M:	Eric Anholt <anholt@freebsd.org>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Linux/i386
-P:	Egbert Eich
-M:	eich@freedesktop.org
+M:	Egbert Eich <eich@freedesktop.org>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Linux/x86_64
-P:	Egbert Eich
-M:	eich@freedesktop.org
+M:	Egbert Eich <eich@freedesktop.org>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Linux/ia64
-P:	Jesse Barnes
-M:	jbarnes@virtuousgeek.org
+M:	Jesse Barnes <jbarnes@virtuousgeek.org>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Linux/ppc
-P:	Benjamin Herrenschmidt
-M:	benh@kernel.crashing.org
+M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Linux/sparc
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
@@ -482,8 +442,7 @@ LynxOS
 S:	Obsolete / Removed
 
 Mac OS X (Xquartz)
-P:	Jeremy Huddleston Sequoia
-M:	jeremyhu@apple.com
+M:	Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 L:	xquartz-dev@lists.macosforge.org
 W:	https://www.xquartz.org/
 L:	xorg-devel@lists.x.org
@@ -491,67 +450,56 @@ W:	https://wiki.x.org
 S:	Maintained
 
 NetBSD
-P:	?
-M:	xorg-devel@lists.x.org
+M:	?
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Unmaintained
 
 OpenBSD
-P:	Matthieu Herrb
-M:	matthieu.herrb@laas.fr
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 SCO (OpenServer 5)
-P:	Kean Johnston
-M:	jkj@freedesktop.org
+M:	Kean Johnston <jkj@freedesktop.org>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 System V (other than Solaris & SCO)
-P:	?
-M:	xorg-devel@lists.x.org
+M:	?
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Unmaintained (libraries/apps) ; Obsolete/Removed (Xorg server)
 
 Solaris (x86 & sparc)
-P:	Alan Coopersmith
-M:	alan.coopersmith@oracle.com
-P:	Niveditha Rau
-M:	niveditha.rau@oracle.com
+M:	Alan Coopersmith <alan.coopersmith@oracle.com>
+M:	Niveditha Rau <niveditha.rau@oracle.com>
 L:	xorg-devel@lists.x.org
 W:	https://github.com/oracle/solaris-userland/tree/master/components/x11
 S:	Maintained
 
 USL (UnixWare 7.1.x, OpenServer 6)
-P:	Kean Johnston
-M:	jkj@freedesktop.org
+M:	Kean Johnston <jkj@freedesktop.org>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Maintained
 
 Cygwin
-P:	Jon TURNEY
-M:	jon.turney@dronecode.org.uk
-P:	Yaakov Selkowitz
-M:	yselkowitz@users.sourceforge.net
+M:	Jon TURNEY <jon.turney@dronecode.org.uk>
+M:	Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
 L:	cygwin-xfree@cygwin.com
 W:	https://x.cygwin.com/
 S:	Maintained
 
 MinGW
-P:	Colin Harrison
-M:	colin.harrison@virgin.net
+M:	Colin Harrison <colin.harrison@virgin.net>
 W:	http://www.straightrunning.com/XmingNotes/
 S:	Maintained
 
 GNU/Hurd
-P:	Samuel Thibault
-M:	samuel.thibault@ens-lyon.org
+M:	Samuel Thibault <samuel.thibault@ens-lyon.org>
 W:	https://wiki.x.org
 L:	bug-hurd@gnu.org
 S:	Maintained
@@ -559,282 +507,241 @@ S:	Maintained
 Drivers
 -------
 xf86-input-acecad
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-acecad
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-acecad
 S:	Deactivated
 
 xf86-input-aiptek
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-aiptek
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-aiptek
 S:	Deactivated
 
 xf86-input-calcomp
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-calcomp
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-calcomp
 S:	Deactivated
 
 xf86-input-citron
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-citron
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-citron
 S:	Deactivated
 
 xf86-input-digitaledge
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-digitaledge
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-digitaledge
 S:	Deactivated
 
 xf86-input-dmc
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-dmc
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-dmc
 S:	Deactivated
 
 xf86-input-dynapro
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-dynapro
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-dynapro
 S:	Deactivated
 
 xf86-input-elo2300
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-elo2300
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-elo2300
 S:	Deactivated
 
 xf86-input-elographics
-P:	Marc Balmer
-M:	marc.balmer@arcapos.com
+M:	Marc Balmer <marc.balmer@arcapos.com>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-elographics
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-elographics
 S:	Maintained
 
 xf86-input-evdev
-P:	Peter Hutterer
-M:	peter.hutterer@who-t.net
+M:	Peter Hutterer <peter.hutterer@who-t.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev
 S:	Maintained
 
 xf86-input-fpit
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-fpit
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-fpit
 S:	Deactivated
 
 xf86-input-hyperpen
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-hyperpen
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-hyperpen
 S:	Deactivated
 
 xf86-input-jamstudio
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-jamstudio
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-jamstudio
 S:	Deactivated
 
 xf86-input-joystick
-P:	Sascha Hlusiak
-M:	saschahlusiak@arcor.de
+M:	Sascha Hlusiak <saschahlusiak@arcor.de>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick
 S:	Maintained
 
 xf86-input-keyboard
-P:	Alan Coopersmith
-M:	alan.coopersmith@oracle.com
+M:	Alan Coopersmith <alan.coopersmith@oracle.com>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard
 S:	Maintained
 
 xf86-input-magellan
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-magellan
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-magellan
 S:	Deactivated
 
 xf86-input-magictouch
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-magictouch
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-magictouch
 S:	Deactivated
 
 xf86-input-microtouch
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-microtouch
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-microtouch
 S:	Deactivated
 
 xf86-input-mouse
-P:	Alan Coopersmith
-M:	alan.coopersmith@oracle.com
+M:	Alan Coopersmith <alan.coopersmith@oracle.com>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse
 S:	Maintained
 
 xf86-input-mutouch
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-mutouch
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-mutouch
 S:	Deactivated
 
 xf86-input-palmax
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-palmax
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-palmax
 S:	Deactivated
 
 xf86-input-penmount
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-penmount
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-penmount
 S:	Deactivated
 
 xf86-input-sample
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
 W	https://gitlab.freedesktop.org/xorg/driver/xf86-input-sample
 S:	Obsolete
 
 xf86-input-spaceorb
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-spaceorb
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-spaceorb
 S:	Deactivated
 
 xf86-input-summa
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-summa
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-summa
 S:	Deactivated
 
 xf86-input-synaptics
-P:	Peter Hutterer
-M:	peter.hutterer@who-t.net
+M:	Peter Hutterer <peter.hutterer@who-t.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics
 S:	Maintained
 
 xf86-input-tek4957
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-tek4957
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-tek4957
 S:	Deactivated
 
 xf86-input-ur98
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-ur98
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-ur98
 S:	Deactivated
 
 xf86-input-vmmouse
-P:	VMware Linux Graphics Maintainer
-M:	linux-graphics-maintainer@vmware.com
+M:	VMware Linux Graphics Maintainer <linux-graphics-maintainer@vmware.com>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org/wiki/vmware
 S:	Supported
 
 xf86-input-void
-P:	Peter Hutterer
-M:	peter.hutterer@who-t.net
+M:	Peter Hutterer <peter.hutterer@who-t.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-void
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-void
 S:	Maintained
 
 xf86-video-apm
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-apm
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-apm
 S:	Deactivated
 
 xf86-video-ark
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-ark
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-ark
 S:	Deactivated
 
 xf86-video-ast
-P:	Y.C. Chen
-M:	yc_chen@aspeedtech.com
+M:	Y.C. Chen <yc_chen@aspeedtech.com>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-ast
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-ast
 S:	Maintained
 
 xf86-video-ati
-P:	Alex Deucher
-P:      Ben Herrenschmidt
-P:      et al
-M:	?
+M:	Alex Deucher
+M:	Ben Herrenschmidt
 L:	xorg-driver-ati@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati
 S:	Maintained
 
 xf86-video-chips
-P:	Egbert Eich
-M:	eich@freedesktop.org
+M:	Egbert Eich <eich@freedesktop.org>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-chips
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-chips
 S:	Maintained
 
 xf86-video-cirrus
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-cirrus
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-cirrus
 S:	Unmaintained
 
 xf86-video-cyrix
-P:	?
 M:	?
 L:	xorg-driver-geode@lists.x.org
 W:	https://www.x.org/wiki/GeodeDriver
 S:	Obsolete - mostly replaced by xf86-video-geode
 
 xf86-video-dummy
-P:	Adam Jackson
-M:	ajax@nwnk.net
+M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy
 S:	Maintained
 
 xf86-video-fbdev
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev
 S:	Unmaintained
 
 xf86-video-geode
-P:	?
 M:	?
 L:	xorg-driver-geode@lists.x.org
 W:	https://lists.x.org/mailman/listinfo/xorg-driver-geode
@@ -842,274 +749,233 @@ W:	https://www.x.org/wiki/GeodeDriver
 S:	Maintained
 
 xf86-video-glide
-P:	Guillem Jover
-M:	guillem@hadrons.org
+M:	Guillem Jover <guillem@hadrons.org>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-glide
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-glide
 S:	Obsolete, yet still somehow maintained
 
 xf86-video-glint
-P:	Alan Hourihane
-M:	alanh@fairlite.demon.co.uk
+M:	Alan Hourihane <alanh@fairlite.demon.co.uk>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint
 S:	Maintained
 
 xf86-video-i128
-P:	Adam Jackson
-M:	ajax@nwnk.net
+M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-i128
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-i128
 S:	Maintained
 
 xf86-video-i740
-P:	Egbert Eich
-P:	??
-M:	eich@freedesktop.org
+M:	Egbert Eich <eich@freedesktop.org>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-i740
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-i740
 S:	Unmaintained
 
 xf86-video-imstt
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-imstt
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-imstt
 S:	Deactivated
 
 xf86-video-intel
-P:	Eric Anholt
-M:	eric@anholt.net
+M:	Eric Anholt <eric@anholt.net>
 L:	intel-gfx@lists.freedesktop.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel
 S:	Supported
 
 xf86-video-mach64
-P:      Luc Verhaegen
-M:      libv@skynet.be
+M:	Luc Verhaegen <libv@skynet.be>
 L:	xorg-driver-ati@lists.x.org
-W:      https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64
 S:	Maintained
 
 xf86-video-mga
-P:	Ian Romanick
-M:	?
+M:	Ian Romanick
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga
 S:	Maintained
 
 xf86-video-modesetting
-P:	Dave Airlie
-M:	airlied@redhat.com
+M:	Dave Airlie <airlied@redhat.com>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/xserver
+T:	https://gitlab.freedesktop.org/xorg/xserver
 S:	Maintained
 
 xf86-video-neomagic
-P:	Egbert Eich
-M:	eich@freedesktop.org
+M:	Egbert Eich <eich@freedesktop.org>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-neomagic
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-neomagic
 S:	Maintained
 
 xf86-video-nested
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-nested
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-nested
 S:	Maintained
 
 xf86-video-newport
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-newport
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-newport
 S:	Unmaintained
 
 xf86-video-nsc
-P:	Alan Hourihane
-M:	alanh@fairlite.demon.co.uk
+M:	Alan Hourihane <alanh@fairlite.demon.co.uk>
 L:	xorg-driver-geode@lists.x.org
 W:	https://www.x.org/wiki/GeodeDriver
 S:	Obsolete - mostly replaced by xf86-video-geode
 
 xf86-video-nv
-P:	Aaron Plattner
-M:	aplattner@freedesktop.org
+M:	Aaron Plattner <aplattner@freedesktop.org>
 L:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv
 W:	https://wiki.x.org
 S:	Maintained
 
 xf86-video-omap
-P:	Rob Clark
-M:	robclark@freedesktop.org
+M:	Rob Clark <robclark@freedesktop.org>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-omap
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-omap
 S:	Maintained
 
 xf86-video-qxl
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
 S:	Maintained
 
 xf86-video-rendition
-P:	Adam Jackson
-M:	ajax@nwnk.net
+M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-rendition
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-rendition
 S:	Odd fixes.
 
 xf86-video-r128
-P:	Alex Deucher
-P:      Ben Herrenschmidt
-P:      et al
-M:	?
+M:	Alex Deucher
+M:	Ben Herrenschmidt
 L:	xorg-driver-ati@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-r128
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-r128
 S:	Maintained
 
 radeon driver (xf86-video-ati)
-P:	Alex Deucher
-P:      Ben Herrenschmidt
-P:      et al
-M:	?
+M:	Alex Deucher
+M:	Ben Herrenschmidt
 L:	xorg-driver-ati@lists.x.org
 W:	https://www.x.org/wiki/radeon
 S:	Maintained
 
 xf86-video-s3
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3
 S:	Unmaintained
 
 xf86-video-s3virge
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3virge
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3virge
 S:	Unmaintained
 
 xf86-video-savage
-P:	Alex Deucher
-M:	agd5f@yahoo.com
+M:	Alex Deucher <agd5f@yahoo.com>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-savage
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-savage
 S:	Maintained
 
 xf86-video-siliconmotion
-P:	Alex Deucher
-M:	agd5f@yahoo.com
+M:	Alex Deucher <agd5f@yahoo.com>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-siliconmotion
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-siliconmotion
 S:	Unmaintained
 
 xf86-video-sis
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis
 S:	Unmaintained
 
 xf86-video-sisusb
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sisusb
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sisusb
 S:	Unmaintained
 
 xf86-video-sunbw2
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunbw2
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunbw2
 S:	Deactivated
 
 xf86-video-suncg14
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg14
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg14
 S:	Unmaintained
 
 xf86-video-suncg3
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg3
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg3
 S:	Unmaintained
 
 xf86-video-suncg6
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6
 S:	Unmaintained
 
 xf86-video-sunffb
-P:	David S. Miller
-M:	?
+M:	David S. Miller
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb
 S:	Odd fixes
 
 xf86-video-sunleo
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo
 S:	Unmaintained
 
 xf86-video-suntcx
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-suntcx
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-suntcx
 S:	Unmaintained
 
 xf86-video-tdfx
-P:	Adam Jackson
-M:	ajax@nwnk.net
+M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-tdfx
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-tdfx
 S:	Maintained
 
 xf86-video-tga
-P:	Alan Hourihane
-M:	alanh@fairlite.demon.co.uk
+M:	Alan Hourihane <alanh@fairlite.demon.co.uk>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-tga
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-tga
 S:	Maintained
 
 xf86-video-trident
-P:	Alan Hourihane
-M:	alanh@fairlite.demon.co.uk
+M:	Alan Hourihane <alanh@fairlite.demon.co.uk>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident
 S:	Maintained
 
 xf86-video-tseng
-P:	Luc Verhaegen
-M:	libv@skynet.be
+M:	Luc Verhaegen <libv@skynet.be>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-tseng
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-tseng
 S:	Maintained
 
 xf86-video-v4l
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-v4l
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-v4l
 S:	Unmaintained
 
 xf86-video-vesa
-P:	Adam Jackson
-M:	ajax@nwnk.net
+M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa
 S:	Maintained
 
 xf86-video-vga
@@ -1119,48 +985,42 @@ xf86-video-via
 S:	Obsolete - use xf86-video-openchrome or xf86-video-unichrome instead
 
 xf86-video-vmware
-P:	VMware Linux Graphics Maintainer
-M:	linux-graphics-maintainer@vmware.com
+M:	VMware Linux Graphics Maintainer <linux-graphics-maintainer@vmware.com>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org/vmware
 S:	Maintained
 
 xf86-video-voodoo
-P:	Alan Cox
-M:	?
+M:	Alan Cox
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-voodoo
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-voodoo
 S:	Odd fixes
 
 xf86-video-wsfb
-P:	Matthieu Herrb
-M:	matthieu.herrb@laas.fr
+M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-wsfb
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-wsfb
 S:	Maintained
 
 xf86-video-xgi
-P:	Ian Romanick
-M:	?
+M:	Ian Romanick
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi
 S:	Maintained
 
 xf86-video-xgixp
-P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgixp
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgixp
 S:	Unmaintained
 
 Other modules
 -------------
 
 data/bitmaps, data/cursors, doc/*, fonts/*, util/*
-P:	?
-M:	xorg-devel@lists.x.org
+M:	?
 L:	xorg-devel@lists.x.org
-W:	https://gitlab.freedesktop.org/xorg/
+T:	https://gitlab.freedesktop.org/xorg/
 S:	Unmaintained
 
 xkbdata
@@ -1170,22 +1030,19 @@ Developer relations & services
 ------------------------------
 
 Mailing lists (lists.x.org)
-P:	?
 M:	mailman@lists.x.org
 L:	mailman@lists.x.org
 W:	https://lists.x.org/mailman/listinfo/
 S:	Maintained
 
 Website (www.x.org)
-P:	Stuart Anderson
-M:	anderson@netsweng.com
+M:	Stuart Anderson <anderson@netsweng.com>
 L:	xorg-devel@lists.x.org
 W:	https://www.x.org/
 S:	Maintained
 
 Supply of pastries, other food, beverages
-P:	Luc Verhaegen
-M:	libv@skynet.be
+M:	Luc Verhaegen <libv@skynet.be>
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
 S:	Disrepair