summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-12-31 08:52:42 -0500
committerTim Graham <timograham@gmail.com>2017-01-17 20:52:01 -0500
commite0910dcc9283cd8f782cb97836c291f6f395f3f0 (patch)
tree89310a2e660510adf218328cd8b7151ed0fb6c97 /docs
parentff419de263138e905dff44c5cb806310c70f32aa (diff)
Refs #25604 -- Removed makemigrations --exit option per deprecation timeline.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt6
-rw-r--r--docs/releases/1.8.txt2
-rw-r--r--docs/releases/2.0.txt2
3 files changed, 3 insertions, 7 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 47cff8e8c6..2a70803640 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -704,12 +704,6 @@ Enables fixing of migration conflicts.
Allows naming the generated migration(s) instead of using a generated name.
-.. django-admin-option:: --exit, -e
-
-.. deprecated:: 1.10
-
- Use the ``--check`` option instead.
-
Makes ``makemigrations`` exit with error code 1 when no migrations are created
(or would have been created, if combined with ``--dry-run``).
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 5cb91427c7..6c45b455ec 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -445,7 +445,7 @@ Management Commands
:setting:`FIXTURE_DIRS` contains duplicates or a default fixture directory
path (``app_name/fixtures``), an exception is raised.
-* The new :option:`makemigrations --exit` option allows exiting with an error
+* The new ``makemigrations --exit`` option allows exiting with an error
code if no migrations are created.
* The new :djadmin:`showmigrations` command allows listing all migrations and
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index 5a57c22899..4c9347d554 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -319,3 +319,5 @@ these features.
* The ``django.template.loader.LoaderOrigin`` and
``django.template.base.StringOrigin`` aliases for
``django.template.base.Origin`` are removed.
+
+* The ``makemigrations --exit`` option is removed.