summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-01-12 20:56:10 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-01-12 20:56:10 +0000
commit5e6d6fafae96fa55d754e88cc4cf814b75c32c13 (patch)
tree98aa553bf35f42afe8bfe4a71416b95165799c6a /docs
parent51f4e95cb70b94a28969d30cb6036a4a25a75503 (diff)
Fixed #1202 -- Changed 'manage.py shell' to use IPython if present. Also added '--plain' option, which overrides IPython to use the standard Python interactive prompt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/django-admin.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/docs/django-admin.txt b/docs/django-admin.txt
index 67c162a4f9..750bb58970 100644
--- a/docs/django-admin.txt
+++ b/docs/django-admin.txt
@@ -156,6 +156,19 @@ Port 7000 on IP address 1.2.3.4::
django-admin.py runserver 1.2.3.4:7000
+shell
+-----
+
+Starts the Python interactive interpreter.
+
+**New in Django development version:** Uses IPython_, if it's installed. If you
+have IPython installed and want to force use of the "plain" Python interpreter,
+use the ``--plain`` option, like so::
+
+ django-admin.py shell --plain
+
+.. _IPython: http://ipython.scipy.org/
+
sql [modelmodule modelmodule ...]
---------------------------------