Proofed the 1.6 release notes

6 files changed, 30 insertions, 23 deletions

diff --git a/docs/ref/class-based-views/mixins-editing.txt b/docs/ref/class-based-views/mixins-editing.txt
index 51d8628818..48d363b3b2 100644
--- a/docs/ref/class-based-views/mixins-editing.txt
+++ b/docs/ref/class-based-views/mixins-editing.txt
@@ -125,7 +125,7 @@ ModelFormMixin
 
         This is a required attribute if you are generating the form class
         automatically (e.g. using ``model``). Omitting this attribute will
-        result in all fields being used, but this behaviour is deprecated
+        result in all fields being used, but this behavior is deprecated
         and will be removed in Django 1.8.
 
     .. attribute:: success_url
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 8f457e77ac..11bc2c7268 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1026,8 +1026,9 @@ subclass::
         Performs a full-text match. This is like the default search method but
         uses an index. Currently this is only available for MySQL.
 
-    If you need to customize search you can use :meth:`ModelAdmin.get_search_results` to provide additional or alternate
-    search behaviour.
+    If you need to customize search you can use
+    :meth:`ModelAdmin.get_search_results` to provide additional or alternate
+    search behavior.
 
 Custom template options
 ~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index 02159c415b..51d038d187 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -137,25 +137,29 @@ into those elements.
 
   See `a complex example`_ below that uses a description template.
 
-  There is also a way to pass additional information to title and description
-  templates, if you need to supply more than the two variables mentioned
-  before. You can provide your implementation of ``get_context_data`` method
-  in your Feed subclass. For example::
+  .. method:: Feed.get_context_data(self, **kwargs)
 
-    from mysite.models import Article
-    from django.contrib.syndication.views import Feed
+    .. versionadded:: 1.6
 
-    class ArticlesFeed(Feed):
-        title = "My articles"
-        description_template = "feeds/articles.html"
+      There is also a way to pass additional information to title and description
+      templates, if you need to supply more than the two variables mentioned
+      before. You can provide your implementation of ``get_context_data`` method
+      in your ``Feed`` subclass. For example::
 
-        def items(self):
-            return Article.objects.order_by('-pub_date')[:5]
+        from mysite.models import Article
+        from django.contrib.syndication.views import Feed
 
-        def get_context_data(self, **kwargs):
-            context = super(ArticlesFeed, self).get_context_data(**kwargs)
-            context['foo'] = 'bar'
-            return context
+        class ArticlesFeed(Feed):
+            title = "My articles"
+            description_template = "feeds/articles.html"
+
+            def items(self):
+                return Article.objects.order_by('-pub_date')[:5]
+
+            def get_context_data(self, **kwargs):
+                context = super(ArticlesFeed, self).get_context_data(**kwargs)
+                context['foo'] = 'bar'
+                return context
 
   And the template:
 
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 4923e4b177..a648ac1709 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -135,6 +135,8 @@ configuration in :setting:`DATABASES`::
 Since Django 1.6, autocommit is turned on by default. This configuration is
 ignored and can be safely removed.
 
+.. _database-isolation-level:
+
 Isolation level
 ---------------
 
diff --git a/docs/ref/forms/models.txt b/docs/ref/forms/models.txt
index 54d34160a5..b54056af0c 100644
--- a/docs/ref/forms/models.txt
+++ b/docs/ref/forms/models.txt
@@ -33,7 +33,7 @@ Model Form Functions
     ``fields`` or ``exclude``, or the corresponding attributes on the form's
     inner ``Meta`` class. See :ref:`modelforms-selecting-fields` for more
     information. Omitting any definition of the fields to use will result in all
-    fields being used, but this behaviour is deprecated.
+    fields being used, but this behavior is deprecated.
 
     The ``localized_fields`` parameter was added.
 
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index b8ebc16bad..ef52d3170c 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -344,9 +344,9 @@ CSRF_COOKIE_HTTPONLY
 
 Default: ``False``
 
-Whether to use HttpOnly flag on the CSRF cookie. If this is set to ``True``,
-client-side JavaScript will not to be able to access the CSRF cookie. See
-:setting:`SESSION_COOKIE_HTTPONLY` for details on HttpOnly.
+Whether to use ``HttpOnly`` flag on the CSRF cookie. If this is set to
+``True``, client-side JavaScript will not to be able to access the CSRF cookie.
+See :setting:`SESSION_COOKIE_HTTPONLY` for details on ``HttpOnly``.
 
 .. setting:: CSRF_COOKIE_NAME
 
@@ -2315,7 +2315,7 @@ SESSION_COOKIE_HTTPONLY
 
 Default: ``True``
 
-Whether to use HTTPOnly flag on the session cookie. If this is set to
+Whether to use ``HTTPOnly`` flag on the session cookie. If this is set to
 ``True``, client-side JavaScript will not to be able to access the
 session cookie.