summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-06-10 12:22:07 -0400
committerTim Graham <timograham@gmail.com>2014-06-10 15:00:12 -0400
commit0767055dfc255ba120811f6d9cba2c7e593b0731 (patch)
treef55237d0bf514bc534d6d2dbab5cb7d8ee4a240f /docs
parentd232a5f93f2c0be93b6aa5669e9cba0f328a4a9b (diff)
[1.7.x] Fixed #22770 -- Removed create_superuser from post_migrate signals.
Moved logic to syncdb command for backwards compatibility. Backport of 93d05536fd from master
Diffstat (limited to 'docs')
-rw-r--r--docs/intro/tutorial01.txt35
-rw-r--r--docs/intro/tutorial02.txt36
-rw-r--r--docs/ref/django-admin.txt5
-rw-r--r--docs/topics/auth/default.txt4
4 files changed, 36 insertions, 44 deletions
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index 37dfef0d0d..2ce4adbe97 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -206,40 +206,7 @@ The :djadmin:`migrate` command looks at the :setting:`INSTALLED_APPS` setting
and creates any necessary database tables according to the database settings
in your :file:`mysite/settings.py` file and the database migrations shipped
with the app (we'll cover those later). You'll see a message for each
-migration it applies, and you'll get a prompt asking you if you'd like to
-create a superuser account for the authentication system.
-
-First, you'll be asked if you would like to create a superuser. Type the word
-``yes`` and hit enter.
-
-.. code-block:: text
-
- You have installed Django's auth system, and don't have any superusers defined.
- Would you like to create one now? (yes/no): yes
-
-Next, enter a username. By default, this will be your system username. Enter
-your desired username and press enter.
-
-.. code-block:: text
-
- Username (leave blank to use 'your_username'): admin
-
-You will then be prompted for your desired email address:
-
-.. code-block:: text
-
- Email address: admin@example.com
-
-The final step is to enter your password. You will be asked to enter your
-password twice, the second time as a confirmation of the first.
-
-.. code-block:: text
-
- Password: **********
- Password (again): *********
- Superuser created successfully.
-
-With that done, if you're interested, run the command-line client for your
+migration it applies. If you're interested, run the command-line client for your
database and type ``\dt`` (PostgreSQL), ``SHOW TABLES;`` (MySQL), or
``.schema`` (SQLite) to display the tables Django created.
diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt
index 23f6440ea5..4c5e869f8d 100644
--- a/docs/intro/tutorial02.txt
+++ b/docs/intro/tutorial02.txt
@@ -21,6 +21,37 @@ automatically-generated admin site.
The admin isn't intended to be used by site visitors. It's for site
managers.
+Creating an admin user
+======================
+
+First we'll need to create a user who can login to the admin site. Run the
+following command:
+
+.. code-block:: bash
+
+ $ python manage.py createsuperuser
+
+Enter your desired username and press enter.
+
+.. code-block:: text
+
+ Username: admin
+
+You will then be prompted for your desired email address:
+
+.. code-block:: text
+
+ Email address: admin@example.com
+
+The final step is to enter your password. You will be asked to enter your
+password twice, the second time as a confirmation of the first.
+
+.. code-block:: text
+
+ Password: **********
+ Password (again): *********
+ Superuser created successfully.
+
Start the development server
============================
@@ -59,10 +90,7 @@ browser's settings and on whether Django has a translation for this language.
Enter the admin site
====================
-Now, try logging in. You created a superuser account in the first part of this
-tutorial, remember? If you didn't create one or forgot the password you can
-:ref:`create another one <topics-auth-creating-superusers>`.
-
+Now, try logging in with the superuser account you created in the previous step.
You should see the Django admin index page:
.. image:: _images/admin02.png
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 2296d2b422..f68157c2a9 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1420,9 +1420,8 @@ This command is only available if Django's :doc:`authentication system
</topics/auth/index>` (``django.contrib.auth``) is installed.
Creates a superuser account (a user who has all permissions). This is
-useful if you need to create an initial superuser account but did not
-do so during the first :djadmin:`migrate`, or if you need to programmatically
-generate superuser accounts for your site(s).
+useful if you need to create an initial superuser account or if you need to
+programmatically generate superuser accounts for your site(s).
When run interactively, this command will prompt for a password for
the new superuser account. When run non-interactively, no password
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index 7b89061a07..3fae92c662 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -66,9 +66,7 @@ interactively <auth-admin>`.
Creating superusers
-------------------
-:djadmin:`manage.py migrate <migrate>` prompts you to create a superuser the
-first time you run it with ``'django.contrib.auth'`` installed. If you need to
-create a superuser at a later date, you can use a command line utility::
+Create superusers using the :djadmin:`createsuperuser` command::
$ python manage.py createsuperuser --username=joe --email=joe@example.com