Merge pull request #11088 from matplotlib/auto-backport-of-pr-10211

jklymak · web-flow · commit 0fe8e1e3109b · 2018-04-19T07:04:34.000-07:00
Backport PR #10211 on branch v2.2.2-doc
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -237,13 +237,16 @@ <h3>{{ _('Navigation') }}</h3>
 endtrans %}
       {%- endif %}
     {%- endif %}
+        <br />
     {%- if last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated
-}}.{% endtrans %}
+      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
     {%- endif %}
     {%- if show_sphinx %}
-      {% trans sphinx_version=sphinx_version|e %}Created using <a
-href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
+	{% trans sphinx_version=sphinx_version|e %}Created using
+	<ahref="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
+    {%- endif %}
+    {%- if sha %}
+	Doc version {{ sha }}.
     {%- endif %}
     </div>
  {%- endblock %}
diff --git a/doc/conf.py b/doc/conf.py
@@ -152,11 +152,18 @@ def _check_deps():
 master_doc = 'contents'
 
 # General substitutions.
+from matplotlib.compat.subprocess import check_output
+SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
+
+html_context = {'sha': SHA}
+
 project = 'Matplotlib'
 copyright = ('2002 - 2012 John Hunter, Darren Dale, Eric Firing, '
              'Michael Droettboom and the Matplotlib development '
              'team; 2012 - 2018 The Matplotlib development team')
 
+
+
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
 #
