From 925a3eb50d5213f0da78eea9b6002178fdf6f722 Mon Sep 17 00:00:00 2001
From: Erik Tollerud <erik.tollerud@gmail.com>
Date: Wed, 21 Oct 2020 13:25:50 -0400
Subject: [PATCH] update numbers/names/mailmap for 4.1 release

---
 .mailmap              |  8 +++++---
 docs/credits.rst      |  2 +-
 docs/whatsnew/4.1.rst | 10 +++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.mailmap b/.mailmap
index 53f275d6cf8e..244e5684c841 100644
--- a/.mailmap
+++ b/.mailmap
@@ -81,14 +81,16 @@ Derek Homeier                <dhomeie@gwdg.de> <derek.homeier@ens-lyon.fr>
 Douglas Burke                <dburke.gw@gmail.com>
 Dylan Gregersen              <gregersen.dylan@gmail.com>
 Edward Gomez                 <edward@gomez.me.uk>
+Ed Slavich                   <eslavich@stsci.edu>
+Ed Slavich                   <eslavich@users.noreply.github.com>
 Elijah Bernstein-Cooper      <e.bernsteincooper@gmail.com> <ezbc@astro.wisc.edu>
 Emily Deibert                <emilydeibert@gmail.com>
 Emma Hogan                   <ehogan@gemini.edu>
 Eric Depagne                 <eric@depagne.org>
 Eric Koch                    <koch.eric.w@gmail.com> <koch.eric.w@gmail.com>
-Erik M. Bray                 <erik.m.bray@gmail.com>
-Erik M. Bray                 <erik.m.bray@gmail.com> <embray@stsci.edu>
-Erik M. Bray                 <erik.m.bray@gmail.com> <erik.bray@lri.fr>
+E. Madison Bray              <erik.m.bray@gmail.com>
+E. Madison Bray              <erik.m.bray@gmail.com> <embray@stsci.edu>
+E. Madison Bray              <erik.m.bray@gmail.com> <erik.bray@lri.fr>
 Esteban Pardo Sánchez        <stbnps@users.noreply.github.com>
 Francesco Montesano          <franz.bergesund@gmail.com>
 Geert Barentsen              <geert@barentsen.be> <hello@geert.io>
diff --git a/docs/credits.rst b/docs/credits.rst
index ca372e7cf4a9..52c1071c81bd 100644
--- a/docs/credits.rst
+++ b/docs/credits.rst
@@ -116,7 +116,7 @@ Core Package Contributors
 * Eric Depagne
 * Eric Jeschke
 * Eric Koch
-* Erik M. Bray
+* E. Madison Bray
 * Erik Tollerud
 * Erin Allard
 * Esteban Pardo Sánchez
diff --git a/docs/whatsnew/4.1.rst b/docs/whatsnew/4.1.rst
index af2689820ef5..872879ec20de 100644
--- a/docs/whatsnew/4.1.rst
+++ b/docs/whatsnew/4.1.rst
@@ -30,9 +30,9 @@ In addition to these major changes, Astropy v4.0 includes a large number of
 smaller improvements and bug fixes, which are described in the
 :ref:`changelog`. By the numbers:
 
-* 211 issues have been closed since v4.0
-* 275 pull requests have been merged since v4.0
-* 62 distinct people have contributed code to this release, 25 of which are first time contributors to Astropy
+* 381 issues have been closed since v4.0
+* 511 pull requests have been merged since v4.0
+* 66 distinct people have contributed code to this release, 23 of which are first time contributors to Astropy
 
 .. _whatsnew-4.1-spectralcoord:
 
@@ -305,6 +305,7 @@ The people who have contributed to the code for this release are:
 .. hlist::
   :columns: 4
 
+  * Adam Ginsburg
   * Adrian Price-Whelan
   * Albert Y. Shih
   * Alex Conley
@@ -322,9 +323,11 @@ The people who have contributed to the code for this release are:
   * Clare Shanahan
   * Dan Foreman-Mackey
   * Daniel Ruschel Dutra  *
+  * David Shupe
   * David Stansby
   * Derek Homeier
   * Ed Slavich  *
+  * Erik M. Bray
   * Erik Tollerud
   * Erin Allard  *
   * Gabriel Perren  *
@@ -341,6 +344,7 @@ The people who have contributed to the code for this release are:
   * M S R Dinesh  *
   * Manodeep Sinha  *
   * Marten van Kerkwijk
+  * Matthew Craig
   * Max Voronkov  *
   * Maximilian Nöthe
   * Michael Lindner-D'Addario  *