Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214

  • django/branches/gis/docs/contenttypes.txt

    r7979 r8215  
    206206       ``IntegerField`` or ``PositiveIntegerField``.) 
    207207 
    208           This field must be of the same type as the primary key of the models 
    209           that will be involved in the generic relation. For example, if you use 
    210           ``IntegerField``, you won't be able to form a generic relation with a 
    211           model that uses a ``CharField`` as a primary key. 
     208       This field must be of the same type as the primary key of the models 
     209       that will be involved in the generic relation. For example, if you use 
     210       ``IntegerField``, you won't be able to form a generic relation with a 
     211       model that uses a ``CharField`` as a primary key. 
    212212 
    213213    3. Give your model a ``GenericForeignKey``, and pass it the names of