Merge pull request #387 from effigies/update_docs

DOC: Update docs from 2.0.2 release

Brings `master` docs into line with those generated in the process of releasing 2.0.2.

Author: matthew-brett

.mailmap

@@ -29,3 +29,5 @@ Basile Pinsard <[email protected]> bpinsard <[email protected]>
 Nguyen, Ly <[email protected]> lxn2 <[email protected]>
 Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
 Chris Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
+Chris Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
+Chris Markiewicz <[email protected]> Chris Johnson <[email protected]>

Changelog

@@ -34,6 +34,19 @@ References like "pr/298" refer to github pull request numbers.
     are raising a DataError if the track is truncated when ``strict=True``
     (the default), rather than a TypeError when trying to create the points
     array.
+
+* 2.0.2 (Monday 23 November 2015)
+
+  * Fix for integer overflow on large images (pr/325) (MB);
+  * Fix for Freesurfer nifti files with unusual dimensions (pr/332) (Chris
+    Markiewicz);
+  * Fix typos on benchmarks and tests (pr/336, pr/340, pr/347) (Chris
+    Markiewicz);
+  * Fix Windows install script (pr/339) (MB);
+  * Support for Python 3.5 (pr/363) (MB) and numpy 1.10 (pr/358) (Chris
+    Markiewicz);
+  * Update pydicom imports to permit version 1.0 (pr/379) (Chris Markiewicz);
+  * Workaround for Python 3.5.0 gzip regression (pr/383) (Ben Cipollini).
   * tripwire.TripWire object now raises subclass of AttributeError when trying
     to get an attribute, rather than a direct subclass of Exception.  This
     prevents Python 3.5 triggering the tripwire when doing inspection prior to

doc/source/devel/make_release.rst

@@ -132,9 +132,7 @@ Release checklist
 
 * Check the documentation doctests::
 
-    cd doc
-    make doctest
-    cd ..
+    make -C doc doctest
 
   This should also be tested by `nibabel on travis`_.
 

doc/source/index.rst

@@ -47,7 +47,7 @@ contributed code and discussion (in rough order of appearance):
 * Bago Amirbekian
 * Brendan Moloney
 * Félix C. Morency
-* Chris Johnson
+* Chris Markiewicz
 * JB Poline
 * Nolan Nichols
 * Nguyen, Ly
@@ -61,8 +61,7 @@ contributed code and discussion (in rough order of appearance):
 * Demian Wassermann
 * Philippe Gervais
 * Justin Lecher
-* Ben Cippolini
-* Chris Markiewicz
+* `Ben Cipollini`_
 * Clemens C. C. Bauer
 
 License reprise

doc/source/links_names.txt

@@ -5,7 +5,7 @@
    and name substitutions.  It may be included in many files,
    therefore it should only contain link targets and name
    substitutions.  Try grepping for "^\.\. _" to find plausible
-   candidates for this list.  
+   candidates for this list.
 
 
 .. NOTE: reST targets are
@@ -233,6 +233,7 @@
 .. _Michael Hanke: http://mih.voxindeserto.de
 .. _Gaël Varoquaux: http://gael-varoquaux.info/
 .. _Stephan Gerhard: http://www.unidesign.ch
+.. _Ben Cipollini: http://bcipolli.github.io/
 
 .. Substitutions
 .. |emdash| unicode:: U+02014

nibabel/info.py

@@ -69,7 +69,7 @@
 =======
 
 Current documentation on nibabel can always be found at the `NIPY nibabel
-website <https://nipy.github.io/nibabel>`_.
+website <http://nipy.org/nibabel>`_.
 
 Mailing Lists
 =============
@@ -90,7 +90,7 @@
 * Downloads of all `available releases`_.
 
 .. _main repository: https://github.com/nipy/nibabel
-.. _Documentation: https://nipy.github.io/nibabel
+.. _Documentation: http://nipy.org/nibabel
 .. _current release: https://pypi.python.org/pypi/nibabel
 .. _current development version: https://github.com/nipy/nibabel/archive/master.zip
 .. _available releases: https://github.com/nipy/nibabel/releases
@@ -109,16 +109,17 @@
 
 # Main setup parameters
 NAME                = 'nibabel'
-MAINTAINER          = "Matthew Brett, Michael Hanke and Eric Larson"
-MAINTAINER_EMAIL    = "[email protected]"
+MAINTAINER          = "Matthew Brett, Michael Hanke, Eric Larson, " \
+                      "Chris Markiewicz"
+MAINTAINER_EMAIL    = "[email protected]"
 DESCRIPTION         = description
 LONG_DESCRIPTION    = long_description
-URL                 = "https://nipy.github.io/nibabel"
+URL                 = "http://nipy.org/nibabel"
 DOWNLOAD_URL        = "https://github.com/nipy/nibabel"
 LICENSE             = "MIT license"
 CLASSIFIERS         = CLASSIFIERS
 AUTHOR              = "Matthew Brett, Michael Hanke, Stephan Gerhard"
-AUTHOR_EMAIL        = "nipy-devel@neuroimaging.scipy.org"
+AUTHOR_EMAIL        = "neuroimaging@python.org"
 PLATFORMS           = "OS Independent"
 MAJOR               = _version_major
 MINOR               = _version_minor