summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-02-21 23:37:54 +0000
committerJannis Leidel <jannis@leidel.info>2010-02-21 23:37:54 +0000
commit421f0195c19917c9dc566741bb00a4e463b8a0a4 (patch)
tree5bd9884359b3387f92ba52ba0aff3609c879d98a
parentb2c43df84ffbfceae481125941bdaf44b944d6e9 (diff)
Fixed #12887 - Fixed typo in release docs. Thanks blueyed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12458 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/releases/1.2-alpha-1.txt4
-rw-r--r--docs/releases/1.2.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/releases/1.2-alpha-1.txt b/docs/releases/1.2-alpha-1.txt
index 836baee533..1e9d4422ce 100644
--- a/docs/releases/1.2-alpha-1.txt
+++ b/docs/releases/1.2-alpha-1.txt
@@ -463,8 +463,8 @@ Template caching
In previous versions of Django, every time you rendered a template it
would be reloaded from disk. In Django 1.2, you can use a :ref:`cached
-template loader <template-loaders>` to load templates once, then use a
-cached the result for every subsequent render. This can lead to a
+template loader <template-loaders>` to load templates once, then use
+the cached result for every subsequent render. This can lead to a
significant performance improvement if your templates are broken into
lots of smaller subtemplates (using the ``{% extends %}`` or ``{%
include %}`` tags).
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
index 1098917c95..7dccffaa89 100644
--- a/docs/releases/1.2.txt
+++ b/docs/releases/1.2.txt
@@ -146,7 +146,7 @@ In order to support multiple database configurations, Django 1.2 has
added a ``_state`` attribute to object instances. This attribute will
appear in ``__dict__`` for a model instance. If your code relies on
iterating over __dict__ to obtain a list of fields, you must now
-filter the ``_state`` attribute of out ``__dict__``.
+filter the ``_state`` attribute out of ``__dict__``.
``get_db_prep_*()`` methods on ``Field``
----------------------------------------