summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2011-10-14 00:16:14 +0000
committerLuke Plant <L.Plant.98@cantab.net>2011-10-14 00:16:14 +0000
commitd1e74092785111fb514488646f7d213a964e1703 (patch)
treeba89e46346bc265bfd1744f1052117598dfa5f25 /docs
parentd1e5c55258d624058a93c8cacdb1f25ae7857554 (diff)
Fixed ReST indentation errors introduced in [16983]. Grr.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/databases.txt10
-rw-r--r--docs/releases/1.3-beta-1.txt16
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</ref/contrib/staticfiles>` app:
+ limited to**, the :doc:`staticfiles</ref/contrib/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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~