summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/staticfiles.txt7
-rw-r--r--docs/ref/django-admin.txt7
-rw-r--r--docs/releases/1.9.txt3
3 files changed, 15 insertions, 2 deletions
diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index ee11ac88d9..010eacccce 100644
--- a/docs/ref/contrib/staticfiles.txt
+++ b/docs/ref/contrib/staticfiles.txt
@@ -90,7 +90,12 @@ Some commonly used options are:
.. django-admin-option:: --noinput
- Do NOT prompt the user for input of any kind.
+ Do NOT prompt the user for input of any kind. You can use ``--no-input``
+ as an alias for this option.
+
+ .. versionchanged:: 1.9
+
+ The ``--no-input`` alias was added.
.. django-admin-option:: -i <pattern>
.. django-admin-option:: --ignore <pattern>
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 94b12fe9d7..35a02eecc8 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1552,7 +1552,12 @@ If not provided all locales are processed.
Use the ``--noinput`` option to suppress all user prompting, such as "Are
you sure?" confirmation messages. This is useful if ``django-admin`` is
-being executed as an unattended, automated script.
+being executed as an unattended, automated script. You can use ``--no-input``
+as an alias for this option.
+
+.. versionchanged:: 1.9
+
+ The ``--no-input`` alias was added.
Extra niceties
==============
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index f93b403552..2bf591b8b0 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -418,6 +418,9 @@ Management Commands
* The ``django`` package may be run as a script, i.e. ``python -m django``,
which will behave the same as ``django-admin``.
+* Management commands that have the ``--noinput`` option now also take
+ ``--no-input`` as an alias for that option.
+
Migrations
^^^^^^^^^^