[1.7.x] Document --fake and --list on migrate command

1 files changed, 23 insertions, 1 deletions

diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index de5fa27df5..4bebb53443 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -684,7 +684,29 @@ The behavior of this command changes depending on the arguments provided:
 * ``<app_label> <migrationname>``: Brings the database schema to a state where it
   would have just run the given migration, but no further - this may involve
   unapplying migrations if you have previously migrated past the named
-  migration. Use the name `zero` to unapply all migrations for an app.
+  migration. Use the name ``zero`` to unapply all migrations for an app.
+
+.. django-admin-option:: --fake
+
+The ``--fake`` option tells Django to mark the migrations as having been
+applied or unapplied, but without actually running the SQL to change your
+database schema.
+
+This is intended for advanced users to manipulate the
+current migration state directly if they're manually applying changes;
+be warned that using ``--fake`` runs the risk of putting the migration state
+table into a state where manual recovery will be needed to make migrations
+run correctly.
+
+.. django-admin-option:: --list
+
+The ``--list`` option will list all of the apps Django knows about, the
+migrations available for each app and if they are applied or not (marked by
+an ``[X]`` next to the migration name).
+
+Apps without migrations are also included in the list, but will have
+``(no migrations)`` printed under them.
+
 
 runfcgi [options]
 -----------------