Browse files

[1.7.x] Fixed #23163: Align user help text with migrations

  • Loading branch information...
andrewgodwin committed Aug 4, 2014
1 parent 6ebfff7 commit b2ab666aad269fbd6fc7a9999aa0e76e08744188
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/contrib/auth/migrations/
@@ -54,8 +54,8 @@ class Migration(migrations.Migration):
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
('date_joined', models.DateTimeField(, verbose_name='date joined')),
- ('groups', models.ManyToManyField(to='auth.Group', verbose_name='groups', blank=True)),
- ('user_permissions', models.ManyToManyField(to='auth.Permission', verbose_name='user permissions', blank=True)),
+ ('groups', models.ManyToManyField(to='auth.Group', verbose_name='groups', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.')),
+ ('user_permissions', models.ManyToManyField(to='auth.Permission', verbose_name='user permissions', blank=True, help_text='Specific permissions for this user.')),
'swappable': 'AUTH_USER_MODEL',

0 comments on commit b2ab666

Please sign in to comment.