Docs tweaks (thanks timgraham)

This commit is contained in:
Andrew Godwin 2013-08-10 20:00:12 +01:00
parent 3c3d308ea3
commit 7970d97a70
9 changed files with 38 additions and 31 deletions

View file

@ -575,20 +575,22 @@ makemigrations [<appname>]
.. django-admin:: makemigrations
.. versionadded:: 1.7
Creates new migrations based on the changes detected to your models.
Migrations, their relationship with apps and more are covered in depth in
:doc:`the migrations documentation</topics/migrations>`.
Providing one or more app names as arguments will limit the migrations created
to the app specified and any dependencies needed (the table at the other end
of a ForeignKey, for example)
to the app(s) specified and any dependencies needed (the table at the other end
of a ``ForeignKey``, for example).
.. django-admin-option:: --empty
The ``--empty`` option will cause ``makemigrations`` to output an empty
migration for the specified apps, for manual editing. This option is only
for advanced users and should not be used unless you are familiar with
the migration format, migration operations and the dependencies between
the migration format, migration operations, and the dependencies between
your migrations.
migrate [<appname> [<migrationname>]]
@ -596,11 +598,13 @@ migrate [<appname> [<migrationname>]]
.. django-admin:: migrate
Synchronises the database state with the current set of models and migrations.
.. versionadded:: 1.7
Synchronizes the database state with the current set of models and migrations.
Migrations, their relationship with apps and more are covered in depth in
:doc:`the migrations documentation</topics/migrations>`.
The behaviour of this command changes depending on the arguments provided:
The behavior of this command changes depending on the arguments provided:
* No arguments: All migrated apps have all of their migrations run,
and all unmigrated apps are synchronized with the database,

View file

@ -403,7 +403,6 @@ Arguments sent with this signal:
``db``
The alias of database on which a command will operate.
pre_syncdb
----------
@ -421,7 +420,6 @@ is present, for backwards-compatability this signal has an extra argument it sen
A list of the model classes from any app which :djadmin:`migrate` is
going to create, **only if the app has no migrations**.
post_migrate
------------
@ -479,7 +477,6 @@ For example, ``yourapp/management/__init__.py`` could be written like::
post_migrate.connect(my_callback, sender=yourapp.models)
post_syncdb
-----------
@ -497,8 +494,6 @@ is present, for backwards-compatability this signal has an extra argument it sen
A list of the model classes from any app which :djadmin:`migrate` has
created, **only if the app has no migrations**.
Request/response signals
========================