diff --git a/.gitignore b/.gitignore
index e77bc182dab0..ef24f928c811 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,13 +67,13 @@ doc/tutorials
 doc/modules
 doc/pyplots/tex_demo.png
 lib/dateutil
+examples/*/*.eps
 examples/*/*.pdf
 examples/*/*.png
 examples/*/*.svg
-examples/*/*.eps
 examples/*/*.svgz
 examples/tests/*
-!examples/tests/backend_driver.py
+!examples/tests/backend_driver_sgskip.py
 result_images
 
 # Nose/Pytest generated files #
diff --git a/doc/_templates/autosummary.rst b/doc/_templates/autosummary.rst
index 7d8860edd311..80c7004c40c4 100644
--- a/doc/_templates/autosummary.rst
+++ b/doc/_templates/autosummary.rst
@@ -1,4 +1,4 @@
-{{ fullname | escape | underline}}
+{{ fullname | escape | underline }}
 
 
 .. currentmodule:: {{ module }}
@@ -27,4 +27,4 @@
     <div class="clearer"></div>
 
 {% endif %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/lib/mpl_toolkits/axes_grid1/inset_locator.py b/lib/mpl_toolkits/axes_grid1/inset_locator.py
index 91ec3aa63f2e..d458bc0e5e0d 100644
--- a/lib/mpl_toolkits/axes_grid1/inset_locator.py
+++ b/lib/mpl_toolkits/axes_grid1/inset_locator.py
@@ -400,8 +400,8 @@ def inset_axes(parent_axes, width, height, loc='upper right',
     creates in inset axes in the lower left corner of *parent_axes* which spans
     over 30%% in height and 40%% in width of the *parent_axes*. Since the usage
     of `.inset_axes` may become slightly tricky when exceeding such standard
-    cases, it is recommended to read
-    :ref:`the examples <sphx_glr_gallery_axes_grid1_inset_locator_demo.py>`.
+    cases, it is recommended to read :doc:`the examples
+    </gallery/axes_grid1/inset_locator_demo>`.
 
     Notes
     -----
@@ -540,7 +540,7 @@ def zoomed_inset_axes(parent_axes, zoom, loc='upper right',
                       borderpad=0.5):
     """
     Create an anchored inset axes by scaling a parent axes. For usage, also see
-    :ref:`the examples <sphx_glr_gallery_axes_grid1_inset_locator_demo2.py>`.
+    :doc:`the examples </gallery/axes_grid1/inset_locator_demo2>`.
 
     Parameters
     ----------