Index: svnadmin/conf/access
===================================================================
--- svnadmin/conf/access	(revision 345786)
+++ svnadmin/conf/access	(revision 345787)
@@ -1,244 +1,226 @@
 # $FreeBSD$
 #
 # Please try to keep the handbook (contrib/chapter.sgml authors.ent
 # staff/chapter.sgml) in sync with this.
 #
 #	KEEP ALPHABETICALLY SORTED!!!
 #	KEEP ALPHABETICALLY SORTED!!!
 #	KEEP ALPHABETICALLY SORTED!!!
 #	KEEP ALPHABETICALLY SORTED!!!
 #
 # When adding a new committer to this file, please make sure to
 # include the following information in the commit message:
 #   (1) Who the commit bit was approved by ("Approved by: core").
 #   (2) The full name of the person.
 #   (3) In brief, what they will be working on (a couple of sentences).
 #
 # Changes to email forwards can be made without core's approval.  Please
 # use "Approved by: core (implicit)" to that type of commits.
 #
 achim
 adrian
 ae
 alc
-alfred
 allanjude
 ambrisko
 andreast
 andrew
 anish
 antoine
 araujo
 arichardson
 arybchik
 asomers
 avatar
 avg
 avos
-badger
 bapt
 bde
 bcran
 bdrewery
 benno
 br
 brd
 brooks
 brueffer
 bryanv
 bwidawsk
 bz
 cem
 chuck
 cognet
 cperciva
 cracauer
 csjp
 cy
 dab
 daichi
 davidcs
 dchagin
 def
-deischen
 delphij
 des
 dexuan
 dfr
 dim
 dteske
 dumbbell
 dwmalone	dwmalone=freebsd-committers@maths.tcd.ie
 eadler
 ed
 emaste
 emax
-eri
 erj
 eugen
 fabient
-fanf
 fsu
 gabor		devnull
 gad
 gallatin
 ganbold
 gavin
-gibbs
 gjb
 glebius
 gnn
 gonzo
 gordon
 grog
 gshapiro	freebsd-cvs-committers@g.gshapiro.net
 harti
 hiren
 hrs
 hselasky
 ian
 imp
-ivadasz
 jah
 jamie
 jasone
 jceel
 jch
 jchandra
 jeb
 jeff
 jhb
 jhibbits
 jilles
 jkim
 jlh
 jmallett
 jmcneill
 jmg
-jmmv
 joerg	freebsd-devel@uriah.heep.sax.de
 johalun
 jonathan
 jpaetzel
 jtl
 julian
-jwd
 kadesai
-kaiw
 kan
 karels
 ken
 kevans
 kevlo
 kib
 kibab
 kp
 landonf
 leitao
 lidl
 loos
 lstewart
-luigi
 luporl
 lwhsu
 mahrens
 manu
 marcel
 marius
 markj
 markm
 mav
 maxim
 mckusick
 melifaro
 mhorne
 miwi
 mizhka
 mjg
 mjoras
 mm
 mmacy
 mmel
 mp
 mr
 mw
 n_hibma	devnull
-neel
 netchild
 ngie
 np
 nwhitehorn
 nyan
 obrien
 oleg
 oshogbo
 peter	peter@wemm.org
 peterj
 pfg
 phil
 philip
 phk
 pho
 pjd
 pkelsey
 pluknet
 pstef
 qingli
 ram
 ray
 rgrimes
 rlibby
 rmacklem
 roberto
-rodrigc
 royger
 rpokala
 rrs
 rstone
 ru
 rwatson bb+lists.freebsd.cvs-committers@cyrus.watson.org
 sbruno
 scf
 schweikh
 scottl
 se
 sef
 sephe
 sgalabov
 shurd
 silby
 sjg
 skra
 slavash
 slm
 smh
 sobomax
-stas
 stevek
 syrinx
 takawata
 theraven
 thj
-thomas
-thompsa
 tijl
 tmunro
 trasz
 truckman
 tsoome
 tuexen
 tychon
 ume
 uqs
 vangyzen
 vmaffione
 whu
 will
 wma
 wosch
 wollman
 wulf
-yongari
 yuripv
-zbb
 zec
Index: svnadmin/conf/mentors
===================================================================
--- svnadmin/conf/mentors	(revision 345786)
+++ svnadmin/conf/mentors	(revision 345787)
@@ -1,38 +1,35 @@
 # $FreeBSD$
 
 # A list of current mentee login names and their mentors.  This list is not 
 # used for anything, but serves as a place to commit to in order to
 # "release" a mentee from mentorship since svn cannot do forced commits.
 
 # The full list of mentor->mentee relationships including historical
 # entries is in head/share/misc/committers-src.dot
 
 # Sort by mentee login name.
 
 # Mentee	Mentor		Optional comment
 achim		scottl		Co-mentor: emaste
 anish		jhb
 bcran		eadler
 brd		allanjude	Co-mentor: bapt
 def		pjd
-eri		ae		Co-mentor: thompsa
 gordon		delphij		Co-mentor: emaste
-ivadasz		adrian		Co-mentor: cognet
 jceel		trasz
 jkh		rwatson
-jwd		rmacklem
 kadesai		ken		Co-mentor: scottl, ambrisko
 leitao		jhibbits	Co-mentor: nwhitehorn
 mahrens		mckusick
 mhorne		markj
 miwi		araujo
 mjoras		rstone
 ngie		emaste		Co-mentor: jtl
 peterj		jhb		Co-mentor: grog
 ram		ken		Co-mentor: mav
 rgrimes		phk		Co-mentor: bde
 slavash		kib		Co-mentor: hselasky
 slm		ken		Co-mentor: scottl, ambrisko
 thj		jtl		Co-mentor: bz
 tmunro		mjg		Co-mentor: allanjude
 wosch		cem