innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.7.x] Corrected --noinput docs for makemigrations; refs #23407. 

Backport of 450a616004 from master
This commit is contained in:
Tim Graham 2014-09-24 13:29:07 -04:00
parent bebdb026ce
commit 40e5eb4114
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/ref/django-admin.txt
View File

@ -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>]]
---------------------------------------