From b83feeea43a4a2e85bbc61d259b711a410c0ee05 Mon Sep 17 00:00:00 2001
From: Carl Meyer <carl@oddbird.net>
Date: Mon, 25 Feb 2013 00:15:11 -0700
Subject: [PATCH] [1.5.x] Minor edits to some recently-added admin docs.

Backport of 8f839aaa180f from master.
---
 docs/ref/contrib/admin/index.txt | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 7b473e5d22..0891645b4a 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -180,10 +180,10 @@ subclass::
     values defined in :attr:`ModelAdmin.readonly_fields` to be displayed as
     read-only.
 
-    The ``fields`` option, unlike :attr:`~ModelAdmin.list_display`, may contain
-    only field names of the model or the form specified by
-    :attr:`~ModelAdmin.form`, not callables. However it *can* contain callables
-    if they are defined in :attr:`~ModelAdmin.readonly_fields`.
+    The ``fields`` option, unlike :attr:`~ModelAdmin.list_display`, may only
+    contain names of fields on the model or the form specified by
+    :attr:`~ModelAdmin.form`. It may contain callables only if they are listed
+    in :attr:`~ModelAdmin.readonly_fields`.
 
     .. versionadded:: 1.4
 
@@ -254,10 +254,10 @@ subclass::
             'fields': ('first_name', 'last_name', 'address', 'city', 'state'),
             }
 
-        Just like with the :attr:`~ModelAdmin.fields` option, to display
-        multiple fields on the same line, wrap those fields in their own
-        tuple. In this example, the ``first_name`` and ``last_name`` fields
-        will display on the same line::
+        As with the :attr:`~ModelAdmin.fields` option, to display multiple
+        fields on the same line, wrap those fields in their own tuple. In this
+        example, the ``first_name`` and ``last_name`` fields will display on
+        the same line::
 
             {
             'fields': (('first_name', 'last_name'), 'address', 'city', 'state'),
@@ -266,9 +266,9 @@ subclass::
         ``fields`` can contain values defined in
         :attr:`~ModelAdmin.readonly_fields` to be displayed as read-only.
 
-        If you add a callable name to ``fields``, the same rule applies as
-        with :attr:`~ModelAdmin.fields` option: the callable must be
-        specified in :attr:`~ModelAdmin.readonly_fields`.
+        If you add the name of a callable to ``fields``, the same rule applies
+        as with the :attr:`~ModelAdmin.fields` option: the callable must be
+        listed in :attr:`~ModelAdmin.readonly_fields`.
 
     * ``classes``
         A list containing extra CSS classes to apply to the fieldset.