Modified directory structure

libuv · Aug 12, 2014 · 0fadaf7 · 0fadaf7
1 parent bf25f27
commit 0fadaf7
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-/_build/
+/build/
diff --git a/Makefile b/Makefile
@@ -5,7 +5,8 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = _build
+BUILDDIR      = build
+SRCDIR        = src
 
 # User-friendly check for sphinx-build
 ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
@@ -15,9 +16,9 @@ endif
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SRCDIR)
 # the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SRCDIR)
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
 

diff --git a/make.bat b/make.bat
@@ -5,9 +5,10 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-set I18NSPHINXOPTS=%SPHINXOPTS% .
+set BUILDDIR=build
+set SRCDIR=src
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% %SRCDIR%
+set I18NSPHINXOPTS=%SPHINXOPTS% %SRCDIR%
 if NOT "%PAPER%" == "" (
 	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
 	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%

diff --git a/async.rst → src/async.rst b/async.rst → src/async.rst
diff --git a/check.rst → src/check.rst b/check.rst → src/check.rst
diff --git a/conf.py → src/conf.py b/conf.py → src/conf.py
@@ -31,7 +31,7 @@
 extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -67,7 +67,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build', 'README.rst']
+exclude_patterns = []
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -117,17 +117,17 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = '_static/logo.png'
+html_logo = 'static/logo.png'
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = '_static/favicon.ico'
+html_favicon = 'static/favicon.ico'
 
 # 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']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied

diff --git a/design.rst → src/design.rst b/design.rst → src/design.rst
diff --git a/errors.rst → src/errors.rst b/errors.rst → src/errors.rst
diff --git a/handle.rst → src/handle.rst b/handle.rst → src/handle.rst
diff --git a/idle.rst → src/idle.rst b/idle.rst → src/idle.rst
diff --git a/index.rst → src/index.rst b/index.rst → src/index.rst
diff --git a/loop.rst → src/loop.rst b/loop.rst → src/loop.rst
diff --git a/poll.rst → src/poll.rst b/poll.rst → src/poll.rst
diff --git a/prepare.rst → src/prepare.rst b/prepare.rst → src/prepare.rst
diff --git a/_static/favicon.ico → src/static/favicon.ico b/_static/favicon.ico → src/static/favicon.ico
diff --git a/_static/logo.png → src/static/logo.png b/_static/logo.png → src/static/logo.png
diff --git a/timer.rst → src/timer.rst b/timer.rst → src/timer.rst