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

6 files changed, 13 insertions, 15 deletions

diff --git a/docs/.gitignore b/docs/.gitignore
index da7abd0c0..30d731d4a 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,4 +1,3 @@
-_themes
 _build
 
 
diff --git a/docs/Makefile b/docs/Makefile
index bb381fc53..e4a325022 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -25,7 +25,7 @@ help:
 clean:
 	-rm -rf _build/*
 
-html:
+html: _themes
 	mkdir -p _build/html _build/doctrees
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
 	@echo
@@ -47,7 +47,7 @@ pickle:
 
 web: pickle
 
-htmlhelp:
+htmlhelp: _themes
 	mkdir -p _build/htmlhelp _build/doctrees
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
 	@echo
@@ -84,3 +84,5 @@ epub:
 	@echo
 	@echo "Build finished. The epub file is in _build/epub."
 
+_themes:
+	git submodule update --init
diff --git a/docs/_themes b/docs/_themes
new file mode 160000
+Subproject f59f7bfce5259f50fbb67b9040c03ecb080130b
diff --git a/docs/conf.py b/docs/conf.py
index 21843933c..80ee0d2e5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -133,18 +133,15 @@ if 'sphinx-build' in ' '.join(sys.argv): # protect against dumb importers
     from subprocess import call, Popen, PIPE
 
     p = Popen('which git', shell=True, stdout=PIPE)
-    git = p.stdout.read().strip()
+
     cwd = os.getcwd()
     _themes = os.path.join(cwd, '_themes')
-
-    if not os.path.isdir(_themes):
-        call([git, 'clone', 'git://github.com/Pylons/pylons_sphinx_theme.git',
-                '_themes'])
+    p = Popen('which git', shell=True, stdout=PIPE)
+    git = p.stdout.read().strip()
+    if not os.listdir(_themes):
+        call([git, 'submodule', '--init'])
     else:
-        os.chdir(_themes)
-        call([git, 'checkout', 'master'])
-        call([git, 'pull'])
-        os.chdir(cwd)
+        call([git, 'submodule', 'update'])
 
     sys.path.append(os.path.abspath('_themes'))
 
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index 9cb4db325..2949dc808 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -282,7 +282,7 @@ Pyramid application, and they want to customize the configuration of this
 application without hacking its code "from outside", they can "include" a
 configuration function from the package and override only some of its
 configuration statements within the code that does the include.  No conflicts
-will be generated by configuration statements within the code which does the
+will be generated by configuration statements within the code that does the
 including, even if configuration statements in the included code would
 conflict if it was moved "up" to the calling code.
 
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 9b3a63089..b5fa6a9f7 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -534,14 +534,14 @@ Configuration extensibility
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Unlike other systems, Pyramid provides a structured "include" mechanism (see
-:meth:`~pyramid.config.Configurator.include`) that allows you to compose
+:meth:`~pyramid.config.Configurator.include`) that allows you to combine
 applications from multiple Python packages.  All the configuration statements
 that can be performed in your "main" Pyramid application can also be
 performed by included packages including the addition of views, routes,
 subscribers, and even authentication and authorization policies. You can even
 extend or override an existing application by including another application's
 configuration in your own, overriding or adding new views and routes to
-it.  This has the potential to allow you to compose a big application out of
+it.  This has the potential to allow you to create a big application out of
 many other smaller ones.  For example, if you want to reuse an existing
 application that already has a bunch of routes, you can just use the
 ``include`` statement with a ``route_prefix``; the new application will live