Less nesting of doc sources.

mozilla · Jun 4, 2012 · 5b1ef82 · 5b1ef82
1 parent 53b8a9a
commit 5b1ef82
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 *.pyc
 htmlcov/
 datazilla/settings/local.py
-docs/build/
-build/
+docs/_build/
diff --git a/docs/Makefile b/docs/Makefile
@@ -5,14 +5,14 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = build
+BUILDDIR      = _build
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
 

diff --git a/docs/source/architecture.rst → docs/architecture.rst b/docs/source/architecture.rst → docs/architecture.rst
diff --git a/docs/source/conf.py → docs/conf.py b/docs/source/conf.py → docs/conf.py
@@ -120,7 +120,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

diff --git a/docs/source/img/datasource.png → docs/img/datasource.png b/docs/source/img/datasource.png → docs/img/datasource.png
diff --git a/docs/source/index.rst → docs/index.rst b/docs/source/index.rst → docs/index.rst
diff --git a/docs/source/installation.rst → docs/installation.rst b/docs/source/installation.rst → docs/installation.rst
diff --git a/docs/source/tests.rst → docs/tests.rst b/docs/source/tests.rst → docs/tests.rst