diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-15 23:24:58 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-15 23:24:58 -0400 |
| commit | 03aa118b259e1e94b60a45995488ae15120c25a0 (patch) | |
| tree | 21610aff52b8bc5fa94d51652697519ef63f8439 /docs | |
| parent | 54d3e3ecf8929f90373669b9682b9db3b4ce3290 (diff) | |
| parent | 6f5401a470f51c372eb6f996592487fdd2a4bb03 (diff) | |
| download | pyramid-03aa118b259e1e94b60a45995488ae15120c25a0.tar.gz pyramid-03aa118b259e1e94b60a45995488ae15120c25a0.tar.bz2 pyramid-03aa118b259e1e94b60a45995488ae15120c25a0.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/Makefile b/docs/Makefile index e4a325022..a66f93d60 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -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 @@ -47,7 +47,7 @@ pickle: web: pickle -htmlhelp: _themes +htmlhelp: themes mkdir -p _build/htmlhelp _build/doctrees $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp @echo @@ -85,4 +85,4 @@ epub: @echo "Build finished. The epub file is in _build/epub." _themes: - git submodule update --init + cd ..; git submodule update --init --recursive; cd docs; |