Skip to content

Commit b0d810a

Browse files
committed
[2.2.x] Fixed Sphinx warnings on duplicate object descriptions.
Backport of 69e2cd6 from master.
1 parent 027840d commit b0d810a

File tree

6 files changed

+14
-1
lines changed

6 files changed

+14
-1
lines changed

docs/ref/contrib/auth.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ topic guide </topics/auth/index>`.
1212
``User`` model
1313
==============
1414

15+
.. class:: models.User
16+
1517
Fields
1618
------
1719

1820
.. class:: models.User
21+
:noindex:
1922

2023
:class:`~django.contrib.auth.models.User` objects have the following
2124
fields:
@@ -115,6 +118,7 @@ Attributes
115118
----------
116119

117120
.. class:: models.User
121+
:noindex:
118122

119123
.. attribute:: is_authenticated
120124

@@ -140,6 +144,7 @@ Methods
140144
-------
141145

142146
.. class:: models.User
147+
:noindex:
143148

144149
.. method:: get_username()
145150

@@ -332,6 +337,7 @@ Fields
332337
fields:
333338

334339
.. class:: models.Permission
340+
:noindex:
335341

336342
.. attribute:: name
337343

@@ -363,6 +369,7 @@ Fields
363369
:class:`~django.contrib.auth.models.Group` objects have the following fields:
364370

365371
.. class:: models.Group
372+
:noindex:
366373

367374
.. attribute:: name
368375

docs/ref/contrib/gis/db-api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ Lookup Type PostGIS Oracle MySQL [#]_ SpatiaLite
334334
:lookup:`distance_lte` X X X X N
335335
:lookup:`dwithin` X X X B
336336
:lookup:`equals` X X X X C
337-
:lookup:`exact` X X X X B
337+
:lookup:`exact <same_as>` X X X X B
338338
:lookup:`intersects` X X X X B
339339
:lookup:`isvalid` X X X (≥ 5.7.5) X (LWGEOM)
340340
:lookup:`overlaps` X X X X B

docs/ref/contrib/gis/geoquerysets.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ SpatiaLite ``Equals(poly, geom)``
295295
========== =================================================
296296

297297
.. fieldlookup:: exact
298+
:noindex:
298299
.. fieldlookup:: same_as
299300

300301
``exact``, ``same_as``

docs/ref/contrib/staticfiles.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ the directories which were searched:
209209
-------------
210210

211211
.. django-admin:: runserver [addrport]
212+
:noindex:
212213

213214
Overrides the core :djadmin:`runserver` command if the ``staticfiles`` app
214215
is :setting:`installed<INSTALLED_APPS>` and adds automatic serving of static

docs/ref/models/database-functions.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,14 +658,17 @@ Usage example::
658658
~~~~~~~~~~~~~~~~~~~~~~~~
659659

660660
.. class:: TruncHour(expression, output_field=None, tzinfo=None, **extra)
661+
:noindex:
661662

662663
.. attribute:: kind = 'hour'
663664

664665
.. class:: TruncMinute(expression, output_field=None, tzinfo=None, **extra)
666+
:noindex:
665667

666668
.. attribute:: kind = 'minute'
667669

668670
.. class:: TruncSecond(expression, output_field=None, tzinfo=None, **extra)
671+
:noindex:
669672

670673
.. attribute:: kind = 'second'
671674

docs/topics/auth/customizing.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,7 @@ must define some additional attributes and methods. These methods allow the
846846
admin to control access of the user to admin content:
847847

848848
.. class:: models.CustomUser
849+
:noindex:
849850

850851
.. attribute:: is_staff
851852

0 commit comments

Comments
 (0)