Permalink
Browse files

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

  • Loading branch information...
2 parents b71f03f + 824b499 commit 52cface18027e740c2778de0deea23d2454dbd6f @mcdonc mcdonc committed Jul 22, 2011
Showing with 11 additions and 6 deletions.
  1. +3 −1 CONTRIBUTORS.txt
  2. +4 −1 docs/Makefile
  3. +4 −4 docs/conf.py
View
@@ -106,4 +106,6 @@ her name.
Contributors
------------
-Chris McDonough, 2010/11/08
+- Chris McDonough, 2010/11/08
+
+- Tres Seaver, 2010/11/09
View
@@ -25,7 +25,7 @@ help:
clean:
-rm -rf _build/*
-html:
+html: _themes
mkdir -p _build/html _build/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
@echo
@@ -68,3 +68,6 @@ linkcheck:
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in _build/linkcheck/output.txt."
+
+_themes:
+ git clone git://github.com/Pylons/pylons_sphinx_theme.git _themes
View
@@ -40,10 +40,10 @@
]
# Looks for bfg's objects
-intersphinx_mapping = {'http://docs.pylonshq.com/pyramid/dev': None}
+intersphinx_mapping = {'http://docs.pylonsproject.org/projects/pyramid/dev': None}
# Add any paths that contain templates here, relative to this directory.
-templates_path = ['.templates']
+templates_path = ['_templates']
# The suffix of source filenames.
source_suffix = '.rst'
@@ -93,7 +93,7 @@
#show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+#pygments_style = 'sphinx'
# Options for HTML output
@@ -102,7 +102,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

0 comments on commit 52cface

Please sign in to comment.