diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index a8a257aa88..d158f274b8 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -17,9 +17,6 @@ GeoDjango currently provides the following spatial database backends:
 * ``django.contrib.gis.db.backends.oracle``
 * ``django.contrib.gis.db.backends.spatialite``
 
-.. module:: django.contrib.gis.db.models
-    :synopsis: GeoDjango's database API.
-
 .. _mysql-spatial-limitations:
 
 MySQL Spatial Limitations
@@ -354,12 +351,11 @@ Lookup Type                        PostGIS    Oracle    MySQL [#]_   SpatiaLite
 Database functions
 ------------------
 
-.. module:: django.contrib.gis.db.models.functions
-    :synopsis: GeoDjango's database functions.
-
 The following table provides a summary of what geography-specific database
 functions are available on each spatial backend.
 
+.. currentmodule:: django.contrib.gis.db.models.functions
+
 ====================================  =======  ==============  ===========  ==========
 Function                              PostGIS  Oracle          MySQL        SpatiaLite
 ====================================  =======  ==============  ===========  ==========
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index 627de6edc9..62df23c7dc 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -380,9 +380,7 @@ details.
 CSRF protection middleware
 --------------------------
 
-.. module:: django.middleware.csrf
-   :synopsis: Middleware adding protection against Cross Site Request
-              Forgeries.
+.. currentmodule:: django.middleware.csrf
 
 .. class:: CsrfViewMiddleware
 
@@ -393,8 +391,7 @@ fields to POST forms and checking requests for the correct value. See the
 ``X-Frame-Options`` middleware
 ------------------------------
 
-.. module:: django.middleware.clickjacking
-   :synopsis: Clickjacking protection
+.. currentmodule:: django.middleware.clickjacking
 
 .. class:: XFrameOptionsMiddleware
 
diff --git a/docs/topics/forms/formsets.txt b/docs/topics/forms/formsets.txt
index ddc97db3e5..84635457ff 100644
--- a/docs/topics/forms/formsets.txt
+++ b/docs/topics/forms/formsets.txt
@@ -2,8 +2,7 @@
 Formsets
 ========
 
-.. module:: django.forms.formsets
-    :synopsis: An abstraction for working with multiple forms on the same page.
+.. currentmodule:: django.forms.formsets
 
 .. class:: BaseFormSet
 
diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt
index 4073bc6e27..2a13c2d1df 100644
--- a/docs/topics/forms/modelforms.txt
+++ b/docs/topics/forms/modelforms.txt
@@ -2,9 +2,6 @@
 Creating forms from models
 ==========================
 
-.. module:: django.forms.models
-   :synopsis: ModelForm and ModelFormset.
-
 .. currentmodule:: django.forms
 
 ``ModelForm``
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index 6e906bf80e..7432c7b3ff 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -2,7 +2,7 @@
 Translation
 ===========
 
-.. module:: django.utils.translation
+.. currentmodule:: django.utils.translation
 
 Overview
 ========