summaryrefslogtreecommitdiff
path: root/docs/topics/auth
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-01-11 20:59:34 -0500
committerTim Graham <timograham@gmail.com>2016-01-14 18:21:33 -0500
commite519aab43a419589e92fe284e4ce2f2e034aec6a (patch)
treee1af3c01ca87ff9b639ac45ec97ac9869d273c43 /docs/topics/auth
parentfd1c5bb041abb617dc58c336a8461fb3a7af4508 (diff)
Fixed #23868 -- Added support for non-unique django-admin-options in docs.
Also documented missing short command line options to fix #24134. This bumps the minimum sphinx version required to build the docs to 1.3.4. Thanks Simon Charette for review.
Diffstat (limited to 'docs/topics/auth')
-rw-r--r--docs/topics/auth/default.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index e0740a201d..e59f0318cc 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -70,8 +70,9 @@ Create superusers using the :djadmin:`createsuperuser` command::
$ python manage.py createsuperuser --username=joe --email=joe@example.com
You will be prompted for a password. After you enter one, the user will be
-created immediately. If you leave off the :djadminopt:`--username` or the
-:djadminopt:`--email` options, it will prompt you for those values.
+created immediately. If you leave off the :option:`--username <createsuperuser
+--username>` or :option:`--email <createsuperuser --email>` options, it will
+prompt you for those values.
Changing passwords
------------------