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

Chris McDonough

2012-09-16 03aa118b259e1e94b60a45995488ae15120c25a0

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

 docs/Makefile

@@ -25,7 +25,7 @@
clean:
    -rm -rf _build/*

html: _themes
html: themes
    mkdir -p _build/html _build/doctrees
    $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
    @echo
@@ -47,7 +47,7 @@

web: pickle

htmlhelp: _themes
htmlhelp: themes
    mkdir -p _build/htmlhelp _build/doctrees
    $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
    @echo
@@ -85,4 +85,4 @@
    @echo "Build finished. The epub file is in _build/epub."

_themes:
    git submodule update --init
    cd ..; git submodule update --init --recursive; cd docs;