Corrected --noinput docs for makemigrations; refs #23407.

django · Sep 24, 2014 · 450a616 · 450a616
1 parent 2168301
commit 450a616
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
@@ -681,8 +681,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
@@ -700,7 +698,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.
 
 .. django-admin-option:: --name, -n