[2.2.x] Fixed Sphinx warnings on duplicate object descriptions.

Backport of 69e2cd6fed40f3ecf767609b80ad31f288446e48 from master.

6 files changed, 14 insertions, 1 deletions

diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt
index 7be5b55ee3..3e30cb2241 100644
--- a/docs/ref/contrib/auth.txt
+++ b/docs/ref/contrib/auth.txt
@@ -12,10 +12,13 @@ topic guide </topics/auth/index>`.
 ``User`` model
 ==============
 
+.. class:: models.User
+
 Fields
 ------
 
 .. class:: models.User
+    :noindex:
 
     :class:`~django.contrib.auth.models.User` objects have the following
     fields:
@@ -115,6 +118,7 @@ Attributes
 ----------
 
 .. class:: models.User
+    :noindex:
 
     .. attribute:: is_authenticated
 
@@ -140,6 +144,7 @@ Methods
 -------
 
 .. class:: models.User
+    :noindex:
 
     .. method:: get_username()
 
@@ -332,6 +337,7 @@ Fields
 fields:
 
 .. class:: models.Permission
+    :noindex:
 
     .. attribute:: name
 
@@ -363,6 +369,7 @@ Fields
 :class:`~django.contrib.auth.models.Group` objects have the following fields:
 
 .. class:: models.Group
+    :noindex:
 
     .. attribute:: name
 
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index 329ea78dfb..3861a48f3e 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -334,7 +334,7 @@ Lookup Type                        PostGIS    Oracle    MySQL [#]_   SpatiaLite
 :lookup:`distance_lte`             X          X         X            X          N
 :lookup:`dwithin`                  X          X                      X          B
 :lookup:`equals`                   X          X         X            X          C
-:lookup:`exact`                    X          X         X            X          B
+:lookup:`exact <same_as>`          X          X         X            X          B
 :lookup:`intersects`               X          X         X            X          B
 :lookup:`isvalid`                  X          X         X (≥ 5.7.5)  X (LWGEOM)
 :lookup:`overlaps`                 X          X         X            X          B
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 38e9fec133..d03fd7621c 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -295,6 +295,7 @@ SpatiaLite  ``Equals(poly, geom)``
 ==========  =================================================
 
 .. fieldlookup:: exact
+    :noindex:
 .. fieldlookup:: same_as
 
 ``exact``, ``same_as``
diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index 9da8f6eb4e..00665fe1a2 100644
--- a/docs/ref/contrib/staticfiles.txt
+++ b/docs/ref/contrib/staticfiles.txt
@@ -209,6 +209,7 @@ the directories which were searched:
 -------------
 
 .. django-admin:: runserver [addrport]
+    :noindex:
 
 Overrides the core :djadmin:`runserver` command if the ``staticfiles`` app
 is :setting:`installed<INSTALLED_APPS>` and adds automatic serving of static
diff --git a/docs/ref/models/database-functions.txt b/docs/ref/models/database-functions.txt
index deb559362d..1b66827005 100644
--- a/docs/ref/models/database-functions.txt
+++ b/docs/ref/models/database-functions.txt
@@ -658,14 +658,17 @@ Usage example::
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. class:: TruncHour(expression, output_field=None, tzinfo=None, **extra)
+    :noindex:
 
     .. attribute:: kind = 'hour'
 
 .. class:: TruncMinute(expression, output_field=None, tzinfo=None, **extra)
+    :noindex:
 
     .. attribute:: kind = 'minute'
 
 .. class:: TruncSecond(expression, output_field=None, tzinfo=None, **extra)
+    :noindex:
 
     .. attribute:: kind = 'second'
 
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
index ce4c1c9edf..d6b5effcf6 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -846,6 +846,7 @@ must define some additional attributes and methods. These methods allow the
 admin to control access of the user to admin content:
 
 .. class:: models.CustomUser
+    :noindex:
 
 .. attribute:: is_staff