summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Bellemare <sbellem@gmail.com>2013-11-01 15:00:02 +0100
committerTim Graham <timograham@gmail.com>2013-11-01 19:28:19 -0400
commit35fd14cf42f5461520e755da7bad4d4629ea26bc (patch)
tree99202e0fcbe35c92e2b49dcabd03908d09c280b6
parent3f1b20841af48f444e23d1ac8ee7f75738a6dd9e (diff)
[1.6.x] Fixed typo -- "a" user, not "an" user
Backport of c7dabe49dd from master
-rw-r--r--docs/topics/auth/customizing.txt2
-rw-r--r--docs/topics/auth/index.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
index 29260ffb81..d5bc9d96ba 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -276,7 +276,7 @@ can or cannot do with Task instances, specific to your application::
The only thing this does is create those extra permissions when you run
:djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the
-value of these permissions when an user is trying to access the functionality
+value of these permissions when a user is trying to access the functionality
provided by the application (viewing tasks, changing the status of tasks,
closing tasks.) Continuing the above example, the following checks if a user may
view tasks::
diff --git a/docs/topics/auth/index.txt b/docs/topics/auth/index.txt
index 8447d449ce..a51180fd58 100644
--- a/docs/topics/auth/index.txt
+++ b/docs/topics/auth/index.txt
@@ -12,7 +12,7 @@ User authentication in Django
.. module:: django.contrib.auth
:synopsis: Django's authentication framework.
-Django comes with an user authentication system. It handles user accounts,
+Django comes with a user authentication system. It handles user accounts,
groups, permissions and cookie-based user sessions. This section of the
documentation explains how the default implementation works out of the box, as
well as how to :doc:`extend and customize </topics/auth/customizing>` it to