doc: update mailmap and deduplicate AUTHORS entry

Trott · Trott · commit 499f693b20a1 · 2021-07-15T07:16:42.000-07:00
PR-URL: #39391 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
diff --git a/.mailmap b/.mailmap
@@ -162,6 +162,8 @@ Hendrik Schwalm <mail@hendrikschwalm.de> hschwalm <mail@hendrikschwalm.de>
 Hitesh Kanwathirtha <hiteshk@microsoft.com> <digitalinfinity@gmail.com>
 Henry Chin <hheennrryy@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
+himself65 <himself65@mask.io> <himself6565@gmail.com>
+himself65 <himself65@mask.io> <himself65@outlook.com>
 Icer Liang <liangshuangde@163.com> <wizicer@users.noreply.github.com>
 Igor Savin <iselwin@gmail.com> kibertoad <iselwin@gmail.com>
 Igor Soarez <igorsoarez@gmail.com>
diff --git a/AUTHORS b/AUTHORS
@@ -2682,7 +2682,7 @@ Alexander Sattelmaier <alexander.sattelmaier@gmail.com>
 Avi ד <avi.the.coder@gmail.com>
 Thomas <hakerh403@gmail.com>
 Aymen Naghmouchi <aymen.aymen@live.it>
-himself65 <himself6565@gmail.com>
+himself65 <himself65@mask.io>
 Geir Hauge <geir.hauge@gmail.com>
 Patrick Gansterer <paroga@paroga.com>
 Nicolas Moteau <nicolas.moteau@orange.com>
@@ -2740,7 +2740,6 @@ Alba Mendez <me@alba.sh>
 zero1five <zerodengyin@gmail.com>
 Gaelan <gbs@canishe.com>
 Jacob <jacobq@gmail.com>
-himself65 <himself65@outlook.com>
 Dan Beglin <dbeglinuk@gmail.com>
 Anish Asrani <anishasrani@gmail.com>
 teams2ua <teams2ua@gmail.com>

-Original file line number
+Diff line change
 Hitesh Kanwathirtha <[email protected]> <[email protected]>
 Henry Chin <[email protected]>
 Herbert Vojčík <[email protected]>
 +himself65 <[email protected]> <[email protected]>
 +himself65 <[email protected]> <[email protected]>
 Icer Liang <[email protected]> <[email protected]>
 Igor Savin <[email protected]> kibertoad <[email protected]>
 Igor Soarez <[email protected]>
-Original file line number
+Diff line change
 Avi ד <[email protected]>
 Thomas <[email protected]>
 Aymen Naghmouchi <[email protected]>
 -himself65 <[email protected]>
 +himself65 <[email protected]>
 Geir Hauge <[email protected]>
 Patrick Gansterer <[email protected]>
 Nicolas Moteau <[email protected]>
 zero1five <[email protected]>
 Gaelan <[email protected]>
 Jacob <[email protected]>
 -himself65 <[email protected]>
 Dan Beglin <[email protected]>
 Anish Asrani <[email protected]>
 teams2ua <[email protected]>