Use sphinx_celery to manage Sphinx

.gitignore

@@ -7,9 +7,9 @@ dist/
 *.egg-info
 *.egg
 *.egg/
-doc/__build/*
 build/
 .build/
+_build/
 pip-log.txt
 .directory
 erl_crash.dump

CONTRIBUTING.rst

@@ -457,7 +457,7 @@ dependencies, so install these next:
     $ pip install -U -r requirements/default.txt
 
 After installing the dependencies required, you can now execute
-the test suite by calling ``nosetests``:
+the test suite by calling ``nosetests <nose>``:
 ::
 
     $ nosetests
@@ -472,7 +472,7 @@ Some useful options to ``nosetests`` are:
 
     Don't capture output
 
-* ``--nologcapture``
+* ``-nologcapture``
 
     Don't capture log output.
 
@@ -543,8 +543,7 @@ To run the tests for all supported Python versions simply execute:
 
     $ tox
 
-If you only want to test specific Python versions use the ``-e``
-option:
+Use the ``tox -e`` option if you only want to test specific Python versions:
 ::
 
     $ tox -e 2.7
@@ -563,11 +562,11 @@ build the docs by running:
 ::
 
     $ cd docs
-    $ rm -rf .build
+    $ rm -rf _build
     $ make html
 
 Make sure there are no errors or warnings in the build output.
-After building succeeds the documentation is available at ``.build/html``.
+After building succeeds the documentation is available at ``_build/html``.
 
 .. _contributing-verify:
 
@@ -1058,7 +1057,8 @@ and make a new version tag:
 Releasing
 ---------
 
-Commands to make a new public stable release::
+Commands to make a new public stable release:
+::
 
     $ make distcheck  # checks pep8, autodoc index, runs tests and more
     $ make dist  # NOTE: Runs git clean -xdf and removes files not in the repo.

Makefile

@@ -1,7 +1,7 @@
 PROJ=celery
 PYTHON=python
 SPHINX_DIR="docs/"
-SPHINX_BUILDDIR="${SPHINX_DIR}/.build"
+SPHINX_BUILDDIR="${SPHINX_DIR}/_build"
 README="README.rst"
 CONTRIBUTING="CONTRIBUTING.rst"
 CONFIGREF_SRC="docs/configuration.rst"

README.rst

@@ -215,11 +215,13 @@ Installation
 You can install Celery either via the Python Package Index (PyPI)
 or from source.
 
-To install using `pip`,::
+To install using `pip`,:
+::
 
     $ pip install -U Celery
 
-To install using `easy_install`,::
+To install using `easy_install`,:
+::
 
     $ easy_install -U Celery
 
@@ -330,7 +332,8 @@ Downloading and installing from source
 Download the latest version of Celery from
 http://pypi.python.org/pypi/celery/
 
-You can install it by doing the following,::
+You can install it by doing the following,:
+::
 
     $ tar xvfz celery-0.0.0.tar.gz
     $ cd celery-0.0.0
@@ -349,15 +352,17 @@ With pip
 ~~~~~~~~
 
 The Celery development version also requires the development
-versions of ``kombu``, ``amqp`` and ``billiard``.
+versions of ``kombu``, ``amqp``, ``billiard`` and ``vine``.
 
 You can install the latest snapshot of these using the following
-pip commands::
+pip commands:
+::
 
     $ pip install https://github.com/celery/celery/zipball/master#egg=celery
     $ pip install https://github.com/celery/billiard/zipball/master#egg=billiard
     $ pip install https://github.com/celery/py-amqp/zipball/master#egg=amqp
     $ pip install https://github.com/celery/kombu/zipball/master#egg=kombu
+    $ pip install https://github.com/celery/vine/zipball/master#egg=vine
 
 With git
 ~~~~~~~~