diff options
| author | Chris McDonough <chrism@plope.com> | 2011-04-27 02:22:29 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-04-27 02:22:29 -0400 |
| commit | b2613a3d8cb16695eb1c465a7cfe5a722942287d (patch) | |
| tree | 7e2942cdd21f497339c3ed5275e1c6e16a800ee6 /docs | |
| parent | 7e655f50decd44ae9118700e5d00d668bab6788c (diff) | |
| parent | 10b8a7120f35497bfea83d2ade2c2915c96861d4 (diff) | |
| download | pyramid-b2613a3d8cb16695eb1c465a7cfe5a722942287d.tar.gz pyramid-b2613a3d8cb16695eb1c465a7cfe5a722942287d.tar.bz2 pyramid-b2613a3d8cb16695eb1c465a7cfe5a722942287d.zip | |
Merge branch 'cguardia-master' into pviews
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/.gitignore | 1 | ||||
| -rw-r--r-- | docs/Makefile | 8 | ||||
| m--------- | docs/_themes | 0 |
3 files changed, 4 insertions, 5 deletions
diff --git a/docs/.gitignore b/docs/.gitignore index 1e9e0413c..d4e11e5ea 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,3 +1,2 @@ _build -_themes diff --git a/docs/Makefile b/docs/Makefile index 1d032cf45..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,5 +84,5 @@ epub: @echo @echo "Build finished. The epub file is in _build/epub." -_themes: - git clone git://github.com/Pylons/pylons_sphinx_theme.git _themes +theme: + cd ..;git submodule update --init;cd docs diff --git a/docs/_themes b/docs/_themes new file mode 160000 +Subproject 53898ec579a1c31e8780824c0a255eca004e0e5 |