From e7508a456ea97ec513507149280ab36cde271738 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Fri, 1 Aug 2008 19:29:37 +0000
Subject: [PATCH] Fixed #7983 -- Added fields to the ModelAdmin section in the
 admin documentation. Thanks julien for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/admin.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/admin.txt b/docs/admin.txt
index 8c9ef718982..33e9ede4c21 100644
--- a/docs/admin.txt
+++ b/docs/admin.txt
@@ -147,6 +147,26 @@ The ``field_options`` dictionary can have the following keys:
     ``django.utils.html.escape()`` to escape any HTML special
     characters.
 
+``fields``
+~~~~~~~~~~
+
+Use this option as an alternative to ``fieldsets`` if the layout does not
+matter and if you want to only show a subset of the available fields in the
+form. For example, you could define a simpler version of the admin form for
+the ``django.contrib.flatpages.FlatPage`` model as follows::
+
+    class FlatPageAdmin(admin.ModelAdmin):
+        fields = ('url', 'title', 'content')
+
+In the above example, only the fields 'url', 'title' and 'content' will be
+displayed, sequencially, in the form.
+
+.. admonition:: Note
+
+    This ``fields`` option should not be confused with the ``fields``
+    dictionary key that is within the ``fieldsets`` option, as described in
+    the previous section.
+
 ``filter_horizontal``
 ~~~~~~~~~~~~~~~~~~~~~