Merge "Move docs to doc."

2012-06-14 13:55:59 +00:00 · 2012-06-14 13:55:59 +00:00 · 9be5803993
commit 9be5803993
parent 6a8302b532 77e5ce57fd
6 changed files with 6 additions and 6 deletions
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,5 +1,5 @@
 include AUTHORS
 include LICENSE
 include README.rst
-recursive-include docs *
+recursive-include doc *
 recursive-include tests *
--- a/README.rst
+++ b/README.rst
@ -101,7 +101,7 @@ Building Contributor Documentation

 This documentation is written by contributors, for contributors.

-The source is maintained in the ``docs/source`` folder using
+The source is maintained in the ``doc/source`` folder using
 `reStructuredText`_ and built by `Sphinx`_

 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
@ -115,7 +115,7 @@ The source is maintained in the ``docs/source`` folder using

    $ export DJANGO_SETTINGS_MODULE=local.local_settings
    $ python doc/generate_autodoc_index.py
-    $ sphinx-build -b html docs/source build/sphinx/html
+    $ sphinx-build -b html doc/source build/sphinx/html

 Results are in the `build/sphinx/html` directory

--- a/docs/Makefile
+++ b/docs/Makefile
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
--- a/setup.cfg
+++ b/setup.cfg
@ -7,9 +7,9 @@ verbosity=2
 detailed-errors=1

 [build_sphinx]
-source-dir = docs/
-build-dir = docs/_build
+source-dir = doc/source
+build-dir = doc/build
 all_files = 1

 [upload_sphinx]
-upload-dir = docs/_build/html
+upload-dir = doc/build/html