diff options
| author | Tim Graham <timograham@gmail.com> | 2014-09-24 13:29:07 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-09-24 13:30:23 -0400 |
| commit | 40e5eb4114e66dfaacea162fc9f39c0618dcfad9 (patch) | |
| tree | 49b36459701021968f5a6bfa727ebc11dded9415 /docs/ref | |
| parent | bebdb026ceb659d5e86955f5ab07fd971040a878 (diff) | |
[1.7.x] Corrected --noinput docs for makemigrations; refs #23407.
Backport of 450a616004 from master
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/django-admin.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 3ebe229cdf..29cae67eaa 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -647,8 +647,6 @@ Providing one or more app names as arguments will limit the migrations created to the app(s) specified and any dependencies needed (the table at the other end of a ``ForeignKey``, for example). -The :djadminopt:`--noinput` option may be provided to suppress all user prompts. - .. django-admin-option:: --empty The ``--empty`` option will cause ``makemigrations`` to output an empty @@ -666,7 +664,9 @@ written. .. django-admin-option:: --merge -The ``--merge`` option enables fixing of migration conflicts. +The ``--merge`` option enables fixing of migration conflicts. The +:djadminopt:`--noinput` option may be provided to suppress user prompts during +a merge. migrate [<app_label> [<migrationname>]] --------------------------------------- |