Fixed an indentation issue with 'matplotlibrc.template' and reverted a comment in 'test_image.test_image_composite_alpha()' to the 'composite_image' terminology.

Author: breedlun

lib/matplotlib/tests/test_image.py

@@ -262,7 +262,7 @@ def test_image_composite_background():
 def test_image_composite_alpha():
     """
     Tests that the alpha value is recognized and correctly applied in the
-    process of combining images together.
+    process of compositing images together.
     """
     fig = plt.figure()
     ax = fig.add_subplot(111)

matplotlibrc.template

@@ -359,7 +359,7 @@ backend      : %(backend)s
 #image.origin : upper             # lower | upper
 #image.resample  : False
 #image.composite_image : True     # When True, all the images on a set of axes are 
-								  # combined into a single composite image before 
+                                  # combined into a single composite image before 
                                   # saving a figure as a vector graphics file, 
                                   # such as a PDF.