Loading docs/ref/contrib/gis/gdal.txt +33 −33 Original line number Diff line number Diff line Loading @@ -296,7 +296,7 @@ __ http://www.gdal.org/ogr/ogr_formats.html Returns the type of geometry for this feature, as an :class:`OGRGeomType` object. This will be the same for all features in a given layer, and is equivalent to the :attr:`Layer.geom_type` property of the :class:`Layer`` object the feature came from. :class:`Layer` object the feature came from. .. attribute:: num_fields Loading docs/ref/models/options.txt +3 −3 Original line number Diff line number Diff line Loading @@ -85,14 +85,14 @@ Django quotes column and table names behind the scenes. The name of an orderable field in the model, typically a :class:`DateField`, :class:`DateTimeField`, or :class:`IntegerField`. This specifies the default field to use in your model :class:`Manager`'s :class:`~QuerySet.latest` method. field to use in your model :class:`Manager`'s :meth:`~django.db.models.query.QuerySet.latest` method. Example:: get_latest_by = "order_date" See the docs for :meth:`~django.db.models.query.QuerySet.latest` for more. See the :meth:`~django.db.models.query.QuerySet.latest` docs for more. ``managed`` ----------- Loading docs/ref/models/querysets.txt +1 −1 Original line number Diff line number Diff line Loading @@ -1637,7 +1637,7 @@ Finally, realize that ``update()`` does an update at the SQL level and, thus, does not call any ``save()`` methods on your models, nor does it emit the :attr:`~django.db.models.signals.pre_save` or :attr:`~django.db.models.signals.post_save` signals (which are a consequence of calling :meth:`Model.save() <~django.db.models.Model.save()>`). If you want to calling :meth:`Model.save() <django.db.models.Model.save>`). If you want to update a bunch of records for a model that has a custom :meth:`~django.db.models.Model.save()` method, loop over them and call :meth:`~django.db.models.Model.save()`, like this:: Loading docs/ref/settings.txt +5 −3 Original line number Diff line number Diff line Loading @@ -159,7 +159,7 @@ The cache backend to use. The built-in cache backends are: * ``'django.core.cache.backends.memcached.PyLibMCCache'`` You can use a cache backend that doesn't ship with Django by setting :setting:`BACKEND <CACHE-BACKEND>` to a fully-qualified path of a cache :setting:`BACKEND <CACHES-BACKEND>` to a fully-qualified path of a cache backend class (i.e. ``mypackage.backends.whatever.WhateverCache``). Writing a whole new cache backend from scratch is left as an exercise to the reader; see the other backends for examples. Loading Loading @@ -830,7 +830,7 @@ DEFAULT_EXCEPTION_REPORTER_FILTER Default: :class:`django.views.debug.SafeExceptionReporterFilter` Default exception reporter filter class to be used if none has been assigned to the :class:`HttpRequest` instance yet. the :class:`~django.http.HttpRequest` instance yet. See :ref:`Filtering error reports<filtering-error-reports>`. .. setting:: DEFAULT_FILE_STORAGE Loading Loading @@ -1070,6 +1070,8 @@ Note that these paths should use Unix-style forward slashes, even on Windows. See :ref:`initial-data-via-fixtures` and :ref:`topics-testing-fixtures`. .. setting:: FORCE_SCRIPT_NAME FORCE_SCRIPT_NAME ------------------ Loading Loading @@ -1498,7 +1500,7 @@ PROFANITIES_LIST Default: ``()`` (Empty tuple) A tuple of profanities, as strings, that will be forbidden in comments when :setting:`COMMENTS_ALLOW_PROFANITIES` is ``False``. ``COMMENTS_ALLOW_PROFANITIES`` is ``False``. .. setting:: RESTRUCTUREDTEXT_FILTER_SETTINGS Loading docs/releases/1.1-alpha-1.txt +6 −4 Original line number Diff line number Diff line Loading @@ -32,11 +32,13 @@ Aggregate support It's now possible to run SQL aggregate queries (i.e. ``COUNT()``, ``MAX()``, ``MIN()``, etc.) from within Django's ORM. You can choose to either return the results of the aggregate directly, or else annotate the objects in a :class:`QuerySet` with the results of the aggregate query. :class:`~django.db.models.query.QuerySet` with the results of the aggregate query. This feature is available as new :meth:`QuerySet.aggregate()`` and :meth:`QuerySet.annotate()`` methods, and is covered in detail in :doc:`the ORM aggregation documentation </topics/db/aggregation>` This feature is available as new :meth:`~django.db.models.query.QuerySet.aggregate` and :meth:`~django.db.models.query.QuerySet.annotate` methods, and is covered in detail in :doc:`the ORM aggregation documentation </topics/db/aggregation>`. Query expressions ~~~~~~~~~~~~~~~~~ Loading Loading
docs/ref/contrib/gis/gdal.txt +33 −33 Original line number Diff line number Diff line Loading @@ -296,7 +296,7 @@ __ http://www.gdal.org/ogr/ogr_formats.html Returns the type of geometry for this feature, as an :class:`OGRGeomType` object. This will be the same for all features in a given layer, and is equivalent to the :attr:`Layer.geom_type` property of the :class:`Layer`` object the feature came from. :class:`Layer` object the feature came from. .. attribute:: num_fields Loading
docs/ref/models/options.txt +3 −3 Original line number Diff line number Diff line Loading @@ -85,14 +85,14 @@ Django quotes column and table names behind the scenes. The name of an orderable field in the model, typically a :class:`DateField`, :class:`DateTimeField`, or :class:`IntegerField`. This specifies the default field to use in your model :class:`Manager`'s :class:`~QuerySet.latest` method. field to use in your model :class:`Manager`'s :meth:`~django.db.models.query.QuerySet.latest` method. Example:: get_latest_by = "order_date" See the docs for :meth:`~django.db.models.query.QuerySet.latest` for more. See the :meth:`~django.db.models.query.QuerySet.latest` docs for more. ``managed`` ----------- Loading
docs/ref/models/querysets.txt +1 −1 Original line number Diff line number Diff line Loading @@ -1637,7 +1637,7 @@ Finally, realize that ``update()`` does an update at the SQL level and, thus, does not call any ``save()`` methods on your models, nor does it emit the :attr:`~django.db.models.signals.pre_save` or :attr:`~django.db.models.signals.post_save` signals (which are a consequence of calling :meth:`Model.save() <~django.db.models.Model.save()>`). If you want to calling :meth:`Model.save() <django.db.models.Model.save>`). If you want to update a bunch of records for a model that has a custom :meth:`~django.db.models.Model.save()` method, loop over them and call :meth:`~django.db.models.Model.save()`, like this:: Loading
docs/ref/settings.txt +5 −3 Original line number Diff line number Diff line Loading @@ -159,7 +159,7 @@ The cache backend to use. The built-in cache backends are: * ``'django.core.cache.backends.memcached.PyLibMCCache'`` You can use a cache backend that doesn't ship with Django by setting :setting:`BACKEND <CACHE-BACKEND>` to a fully-qualified path of a cache :setting:`BACKEND <CACHES-BACKEND>` to a fully-qualified path of a cache backend class (i.e. ``mypackage.backends.whatever.WhateverCache``). Writing a whole new cache backend from scratch is left as an exercise to the reader; see the other backends for examples. Loading Loading @@ -830,7 +830,7 @@ DEFAULT_EXCEPTION_REPORTER_FILTER Default: :class:`django.views.debug.SafeExceptionReporterFilter` Default exception reporter filter class to be used if none has been assigned to the :class:`HttpRequest` instance yet. the :class:`~django.http.HttpRequest` instance yet. See :ref:`Filtering error reports<filtering-error-reports>`. .. setting:: DEFAULT_FILE_STORAGE Loading Loading @@ -1070,6 +1070,8 @@ Note that these paths should use Unix-style forward slashes, even on Windows. See :ref:`initial-data-via-fixtures` and :ref:`topics-testing-fixtures`. .. setting:: FORCE_SCRIPT_NAME FORCE_SCRIPT_NAME ------------------ Loading Loading @@ -1498,7 +1500,7 @@ PROFANITIES_LIST Default: ``()`` (Empty tuple) A tuple of profanities, as strings, that will be forbidden in comments when :setting:`COMMENTS_ALLOW_PROFANITIES` is ``False``. ``COMMENTS_ALLOW_PROFANITIES`` is ``False``. .. setting:: RESTRUCTUREDTEXT_FILTER_SETTINGS Loading
docs/releases/1.1-alpha-1.txt +6 −4 Original line number Diff line number Diff line Loading @@ -32,11 +32,13 @@ Aggregate support It's now possible to run SQL aggregate queries (i.e. ``COUNT()``, ``MAX()``, ``MIN()``, etc.) from within Django's ORM. You can choose to either return the results of the aggregate directly, or else annotate the objects in a :class:`QuerySet` with the results of the aggregate query. :class:`~django.db.models.query.QuerySet` with the results of the aggregate query. This feature is available as new :meth:`QuerySet.aggregate()`` and :meth:`QuerySet.annotate()`` methods, and is covered in detail in :doc:`the ORM aggregation documentation </topics/db/aggregation>` This feature is available as new :meth:`~django.db.models.query.QuerySet.aggregate` and :meth:`~django.db.models.query.QuerySet.annotate` methods, and is covered in detail in :doc:`the ORM aggregation documentation </topics/db/aggregation>`. Query expressions ~~~~~~~~~~~~~~~~~ Loading