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, 4 insertions, 4 deletions

diff --git a/docs/contenttypes.txt b/docs/contenttypes.txt
index 96e3b0939c..a4fc045714 100644
--- a/docs/contenttypes.txt
+++ b/docs/contenttypes.txt
@@ -205,10 +205,10 @@ model. There are three parts to setting up a ``GenericForeignKey``:
        models you'll be relating to. (For most models, this means an
        ``IntegerField`` or ``PositiveIntegerField``.)
 
-   	   This field must be of the same type as the primary key of the models
-   	   that will be involved in the generic relation. For example, if you use
-   	   ``IntegerField``, you won't be able to form a generic relation with a
-   	   model that uses a ``CharField`` as a primary key.
+       This field must be of the same type as the primary key of the models
+       that will be involved in the generic relation. For example, if you use
+       ``IntegerField``, you won't be able to form a generic relation with a
+       model that uses a ``CharField`` as a primary key.
 
     3. Give your model a ``GenericForeignKey``, and pass it the names of
        the two fields described above. If these fields are named