summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt10
-rw-r--r--docs/releases/1.10.txt4
2 files changed, 13 insertions, 1 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index a48a7043fd..ee9fd0cc83 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -147,6 +147,16 @@ Or you could run it directly on a production or staging deployment to verify
that the correct settings are in use (omitting ``--settings``). You could even
make it part of your integration test suite.
+.. django-admin-option:: --fail-level
+
+.. versionadded:: 1.10
+
+Specifies the message level that will cause the command to exit with a non-zero
+status. Default is ``ERROR``.
+
+Available levels are: ``CRITICAL``, ``ERROR``, ``WARNING``, ``INFO``, and
+``DEBUG``.
+
compilemessages
---------------
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index 1eada416f6..2c41db2b72 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -150,7 +150,9 @@ Internationalization
Management Commands
^^^^^^^^^^^^^^^^^^^
-* ...
+* The new :djadminopt:`--fail-level` option of the :djadmin:`check` command
+ allows specifying the message level that will cause the command to exit with
+ a non-zero status.
Migrations
^^^^^^^^^^