From 255f3f77d293e76273fd978e4728f8e2204fc9e1 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 6 Apr 2020 07:41:43 +0200 Subject: [PATCH] [3.0.x] Fixed Sphinx warnings on duplicate object descriptions. Backport of 69e2cd6fed40f3ecf767609b80ad31f288446e48 from master --- docs/ref/contrib/auth.txt | 7 +++++++ docs/ref/contrib/gis/db-api.txt | 2 +- docs/ref/contrib/gis/geoquerysets.txt | 1 + docs/ref/contrib/staticfiles.txt | 1 + docs/ref/models/database-functions.txt | 3 +++ docs/topics/auth/customizing.txt | 1 + 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt index d967d24927..d7266d5837 100644 --- a/docs/ref/contrib/auth.txt +++ b/docs/ref/contrib/auth.txt @@ -12,10 +12,13 @@ topic guide `. ``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() @@ -359,6 +364,7 @@ Fields fields: .. class:: models.Permission + :noindex: .. attribute:: name @@ -390,6 +396,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 769be1a906..6343e1c28e 100644 --- a/docs/ref/contrib/gis/db-api.txt +++ b/docs/ref/contrib/gis/db-api.txt @@ -328,7 +328,7 @@ Lookup Type PostGIS Oracle MariaDB MySQL [#]_ Sp :lookup:`distance_lte` X X X X X N :lookup:`dwithin` X X X B :lookup:`equals` X X X X X C -:lookup:`exact` X X X X X B +:lookup:`exact ` X X X X X B :lookup:`intersects` X X X X X B :lookup:`isvalid` X X X (≥ 5.7.5) X (LWGEOM) :lookup:`overlaps` X X X X X B diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt index de3a63d924..2b66109444 100644 --- a/docs/ref/contrib/gis/geoquerysets.txt +++ b/docs/ref/contrib/gis/geoquerysets.txt @@ -322,6 +322,7 @@ SpatiaLite ``Equals(poly, geom)`` boxes. .. fieldlookup:: exact + :noindex: .. fieldlookup:: same_as ``exact``, ``same_as`` diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt index 8ec84f8a68..2c5279a1db 100644 --- a/docs/ref/contrib/staticfiles.txt +++ b/docs/ref/contrib/staticfiles.txt @@ -207,6 +207,7 @@ the directories which were searched: ------------- .. django-admin:: runserver [addrport] + :noindex: Overrides the core :djadmin:`runserver` command if the ``staticfiles`` app is :setting:`installed` and adds automatic serving of static diff --git a/docs/ref/models/database-functions.txt b/docs/ref/models/database-functions.txt index e0229d5967..d92bb5634b 100644 --- a/docs/ref/models/database-functions.txt +++ b/docs/ref/models/database-functions.txt @@ -664,14 +664,17 @@ Usage example:: ~~~~~~~~~~~~~~~~~~~~~~~~ .. class:: TruncHour(expression, output_field=None, tzinfo=None, is_dst=None, **extra) + :noindex: .. attribute:: kind = 'hour' .. class:: TruncMinute(expression, output_field=None, tzinfo=None, is_dst=None, **extra) + :noindex: .. attribute:: kind = 'minute' .. class:: TruncSecond(expression, output_field=None, tzinfo=None, is_dst=None, **extra) + :noindex: .. attribute:: kind = 'second' diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt index 453566d4cf..2bf8d611c2 100644 --- a/docs/topics/auth/customizing.txt +++ b/docs/topics/auth/customizing.txt @@ -855,6 +855,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