binarymatt · TylerLubeck · Oct 23, 2015
diff --git a/docs/source/class.rst b/docs/source/class.rst
@@ -1,28 +0,0 @@
-.. module:: pyres
-
-ResQ Classes
-==========================================
-
-.. autoclass:: pyres.ResQ
-	:members:
-
-Job Classes
-=================
-
-.. autoclass:: pyres.job.Job
-    :members:
-
-Worker Classes
-=================
-
-.. autoclass:: pyres.worker.Worker
-	:members:
-
-Failure Classes
-=================
-
-.. autoclass:: pyres.failure.base.BaseBackend
-	:members:
-
-.. autoclass:: pyres.failure.RedisBackend
-	:members:

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -32,7 +32,7 @@
 
 # The encoding of source files.
 #source_encoding = 'utf-8'
-
+autoclass_content = 'both'
 # The master toctree document.
 master_doc = 'index'
 

diff --git a/docs/source/failure_example.rst b/docs/source/failure_example.rst
@@ -0,0 +1,18 @@
+Failure Example
+===============
+
+Pyres provides a ``BaseBackend`` for handling failed jobs. You can subclass
+this backend to store failed jobs in any system you like.
+
+Currently, the only provided backend is a ``RedisBackend`` which will store
+your failed jobs into a special *failed* queue for later processing or
+reenqueueing.
+
+Here's a simple example::
+
+	>>> from pyres import failure
+	>>> from pyres.job import Job
+	>>> from pyres import ResQ
+	>>> r = ResQ()
+	>>> job = Job.reserve('basic', r)
+	>>> job.fail('problem')
diff --git a/docs/source/failures.rst b/docs/source/failures.rst
@@ -1,18 +1,16 @@
-Failures
-===============
+.. module:: pyres
 
-Pyres provides a ``BaseBackend`` for handling failed jobs. You can subclass
-this backend to store failed jobs in any system you like.
+Failure Classes
+=================
 
-Currently, the only provided backend is a ``RedisBackend`` which will store
-your failed jobs into a special *failed* queue for later processing or
-reenqueueing.
+.. autoclass:: pyres.failure.base.BaseBackend
+    :members:
+
+.. autoclass:: pyres.failure.redis.RedisBackend
+	:members:
 
-Here's a simple example::
+.. autoclass:: pyres.failure.multiple.MultipleBackend
+    :members:
 
-	>>> from pyres import failure
-	>>> from pyres.job import Job
-	>>> from pyres import ResQ
-	>>> r = ResQ()
-	>>> job = Job.reserve('basic', r)
-	>>> job.fail('problem')
+.. autoclass:: pyres.failure.mail.MailBackend
+    :members:
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -9,15 +9,18 @@ Welcome to pyres's documentation!
 Contents:
 
 .. toctree::
-	:maxdepth: 2
-
-	intro
-	install
-	example
-	class
-	tests
-	failures
-	horde
+    :maxdepth: 2
+
+    intro
+    install
+    example
+    resq
+    job
+    workers
+    failures
+    failure_example
+    tests
+    horde
 
 
 Indices and tables

diff --git a/docs/source/job.rst b/docs/source/job.rst
@@ -0,0 +1,7 @@
+.. module:: pyres
+
+Job Classes
+=================
+
+.. autoclass:: pyres.job.Job
+    :members:
diff --git a/docs/source/resq.rst b/docs/source/resq.rst
@@ -0,0 +1,7 @@
+.. module:: pyres
+
+The ResQ Class
+==========================================
+
+.. autoclass:: pyres.ResQ
+	:members:
diff --git a/docs/source/workers.rst b/docs/source/workers.rst
@@ -0,0 +1,7 @@
+.. module:: pyres
+
+Worker Classes
+=================
+
+.. autoclass:: pyres.worker.Worker
+	:members: