update aliases map.

2 files changed, 20 insertions, 24 deletions

diff --git a/aliases b/aliases
index a7470423..d732f711 100644
--- a/aliases
+++ b/aliases
@@ -12,6 +12,7 @@ lohmaier+LibreOffice@googlemail.com cloph@openoffice.org
 Fischer<andre.f.fischer@oracle.com af@a-w-f.de
 andre.f.fischer@oracle.com af@a-w-f.de
 af@openoffice.org af@a-w-f.de
+af@apache.org af@a-w-f.de
 frank.schoenheit@oracle.com fs@openoffice.org
 frank.schoenheit@sun.com fs@openoffice.org
 libreoffice@mcmurrays.org smcmurray@mcmurrays.org
@@ -105,6 +106,7 @@ mb93783@v60x-so16.Germany.Sun.COM mb93783@macpro-dev
 mb93783@V60X-SO17.germany.sun.com mb93783@macpro-dev
 mb93783@X42-SO17.germany.sun.com mb93783@macpro-dev
 mb93783@so-dumbo mb93783@macpro-dev
+hdu@apache.org duerr@de.ibm.com
 duerr@sun.com duerr@de.ibm.com
 hdu@openoffice.org duerr@de.ibm.com
 herbert.duerr@oracle.com duerr@de.ibm.com
@@ -234,7 +236,9 @@ libreoffice@troy.rollo.name troy@troy.rollo.name
 alonso@loria.fr laurent.alonso@inria.fr
 julien@julienPC serval2412@yahoo.fr
 jsc@openoffice.org jogischmidt@googlemail.com
+jsc@apache.org jogischmidt@googlemail.com
 od@openoffice.org orwittmann@googlemail.com
+orw@apache.org orwittmann@googlemail.com
 elton@elton.tk elton@layerjet.com
 salessandri@cert.unlp.edu.ar salessandri@nasel.com.ar
 mikew@whiteley.org mike@whiteley.org
@@ -271,28 +275,17 @@ zolnaitamas2000@gamil.com zolniatamas@caesar.elte.hu
 "strubul@ubuntu.(none)" strubulis@gmail.com
 stanislav.horacek@google.com stanislav.horacek@gmail.com
 gswaminathan@kacst.edu.sa gokul.cdac@gmail.com
+regina@apache.org rb.henschel@t-online.de
+leiw@apache.org leiw@cn.ibm.com
+zhangjf@apache.org zhangjf@cn.ibm.com
+arist@apache.org andrew.rist@oracle.com
 
-# Aliases to cope with git svn data from Apache
-imacat@13f79535-47bb-0310-9956-ffa450edef68     imacat@mail.imacat.idv.tw
-maho@13f79535-47bb-0310-9956-ffa450edef68       chat95@mac.com
-rbircher@13f79535-47bb-0310-9956-ffa450edef68   r.bircher@gmx.ch
-robweir@13f79535-47bb-0310-9956-ffa450edef68    robert_weir@us.ibm.com
-rcweir@13f79535-47bb-0310-9956-ffa450edef68     robert_weir@us.ibm.com
-zhangjf@13f79535-47bb-0310-9956-ffa450edef68    zhangjf@cn.ibm.com
-leiw@13f79535-47bb-0310-9956-ffa450edef68       leiw@cn.ibm.com
-pescetti@13f79535-47bb-0310-9956-ffa450edef68   pescetti@apache.org
-jza@13f79535-47bb-0310-9956-ffa450edef68	jza@oooes.org
-ericb2@13f79535-47bb-0310-9956-ffa450edef68	ericb@openoffice.org
-paveljanik@13f79535-47bb-0310-9956-ffa450edef68 pavel@janik.cz
-orw@13f79535-47bb-0310-9956-ffa450edef68        orwittmann@googlemail.com
-mbauer@13f79535-47bb-0310-9956-ffa450edef68     mba@openoffice.org
-ydario@13f79535-47bb-0310-9956-ffa450edef68	mc6530@mclink.it
-af@13f79535-47bb-0310-9956-ffa450edef68         af@a-w-f.de
-alg@13f79535-47bb-0310-9956-ffa450edef68        armin.le.grand@me.com
-erack@13f79535-47bb-0310-9956-ffa450edef68      er@openoffice.org
-arielch@13f79535-47bb-0310-9956-ffa450edef68    ariel.constenla.haile@gmail.com
-jsc@13f79535-47bb-0310-9956-ffa450edef68        jogischmidt@googlemail.com
-mst@13f79535-47bb-0310-9956-ffa450edef68        mst@openoffice.org
-hdu@13f79535-47bb-0310-9956-ffa450edef68        duerr@de.ibm.com
-pfg@13f79535-47bb-0310-9956-ffa450edef68        giffunip@yahoo.com
-arist@13f79535-47bb-0310-9956-ffa450edef68      andrew.rist@oracle.com
+# Aliases to get affiliations right from Apache
+chengjh@apache.org chengjh@unknown.ibm.com
+liuzhe@apache.org liuzhe@unknown.ibm.com
+leidb@apache.org leidb@unknown.ibm.com
+wangzcdl@apache.org wangzcdl@unknown.ibm.com
+sunying@apache.org sunying@unknown.ibm.com
+bjcheny@apache.org bjcheny@unknown.ibm.com
+mayongl@apache.org mayongl@unknown.ibm.com
+lijiany@apache.org lijiany@unknown.ibm.com
diff --git a/domain-map b/domain-map
index 0c8bf511..3bfdec2a 100644
--- a/domain-map
+++ b/domain-map
@@ -23,6 +23,9 @@ kacst.edu.sa	KACST
 aentos.es	Aentos
 openismus.com   Openismus
 
+# we believe they're at IBM, but don't have their address
+unknown.ibm.com IBM
+
 #
 # These addresses are pre-normalised by aliases first ...
 #