Merge trunk and apply some sphinx love.

3 files changed, 7 insertions, 1 deletions

diff --git a/doc/source/_templates/layout.html b/doc/source/_ga/layout.html
index 0b72a77ac..0b72a77ac 100644
--- a/doc/source/_templates/layout.html
+++ b/doc/source/_ga/layout.html
diff --git a/doc/source/_templates/.DS_Store b/doc/source/_templates/.DS_Store
new file mode 100644
index 000000000..5008ddfcf
--- /dev/null
+++ b/doc/source/_templates/.DS_Store
diff --git a/doc/source/conf.py b/doc/source/conf.py
index e91860536..27bc4ea6c 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -27,7 +27,13 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.todo',
 todo_include_todos = True
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+# Changing the path so that the Hudson build output contains GA code and the source
+# docs do not contain the code so local, offline sphinx builds are "clean."
+templates_path = []
+if os.getenv('HUDSON_PUBLISH_DOCS'):
+  templates_path = ['_ga', '_templates']
+else:
+  templates_path = ['_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'