Permalink
Browse files

Merge branch 'master' of github.com:Pylons/pyramid_jinja2

  • Loading branch information...
2 parents 596f063 + 40e7fc3 commit a67d90950ea09595f217bcf84122fc2a4394b6c9 @mcdonc mcdonc committed Jan 18, 2011
Showing with 5 additions and 5 deletions.
  1. +1 −1 docs/Makefile
  2. +4 −4 docs/conf.py
View
@@ -25,7 +25,7 @@ help:
clean:
-rm -rf _build/*
-html: _themes/
+html: _themes
mkdir -p _build/html _build/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
@echo
View
@@ -48,7 +48,7 @@
# General substitutions.
project = 'pyramid_jinja2'
-copyright = '2010, Agendaless Consulting <chrism@plope.com>'
+copyright = '2011, Agendaless Consulting <chrism@plope.com>'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
@@ -87,7 +87,7 @@
#show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+#pygments_style = 'sphinx'
# Options for HTML output
@@ -96,7 +96,7 @@
# Add and use Pylons theme
sys.path.append(os.path.abspath('_themes'))
html_theme_path = ['_themes']
-html_theme = 'pylons'
+html_theme = 'pyramid'
# The style sheet to use for HTML and HTML Help pages. A file of that name
# must exist either in Sphinx' static/ path, or in one of the custom paths
@@ -124,7 +124,7 @@
# here, relative to this directory. They are copied after the builtin
# static files, so a file named "default.css" will overwrite the builtin
# "default.css".
-html_static_path = ['.static']
+html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page
# bottom, using the given strftime format.

0 comments on commit a67d909

Please sign in to comment.