summaryrefslogtreecommitdiff
path: root/docs/ref/django-admin.txt
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-06-21 15:49:56 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-06-21 15:49:56 +0000
commitdd5e71829627705d68905d91fc18c3554a9c69c8 (patch)
tree95faa1902d86d277cab425daf328ac2734906dc2 /docs/ref/django-admin.txt
parent72c6a434038862c90e91a2087fbc38e1c48038d9 (diff)
[soc2010/query-refactor] Merged up to trunk r13366.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/django-admin.txt')
-rw-r--r--docs/ref/django-admin.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 0918f5c1f4..542a71582d 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -804,8 +804,6 @@ with an appropriate extension (e.g. ``json`` or ``xml``). See the
documentation for ``loaddata`` for details on the specification of fixture
data files.
---noinput
-~~~~~~~~~
The :djadminopt:`--noinput` option may be provided to suppress all user
prompts.
@@ -889,6 +887,11 @@ To run on 1.2.3.4:7000 with a ``test`` fixture::
django-admin.py testserver --addrport 1.2.3.4:7000 test
+.. versionadded:: 1.3
+
+The :djadminopt:`--noinput` option may be provided to suppress all user
+prompts.
+
validate
--------