; * .mailmap: Update some entries.

diff --git a/.mailmap b/.mailmap
index f14f086b2e5e9075286f0b94329e0eb2b4d999ac..5d80e4aa082127b4edeed02e35c066b11f572159 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,7 @@ Andrew G Cohen <cohen@andy.bu.edu> <cohen@bu.edu>
 Arash Esbati <arash@gnu.org> <arash.esbati@gmail.com>
 Arash Esbati <arash@gnu.org> <esbati@gmx.de>
 Artur Malabarba <bruce.connor.am@gmail.com> <am12548@it055607.users.bris.ac.uk>
+Artur Malabarba <bruce.connor.am@gmail.com> Artur Malabarba <address@hidden>
 Bastien Guerry <bzg@gnu.org>
 Bastien Guerry <bzg@gnu.org> <bastien1@free.fr>
 Bastien Guerry <bzg@gnu.org> <bzg@altern.org>
@@ -60,7 +61,7 @@ Era Eriksson <era+emacs@iki.fi> <era+emacsbugs@iki.fi>
 Eric Ludlam <zappo@gnu.org>
 Eric Ludlam <zappo@gnu.org> <eric@siege-engine.com>
 Eric Ludlam <zappo@gnu.org> <ericludlam@gmail.com>
-Eric S. Raymond <esr@thyrsus.com>
+Eric S. Raymond <esr@thyrsus.com> <esr@snark.thyrsus.com>
 Etienne Prud’homme <e.e.f.prudhomme@gmail.com>
 Fabián Ezequiel Gallina <fgallina@gnu.org> <fgallina@cuca>
 Fabián Ezequiel Gallina <fgallina@gnu.org> <galli.87@gmail.com>
@@ -89,6 +90,7 @@ Joakim Verona <joakim@verona.se> <root@exodia.verona.se>
 John Wiegley <johnw@newartisans.com> <jwiegley@gmail.com>
 Jose A. Ortega Ruiz <jao@gnu.org>
 João Távora <joaotavora@gmail.com>
+João Távora <joaotavora@gmail.com> <capitaomorte@archlinux2022.linuxvmimages.local>
 Julien Danjou <julien@danjou.info> <jd@dex.adm.naquadah.org>
 Julien Danjou <julien@danjou.info> Julien Danjou <jd@abydos>
 Juri Linkov <juri@linkov.net> <juri@jurta.org>
@@ -121,6 +123,7 @@ Masatake YAMATO <yamato@redhat.com> <jet@gyve.org>
 Matt Armstrong <matt@rfc20.org> <marmstrong@google.com>
 Matt Armstrong <matt@rfc20.org> <matt@mdeb>
 Mattias Engdegård <mattiase@acm.org>
+Mattias Engdegård <mattiase@acm.org> <mattias.engdegard@gmail.com>
 Maxim Nikulin <manikulin@gmail.com>
 Michael Albinus <michael.albinus@gmx.de> <albinus@detlef>
 Michalis V <mvar.40k@gmail.com>
@@ -189,6 +192,7 @@ Wolfgang Scherer <wolfgang.scherer@gmx.de> <Wolfgang.Scherer@gmx.de>
 Xi Lu <lx@shellcodes.org>
 Xue Fuqiao <xfq.free@gmail.com> <xfq@gnu.org>
 Yilkal Argaw <yilkalargawworkneh@gmail.com>
+Yuan Fu <casouri@gmail.com> <yuan@debian-BULLSEYE-live-builder-AMD64>
 Yuuki Harano <masm+github@masm11.me> <masm@masm11.ddo.jp>
 Óscar Fuentes <ofv@wanadoo.es>
 İ. Göktuğ Kayaalp <self@gkayaalp.com>