Fixed #11800 -- Updated Sphinx metadata in queryset docs. Thanks to timo for the patch. (2dc2ed87) · Commits · Dom Sekotill / django

docs/ref/contrib/admin/index.txt

+7 −8

Original line number	Diff line number	Diff line
		@@ -474,17 +474,16 @@ change list page. By default, this is set to ``100``.

		.. attribute:: ModelAdmin.list_select_related

		Set ``list_select_related`` to tell Django to use ``select_related()`` in
		retrieving the list of objects on the admin change list page. This can save you
		a bunch of database queries.
		Set ``list_select_related`` to tell Django to use
		:meth:`~django.db.models.QuerySet.select_related` in retrieving the list of
		objects on the admin change list page. This can save you a bunch of database
		queries.

		The value should be either ``True`` or ``False``. Default is ``False``.

		Note that Django will use ``select_related()``, regardless of this setting,
		if one of the ``list_display`` fields is a ``ForeignKey``.

		For more on ``select_related()``, see
		:ref:`the select_related() docs <select-related>`.
		Note that Django will use :meth:`~django.db.models.QuerySet.select_related`,
		regardless of this setting, if one of the ``list_display`` fields is a
		``ForeignKey``.

		.. attribute:: ModelAdmin.inlines

+0 −11

Original line number	Diff line number	Diff line
		@@ -332,8 +332,6 @@ a model which defines a default ordering, or when using
		ordering was undefined prior to calling ``reverse()``, and will remain
		undefined afterward).

		.. _queryset-distinct:

		``distinct()``
		~~~~~~~~~~~~~~

		@@ -367,9 +365,6 @@ query spans multiple tables, it's possible to get duplicate results when a
		``values()`` together, be careful when ordering by fields not in the
		``values()`` call.


		.. _queryset-values:

		``values(*fields)``
		~~~~~~~~~~~~~~~~~~~

		@@ -679,8 +674,6 @@ related object.
		``OneToOneFields`` will not be traversed in the reverse direction if you
		are performing a depth-based ``select_related``.

		.. _queryset-extra:

		``extra(select=None, where=None, params=None, tables=None, order_by=None, select_params=None)``
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

		@@ -843,8 +836,6 @@ of the arguments is required, but you should use at least one of them.

		Entry.objects.extra(where=['headline=%s'], params=['Lennon'])

		.. _queryset-defer:

		``defer(*fields)``
		~~~~~~~~~~~~~~~~~~

		@@ -1143,8 +1134,6 @@ Example::

		If you pass ``in_bulk()`` an empty list, you'll get an empty dictionary.

		.. _queryset-iterator:

		``iterator()``
		~~~~~~~~~~~~~~

+12 −11

Original line number	Diff line number	Diff line
		@@ -71,8 +71,9 @@ processing to convert them to Python objects. If you know you don't need those
		particular fields, you can now tell Django not to retrieve them from the
		database.

		You'll do this with the :ref:`new queryset methods <queryset-defer>`
		``defer()`` and ``only()``.
		You'll do this with the new queryset methods
		:meth:`~django.db.models.QuerySet.defer` and
		:meth:`~django.db.models.QuerySet.only`.

		New admin features
		------------------

+3 −2

Original line number	Diff line number	Diff line
		@@ -258,8 +258,9 @@ processing to convert them to Python objects. If you know you don't need those
		particular fields, you can now tell Django not to retrieve them from the
		database.

		You'll do this with the :ref:`new queryset methods <queryset-defer>`
		``defer()`` and ``only()``.
		You'll do this with the new queryset methods
		:meth:`~django.db.models.QuerySet.defer` and
		:meth:`~django.db.models.QuerySet.only`.

		Testing improvements
		--------------------

+1 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ without any harmful effects, since that is already playing a role in the
		query.

		This behavior is the same as that noted in the queryset documentation for
		:ref:`distinct() <queryset-distinct>` and the general rule is the same:
		:meth:`~django.db.models.QuerySet.distinct` and the general rule is the same:
		normally you won't want extra columns playing a part in the result, so clear
		out the ordering, or at least make sure it's restricted only to those fields
		you also select in a ``values()`` call.