gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 3 insertions, 3 deletions

diff --git a/docs/overview.txt b/docs/overview.txt
index 0fd1be5c85..dae0ffbd76 100644
--- a/docs/overview.txt
+++ b/docs/overview.txt
@@ -33,7 +33,7 @@ quick example::
     class Article(models.Model):
         pub_date = models.DateTimeField()
         headline = models.CharField(max_length=200)
-        article = models.TextField()
+        content = models.TextField()
         reporter = models.ForeignKey(Reporter)
 
         def __unicode__(self):
@@ -95,7 +95,7 @@ is created on the fly, no code generation necessary::
     # Create an article.
     >>> from datetime import datetime
     >>> a = Article(pub_date=datetime.now(), headline='Django is cool',
-    ...     article='Yeah.', reporter=r)
+    ...     content='Yeah.', reporter=r)
     >>> a.save()
 
     # Now the article is in the database.
@@ -135,7 +135,7 @@ your model classes::
     class Article(models.Model):
         pub_date = models.DateTimeField()
         headline = models.CharField(max_length=200)
-        article = models.TextField()
+        content = models.TextField()
         reporter = models.ForeignKey(Reporter)
         class Admin: pass