Corrected --noinput docs for makemigrations; refs #23407. (450a6160) · Commits · Dom Sekotill / django

docs/ref/django-admin.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -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