Merge remote-tracking branch 'origin/master'

Conflicts:
	sass/theme.sass
	sphinx_rtd_theme/layout.html

sass/_theme_rst.sass

@@ -26,7 +26,7 @@
     text-align: center
 
   // Usually it's a good idea to give images some space.
-  .section > img
+  .section > img,   .section > a > img
     margin-bottom: $base-line-height
   // Questionable whether this is nice or not. It styles eternal links, but comes with some baggage.
   // a.reference.external:after

sphinx_rtd_theme/footer.html

@@ -28,5 +28,6 @@
     </p>
   </div>
 
-  {% trans %}<a href="https://github.com/snide/sphinx_rtd_theme">Sphinx theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}
+  {% trans %}Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}.
+  
 </footer>

sphinx_rtd_theme/layout.html

@@ -88,13 +88,15 @@
       </div>
 
       <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-        {% set toctree = toctree(maxdepth=2, collapse=False, includehidden=True) %}
+        {% block menu %}
-        {% if toctree %}
+          {% set toctree = toctree(maxdepth=2, collapse=False, includehidden=True) %}
-            {{ toctree }}
+          {% if toctree %}
-        {% else %}
+              {{ toctree }}
-            <!-- Local TOC -->
+          {% else %}
-            <div class="local-toc">{{ toc }}</div>
+              <!-- Local TOC -->
-        {% endif %}
+              <div class="local-toc">{{ toc }}</div>
+          {% endif %}
+        {% endblock %}
       </div>
       &nbsp;
     </nav>

sphinx_rtd_theme/searchbox.html

@@ -1,7 +1,9 @@
+{%- if builder != 'singlehtml' %}
 <div role="search">
-  <form id ="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
+  <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
     <input type="text" name="q" placeholder="Search docs" />
     <input type="hidden" name="check_keywords" value="yes" />
     <input type="hidden" name="area" value="default" />
   </form>
 </div>
+{%- endif %}