From d1e74092785111fb514488646f7d213a964e1703 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Fri, 14 Oct 2011 00:16:14 +0000 Subject: [PATCH] Fixed ReST indentation errors introduced in [16983]. Grr. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16984 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/databases.txt | 10 +++++----- docs/releases/1.3-beta-1.txt | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 0312d264cf..9a83e059e5 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -726,11 +726,11 @@ some limitations on the usage of such LOB columns in general: * LOB columns may not be used in indexes. * LOB columns may not be used in a ``SELECT DISTINCT`` list. This means that -attempting to use the ``QuerySet.distinct`` method on a model that -includes ``TextField`` columns will result in an error when run against -Oracle. As a workaround, use the ``QuerySet.defer`` method in conjunction -with ``distinct()`` to prevent ``TextField`` columns from being included in -the ``SELECT DISTINCT`` list. + attempting to use the ``QuerySet.distinct`` method on a model that + includes ``TextField`` columns will result in an error when run against + Oracle. As a workaround, use the ``QuerySet.defer`` method in conjunction + with ``distinct()`` to prevent ``TextField`` columns from being included in + the ``SELECT DISTINCT`` list. .. _third-party-notes: diff --git a/docs/releases/1.3-beta-1.txt b/docs/releases/1.3-beta-1.txt index 2ff5c854fe..0a89389993 100644 --- a/docs/releases/1.3-beta-1.txt +++ b/docs/releases/1.3-beta-1.txt @@ -101,24 +101,24 @@ desired outside the use of the optional :mod:`~django.contrib.staticfiles` app. As a result, we took the following steps to rectify the issue: * Two new global settings were added that will be used by, **but are not -limited to**, the :doc:`staticfiles` app: + limited to**, the :doc:`staticfiles` app: * :setting:`STATIC_ROOT` (formally ``STATICFILES_ROOT``) * :setting:`STATIC_URL` (formally ``STATICFILES_URL``) * The ``django.contrib.staticfiles.templatetags.staticfiles.get_staticfiles_prefix`` -template tag was moved to Django's core (``django.templatetags.static``) and -renamed to :ttag:`get_static_prefix`. + template tag was moved to Django's core (``django.templatetags.static``) and + renamed to :ttag:`get_static_prefix`. * The ``django.contrib.staticfiles.context_processors.staticfiles`` -context processor was moved to Django's core -(``django.core.context_processors.static``) and renamed to -:func:`~django.core.context_processors.static`. + context processor was moved to Django's core + (``django.core.context_processors.static``) and renamed to + :func:`~django.core.context_processors.static`. * :ref:`form-media-paths` now uses :setting:`STATIC_URL` as the prefix -**if the value is not None**, and falls back to the previously used -:setting:`MEDIA_URL` setting otherwise. + **if the value is not None**, and falls back to the previously used + :setting:`MEDIA_URL` setting otherwise. Changes to the login methods of the admin ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~