Merge branch 'master' of github.com:lericson/pylibmc

lericson · Oct 10, 2015 · 23520ea · 23520ea
2 parents 27e0406 + 480ee7b
commit 23520ea
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/docs/_themes/sap/layout.html b/docs/_themes/sap/layout.html
@@ -1,3 +1,3 @@
-{% extends "default/layout.html" %}
+{% extends "classic/layout.html" %}
 
 {%- block relbar2 %}<!-- I hate crud -->{% endblock %}
diff --git a/docs/_themes/sap/static/main.css_t b/docs/_themes/sap/static/main.css_t
@@ -9,7 +9,7 @@
  *
  */
 
-@import url("default.css");
+@import url("classic.css");
 
 /* -- page layout ----------------------------------------------------------- */
 

diff --git a/docs/_themes/sap/theme.conf b/docs/_themes/sap/theme.conf
@@ -1,5 +1,5 @@
 [theme]
-inherit = default
+inherit = classic
 stylesheet = main.css
 pygments_style = sphinx
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -34,7 +34,7 @@
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '1.3'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
      *
      */
-    @import url("default.css");
+    @import url("classic.css");
     /* -- page layout ----------------------------------------------------------- */
@@ Expand Down @@