Merge remote-tracking branch 'upstream/maint/2.4.x'

Author: effigies

.mailmap

@@ -42,6 +42,7 @@ Konstantinos Raktivan <constracti@gmail.com> constracti <constracti@gmail.com>
 Krish Subramaniam <krish.subramaniam@gmail.com> Krish Subramaniam <krish@monster.nmr.mgh.harvard.edu>
 Marc-Alexandre Côté <marc.cote.19@gmail.com> Marc-Alexandre Cote <marc.cote.19@gmail.com>
 Mathias Goncalves <mathiasg@mit.edu> mathiasg <mathiasg@mit.edu>
+Matthew Cieslak <mattcieslak@gmail.com> Matt Cieslak <mattcieslak@gmail.com>
 Michael Hanke <michael.hanke@gmail.com> <mhanke-guest@82381867-18eb-0310-98a2-9474e637aba2>
 Michael Hanke <michael.hanke@gmail.com> <michaelhanke@mvpa1.dartmouth.edu>
 Ly Nguyen <nguyen60@seattleu.edu> lxn2 <lxn2@uw.edu>

.zenodo.json

@@ -213,7 +213,9 @@
       "orcid": "0000-0001-6313-0580"
     },
     {
-      "name": "Cieslak, Matt"
+      "affiliation": "Department of Neuropsychiatry, University of Pennsylvania",
+      "name": "Cieslak, Matthew",
+      "orcid": "0000-0002-1931-4734"
     },
     {
       "name": "Moreno, Miguel Estevan"

Changelog

@@ -21,7 +21,7 @@ Nibabel releases
 Most work on NiBabel so far has been by Matthew Brett (MB), Chris Markiewicz
 (CM), Michael Hanke (MH), Marc-Alexandre Côté (MC), Ben Cipollini (BC), Paul
 McCarthy (PM), Chris Cheng (CC), Yaroslav Halchenko (YOH), Satra Ghosh (SG),
-Eric Larson (EL), Demien Wasserman, and Stephan Gerhard.
+Eric Larson (EL), Demian Wassermann, and Stephan Gerhard.
 
 References like "pr/298" refer to github pull request numbers.
 
@@ -31,7 +31,7 @@ References like "pr/298" refer to github pull request numbers.
 New features
 ------------
 * Alternative ``Axis``-based interface for manipulating CIFTI-2 headers
-  (pr/641) (Michiel Cottaar, reviewed by Demien Wasserman, CM, SG)
+  (pr/641) (Michiel Cottaar, reviewed by Demian Wassermann, CM, SG)
 
 Enhancements
 ------------
@@ -232,7 +232,7 @@ Maintenance
 New features
 ------------
 
-* CIFTI support (pr/249) (SG, Michiel Cottaar, BC, CM, Demian Wasserman, MB)
+* CIFTI support (pr/249) (SG, Michiel Cottaar, BC, CM, Demian Wassermann, MB)
 * Support for MRtrix TCK streamlines file format (pr/486) (MC, reviewed by
   MB, Arnaud Bore, J-Donald Tournier, Jean-Christophe Houde)
 * Added ``get_fdata()`` as default method to retrieve scaled floating point

doc-requirements.txt

@@ -1,7 +1,7 @@
 # Requirements for building docs
 -r requirements.txt
-# Sphinx >= 1.6 breaks the math_dollar extension
-sphinx<=1.5.6
+sphinx
 numpydoc
 texext
 matplotlib>=1.3
+mock

doc/source/_templates/reggie.html

@@ -0,0 +1 @@
+<p><img src="{{ pathto('_static/reggie.png',1) }}" alt="Reggie -- the one" /></p>

doc/source/conf.py

@@ -201,7 +201,7 @@
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {'index': 'indexsidebar.html'}
+html_sidebars = {'index': ['localtoc.html', 'relations.html', 'sourcelink.html', 'indexsidebar.html', 'searchbox.html', 'reggie.html']}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.