Merge pull request #6050 from jenshnielsen/fixfavicon

mdboom · mdboom · commit 7c4faf6c7941 · 2016-02-29T12:00:45.000-05:00
Correct link to favicon
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -169,8 +169,6 @@ <h3>We're updating the default styles for Matplotlib 2.0</h3>
 
 {% block relbar1 %}
 
-<link rel="shortcut icon" href="/_static/favicon.ico">
-
 <!-- The "Fork me on github" ribbon -->
 <img style="float: right; margin-bottom: -40px; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" usemap="#ribbonmap"/>
 <map name="ribbonmap">
diff --git a/doc/conf.py b/doc/conf.py
@@ -213,6 +213,8 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Matplotlibdoc'
 
+# Path to favicon
+html_favicon = '_static/favicon.ico'
 
 # Options for LaTeX output
 # ------------------------
