From 81b9b7fb5591ab831f3d87505198f3355ee2c078 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Wed, 19 Dec 2007 03:39:21 +0000
Subject: [PATCH] Added note to docs/form_for_model.txt (from [6844])
 explaining this is deprecated in favor of ModelForms

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/form_for_model.txt | 7 +++++++
 docs/modelforms.txt     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/form_for_model.txt b/docs/form_for_model.txt
index 6761c15331..ddca9aae18 100644
--- a/docs/form_for_model.txt
+++ b/docs/form_for_model.txt
@@ -1,6 +1,13 @@
 Generating forms for models
 ===========================
 
+.. admonition:: Note
+
+    The APIs described in this document have been deprecated. If you're
+    developing new code, use `ModelForms`_ instead.
+
+.. _ModelForms: ../modelforms/
+
 If you're building a database-driven app, chances are you'll have forms that
 map closely to Django models. For instance, you might have a ``BlogComment``
 model, and you want to create a form that lets people submit comments. In this
diff --git a/docs/modelforms.txt b/docs/modelforms.txt
index 372abf9811..0136540bed 100644
--- a/docs/modelforms.txt
+++ b/docs/modelforms.txt
@@ -277,7 +277,7 @@ model fields:
     any attempt to ``save()`` a ``ModelForm`` with missing fields will fail.
     To avoid this failure, you must instantiate your model with initial values
     for the missing, but required fields, or use ``save(commit=False)`` and
-    manually set anyextra required fields::
+    manually set any extra required fields::
     
         instance = Instance(required_field='value')
         form = InstanceForm(request.POST, instance=instance)
@@ -296,7 +296,7 @@ Overriding the default field types
 ----------------------------------
 
 The default field types, as described in the "Field types" table above, are
-sensible defaults; if you have a ``DateField`` in your model, chances are you'd
+sensible defaults. If you have a ``DateField`` in your model, chances are you'd
 want that to be represented as a ``DateField`` in your form. But
 ``ModelForm`` gives you the flexibility of changing the form field type
 for a given model field. You do this by declaratively specifying fields like