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

Pylons · Mar 28, 2012 · a5a00c3 · a5a00c3
2 parents 70c4287 + 35b7f4e
commit a5a00c3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ pyramid_zodbconn/coverage.xml
 env26/
 env27/
 env25/
+docs/_build/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "docs/_themes"]
+	path = docs/_themes
+	url = git://github.com/Pylons/pylons_sphinx_theme.git
diff --git a/docs/.gitignore b/docs/.gitignore
diff --git 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
@@ -85,4 +85,4 @@ epub:
 	@echo "Build finished. The epub file is in _build/epub."
 
 _themes:
-	git clone git://github.com/Pylons/pylons_sphinx_theme.git _themes
+	cd ..; git submodule update --init; cd docs
diff --git a/docs/_themes b/docs/_themes
diff --git a/rtd.txt b/rtd.txt
@@ -0,0 +1 @@
+repoze.sphinx.autointerface