From 40e5eb4114e66dfaacea162fc9f39c0618dcfad9 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 24 Sep 2014 13:29:07 -0400 Subject: [PATCH] [1.7.x] Corrected --noinput docs for makemigrations; refs #23407. Backport of 450a616004 from master --- docs/ref/django-admin.txt | 6 +++--- 1 file 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 [ []] ---------------------------------------