Author: russellm
Date: 2009-02-22 01:03:16 -0600 (Sun, 22 Feb 2009)
New Revision: 9871
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/django/contrib/auth/tokens.py
Log:
[1.0.X] Fixed #10025 -- Corrected two minor typos in source documentation.
Thanks to Tarken for the report.
Merge of r9861 from trunk.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9738,9740-9741,9750-9751,9757-9758,9761-9762,9767-9768,9770-9780,9782-9784,9789-9790,9793-9798,9801-9802,9806-9807,9809-9810,9812,9821,9847,9856-9859
+
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9738,9740-9741,9750-9751,9757-9758,9761-9762,9767-9768,9770-9780,9782-9784,9789-9790,9793-9798,9801-9802,9806-9807,9809-9810,9812,9821,9847,9856-9859,9861
Modified: django/branches/releases/1.0.X/django/contrib/auth/tokens.py
===================================================================
--- django/branches/releases/1.0.X/django/contrib/auth/tokens.py
2009-02-22 07:01:05 UTC (rev 9870)
+++ django/branches/releases/1.0.X/django/contrib/auth/tokens.py
2009-02-22 07:03:16 UTC (rev 9871)
@@ -4,7 +4,7 @@
class PasswordResetTokenGenerator(object):
"""
- Stratgy object used to generate and check tokens for the password
+ Strategy object used to generate and check tokens for the password
reset mechanism.
"""
def make_token(self, user):
@@ -18,7 +18,7 @@
"""
Check that a password reset token is correct for a given user.
"""
- # Parse the tokem
+ # Parse the token
try:
ts_b36, hash = token.split("-")
except ValueError:
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
