Browse files

Fixed comma splice in auth.User model docstring

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent f2aab5b commit f67b629ada21a8357027ce86dfbdb52dd1065f6b @adrianholovaty adrianholovaty committed Jun 20, 2006
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/contrib/auth/
@@ -17,7 +17,7 @@ class Permission(models.Model):
- The "add" permission limits the user's ability to view the "add" form and add an object.
- The "change" permission limits a user's ability to view the change list, view the "change" form and change an object.
- The "delete" permission limits the ability to delete an object.
Permissions are set globally per type of object, not per specific object instance. It is possible to say "Mary may change news stories," but it's not currently possible to say "Mary may change news stories, but only the ones she created herself" or "Mary may only change news stories that have a certain status or publication date."
Three basic permissions -- add, create and delete -- are automatically created for each Django model.
@@ -72,7 +72,7 @@ def make_random_password(self, length=10, allowed_chars='abcdefghjkmnpqrstuvwxyz
class User(models.Model):
"""Users within the Django authentication system are represented by this model.
- Username and password are required, other fields are optional.
+ Username and password are required. Other fields are optional.
username = models.CharField(_('username'), maxlength=30, unique=True, validator_list=[validators.isAlphaNumeric], help_text=_("Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."))
first_name = models.CharField(_('first name'), maxlength=30, blank=True)

0 comments on commit f67b629

Please sign in to comment.