Author: lukeplant
Date: 2010-08-30 05:31:56 -0500 (Mon, 30 Aug 2010)
New Revision: 13667

Modified:
   django/branches/releases/1.2.X/
   django/branches/releases/1.2.X/docs/ref/models/instances.txt
Log:
Fixed #14189 - permalink docs import mistake
  
Thanks to 7times9 for report and patch.

Backport of [13666] from trunk



Property changes on: django/branches/releases/1.2.X
___________________________________________________________________
Name: svnmerge-integrated
   - /django/trunk:1-13360,13434,13480,13574,13600,13638,13652,13664
   + /django/trunk:1-13360,13434,13480,13574,13600,13638,13652,13664,13666

Modified: django/branches/releases/1.2.X/docs/ref/models/instances.txt
===================================================================
--- django/branches/releases/1.2.X/docs/ref/models/instances.txt        
2010-08-30 10:29:44 UTC (rev 13666)
+++ django/branches/releases/1.2.X/docs/ref/models/instances.txt        
2010-08-30 10:31:56 UTC (rev 13667)
@@ -515,7 +515,7 @@
 ...and then using that name to perform the reverse URL resolution instead
 of the view name::
 
-    from django.db.models import permalink
+    from django.db import models
 
     @models.permalink
     def get_absolute_url(self):

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to