summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorcguardia <carlos.delaguardia@gmail.com>2011-04-19 02:06:38 -0500
committercguardia <carlos.delaguardia@gmail.com>2011-04-19 02:06:38 -0500
commit9906d9b33c237bfabc16e9db2499f1ea7c0deae5 (patch)
tree9f23431ba2a41af064511cf56a80f385a51f6d2d /docs
parent9c0b0adf505444831704879a00f299ad74837284 (diff)
parentf2d5cb59deba682d7c1d461ab5e90ba1802d42ac (diff)
downloadpyramid-9906d9b33c237bfabc16e9db2499f1ea7c0deae5.tar.gz
pyramid-9906d9b33c237bfabc16e9db2499f1ea7c0deae5.tar.bz2
pyramid-9906d9b33c237bfabc16e9db2499f1ea7c0deae5.zip
Merge branch 'master' of github.com:cguardia/pyramid
Diffstat (limited to 'docs')
-rw-r--r--docs/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/Makefile b/docs/Makefile
index 3fbf56d0a..21e91d114 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -25,7 +25,7 @@ help:
clean:
-rm -rf _build/*
-html: _themes
+html: theme
mkdir -p _build/html _build/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
@echo
@@ -47,7 +47,7 @@ pickle:
web: pickle
-htmlhelp: _themes
+htmlhelp: theme
mkdir -p _build/htmlhelp _build/doctrees
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
@echo
@@ -84,6 +84,5 @@ epub:
@echo
@echo "Build finished. The epub file is in _build/epub."
-_themes:
- git submodule init
- git submodule update
+theme:
+ cd ..;git submodule update --init;cd docs