Merge remote-tracking branch 'matplotlib/v2.x'

jenshnielsen · jenshnielsen · commit 7ba5c1fd5fe4 · 2016-06-15T16:51:50.000+01:00
diff --git a/doc/users/customizing.rst b/doc/users/customizing.rst
@@ -70,8 +70,8 @@ locations, in the following order:
 
 4. :file:`{INSTALL}/matplotlib/mpl-data/matplotlibrc`, where
    :file:`{INSTALL}` is something like
-   :file:`/usr/lib/python2.5/site-packages` on Linux, and maybe
-   :file:`C:\\Python25\\Lib\\site-packages` on Windows. Every time you
+   :file:`/usr/lib/python3.5/site-packages` on Linux, and maybe
+   :file:`C:\\Python35\\Lib\\site-packages` on Windows. Every time you
    install matplotlib, this file will be overwritten, so if you want
    your customizations to be saved, please move this file to your
    user-specific matplotlib directory.
@@ -94,4 +94,4 @@ A sample matplotlibrc file
 
     `(download) <../_static/matplotlibrc>`__
 
-.. literalinclude:: ../../lib/matplotlib/mpl-data/matplotlibrc
+.. literalinclude:: ../_static/matplotlibrc
diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py
@@ -200,7 +200,6 @@
     'masked_demo.py',
     'mathtext_demo.py',
     'mathtext_examples.py',
-    'matplotlib_icon.py',
     'matshow.py',
     'mri_demo.py',
     'mri_with_eeg.py',
