2 files changed, 21 insertions, 2 deletions
diff --git a/docs/ref/exceptions.txt b/docs/ref/exceptions.txt
index 947815b7fe..a42bdafb7f 100644
--- a/docs/ref/exceptions.txt
+++ b/docs/ref/exceptions.txt
@@ -25,7 +25,7 @@ ObjectDoesNotExist and DoesNotExist
     exception that is provided on every model class as a way of
     identifying the specific type of object that could not be found.
 
-    See :meth:`~django.db.models.QuerySet.get()` for further information
+    See :meth:`~django.db.models.query.QuerySet.get()` for further information
     on :exc:`ObjectDoesNotExist` and :exc:`DoesNotExist`.
 
 MultipleObjectsReturned
@@ -38,7 +38,7 @@ MultipleObjectsReturned
     class contains a subclassed version that can be used to identify the
     specific object type that has returned multiple objects.
 
-    See :meth:`~django.db.models.QuerySet.get()` for further information.
+    See :meth:`~django.db.models.query.QuerySet.get()` for further information.
 
 SuspiciousOperation
 -------------------
@@ -133,6 +133,17 @@ Specification v2.0`_ for further information.
 
 .. _`PEP 249 - Python Database API Specification v2.0`: http://www.python.org/dev/peps/pep-0249/
 
+.. currentmodule:: django.db.transaction
+
+Transaction Exceptions
+======================
+
+.. exception:: TransactionManagementError
+
+    The :exc:`TransactionManagementError` is raised for any and all problems
+    related to database transactions. It is available from
+    :mod:`django.db.transaction`.
+
 Python Exceptions
 =================
 
diff --git a/docs/ref/generic-views.txt b/docs/ref/generic-views.txt
index 0a589f0bd4..54114d07a6 100644
--- a/docs/ref/generic-views.txt
+++ b/docs/ref/generic-views.txt
@@ -29,6 +29,8 @@ Most generic views require the ``queryset`` key, which is a ``QuerySet``
 instance; see :doc:`/topics/db/queries` for more information about ``QuerySet``
 objects.
 
+.. module:: django.views.generic.simple
+
 "Simple" generic views
 ======================
 
@@ -146,6 +148,8 @@ string is written as ``"%7Ejacob/"`` (with only a single ``%``), an exception wo
         ('^bar/$', redirect_to, {'url': '%%7Ejacob.'}),
     )
 
+.. module:: django.views.generic.date_based
+
 Date-based generic views
 ========================
 
@@ -677,6 +681,8 @@ In addition to ``extra_context``, the template's context will be:
       ``template_object_name`` is ``'foo'``, this variable's name will be
       ``foo``.
 
+.. module:: django.views.generic.list_detail
+
 List/detail generic views
 =========================
 
@@ -862,6 +868,8 @@ In addition to ``extra_context``, the template's context will be:
       ``template_object_name`` is ``'foo'``, this variable's name will be
       ``foo``.
 
+.. module:: django.views.generic.create_update
+
 Create/update/delete generic views
 ==================================