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

Backport of 69e2cd6fed from master.
This commit is contained in:
Mariusz Felisiak 2020-04-06 07:41:43 +02:00
parent 027840d7de
commit b0d810a77b
6 changed files with 14 additions and 1 deletions

View File

@ -12,10 +12,13 @@ topic guide </topics/auth/index>`.
``User`` model ``User`` model
============== ==============
.. class:: models.User
Fields Fields
------ ------
.. class:: models.User .. class:: models.User
:noindex:
:class:`~django.contrib.auth.models.User` objects have the following :class:`~django.contrib.auth.models.User` objects have the following
fields: fields:
@ -115,6 +118,7 @@ Attributes
---------- ----------
.. class:: models.User .. class:: models.User
:noindex:
.. attribute:: is_authenticated .. attribute:: is_authenticated
@ -140,6 +144,7 @@ Methods
------- -------
.. class:: models.User .. class:: models.User
:noindex:
.. method:: get_username() .. method:: get_username()
@ -332,6 +337,7 @@ Fields
fields: fields:
.. class:: models.Permission .. class:: models.Permission
:noindex:
.. attribute:: name .. attribute:: name
@ -363,6 +369,7 @@ Fields
:class:`~django.contrib.auth.models.Group` objects have the following fields: :class:`~django.contrib.auth.models.Group` objects have the following fields:
.. class:: models.Group .. class:: models.Group
:noindex:
.. attribute:: name .. attribute:: name

View File

@ -334,7 +334,7 @@ Lookup Type PostGIS Oracle MySQL [#]_ SpatiaLite
:lookup:`distance_lte` X X X X N :lookup:`distance_lte` X X X X N
:lookup:`dwithin` X X X B :lookup:`dwithin` X X X B
:lookup:`equals` X X X X C :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:`intersects` X X X X B
:lookup:`isvalid` X X X (≥ 5.7.5) X (LWGEOM) :lookup:`isvalid` X X X (≥ 5.7.5) X (LWGEOM)
:lookup:`overlaps` X X X X B :lookup:`overlaps` X X X X B

View File

@ -295,6 +295,7 @@ SpatiaLite ``Equals(poly, geom)``
========== ================================================= ========== =================================================
.. fieldlookup:: exact .. fieldlookup:: exact
:noindex:
.. fieldlookup:: same_as .. fieldlookup:: same_as
``exact``, ``same_as`` ``exact``, ``same_as``

View File

@ -209,6 +209,7 @@ the directories which were searched:
------------- -------------
.. django-admin:: runserver [addrport] .. django-admin:: runserver [addrport]
:noindex:
Overrides the core :djadmin:`runserver` command if the ``staticfiles`` app Overrides the core :djadmin:`runserver` command if the ``staticfiles`` app
is :setting:`installed<INSTALLED_APPS>` and adds automatic serving of static is :setting:`installed<INSTALLED_APPS>` and adds automatic serving of static

View File

@ -658,14 +658,17 @@ Usage example::
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~
.. class:: TruncHour(expression, output_field=None, tzinfo=None, **extra) .. class:: TruncHour(expression, output_field=None, tzinfo=None, **extra)
:noindex:
.. attribute:: kind = 'hour' .. attribute:: kind = 'hour'
.. class:: TruncMinute(expression, output_field=None, tzinfo=None, **extra) .. class:: TruncMinute(expression, output_field=None, tzinfo=None, **extra)
:noindex:
.. attribute:: kind = 'minute' .. attribute:: kind = 'minute'
.. class:: TruncSecond(expression, output_field=None, tzinfo=None, **extra) .. class:: TruncSecond(expression, output_field=None, tzinfo=None, **extra)
:noindex:
.. attribute:: kind = 'second' .. attribute:: kind = 'second'

View File

@ -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: admin to control access of the user to admin content:
.. class:: models.CustomUser .. class:: models.CustomUser
:noindex:
.. attribute:: is_staff .. attribute:: is_staff