DOC: fixes suggested by Marc-Alexandre

Fixing some typos and stray text, and a little extra rephrasing on top.

Author: matthew-brett

nibabel/testing/np_features.py

@@ -5,7 +5,7 @@
 
 
 def _memmap_after_ufunc():
-    """ Return True if memmap arrays always return memmap from ufuncs
+    """ Return True if ufuncs on memmap arrays always return memmap arrays
 
     This should be True for numpy < 1.12, False otherwise.
     """
@@ -15,5 +15,5 @@ def _memmap_after_ufunc():
     return mm_preserved
 
 
-# True if ufunc on memmap retuns a memmap
+# True if ufunc on memmap always returns a memmap
 VIRAL_MEMMAP = _memmap_after_ufunc()

nibabel/tests/test_spatialimages.py

@@ -342,7 +342,7 @@ class MmapImageMixin(object):
     check_mmap_mode = True
 
     def get_disk_image(self):
-        """ Return an image and an image filname, and scaling bool to test against
+        """ Return image, image filename, and flag for required scaling
 
         Subclasses can do anything to return an image, including loading a
         pre-existing image from disk.
@@ -351,12 +351,10 @@ def get_disk_image(self):
         -------
         img : class:`SpatialImage` instance
         fname : str
-            Image filename
+            Image filename.
         has_scaling : bool
             True if the image array has scaling to apply to the raw image array
             data, False otherwise.
-
-        Notes
         """
         img_klass = self.image_class
         shape = (3, 4, 2)