summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-04-16 17:46:24 -0400
committerSteve Piercy <web@stevepiercy.com>2015-04-16 17:46:24 -0400
commit090a8c273e6cdb3699ddf0f2710dcfa3dac92236 (patch)
tree8f9cd99ec0a618460355532e74829418b2aeba5c
parent7a35ed928f15892b86142a69feb865ab93370334 (diff)
parentcc443a4678298188d4b0a178540118ef3b123291 (diff)
downloadpyramid-090a8c273e6cdb3699ddf0f2710dcfa3dac92236.tar.gz
pyramid-090a8c273e6cdb3699ddf0f2710dcfa3dac92236.tar.bz2
pyramid-090a8c273e6cdb3699ddf0f2710dcfa3dac92236.zip
Merge pull request #1636 from stevepiercy/master
replace git submodule with new pylons-sphinx-themes package
-rw-r--r--.gitmodules3
-rw-r--r--docs/Makefile6
m---------docs/_themes0
3 files changed, 2 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 45397942b..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "docs/_themes"]
- path = docs/_themes
- url = git://github.com/Pylons/pylons_sphinx_theme.git
diff --git a/docs/Makefile b/docs/Makefile
index 12dc88bf8..2f83fbe06 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -25,7 +25,7 @@ help:
clean:
-rm -rf _build/*
-html: themes
+html:
mkdir -p _build/html _build/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
@echo
@@ -47,7 +47,7 @@ pickle:
web: pickle
-htmlhelp: themes
+htmlhelp:
mkdir -p _build/htmlhelp _build/doctrees
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
@echo
@@ -89,5 +89,3 @@ epub:
@echo
@echo "Build finished. The epub file is in _build/epub."
-themes:
- cd ..; git submodule update --init --recursive; cd docs;
diff --git a/docs/_themes b/docs/_themes
deleted file mode 160000
-Subproject 382cba80fbd6a7424818d17ec63ca520e485f10