summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timgraham@google.com>2012-06-20 20:03:06 -0400
committerTim Graham <timgraham@google.com>2012-06-27 18:56:04 -0400
commit9014b138e6d78aa5fef2c63b8e482379005d32b2 (patch)
tree8123cc7003aebc19a7a81a350e34a67f14654962 /docs
parent3631a028e2d8eef9ade7b174d9cbe1440d4acfad (diff)
[1.4.X] Fixed #17511 - Removed reference to deprecated "reset" management command in FAQ; thanks voxpuibr@ for the report.
Backport of c8928b91b5 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/models.txt11
-rw-r--r--docs/ref/django-admin.txt4
2 files changed, 6 insertions, 9 deletions
diff --git a/docs/faq/models.txt b/docs/faq/models.txt
index c9f1a03fb1..2d1a382457 100644
--- a/docs/faq/models.txt
+++ b/docs/faq/models.txt
@@ -42,18 +42,15 @@ Yes. See :doc:`Integrating with a legacy database </howto/legacy-databases>`.
If I make changes to a model, how do I update the database?
-----------------------------------------------------------
-If you don't mind clearing data, your project's ``manage.py`` utility has an
-option to reset the SQL for a particular application::
-
- manage.py reset appname
-
-This drops any tables associated with ``appname`` and recreates them.
+If you don't mind clearing data, your project's ``manage.py`` utility has a
+:djadmin:`flush` option to reset the database to the state it was in
+immediately after :djadmin:`syncdb` was executed.
If you do care about deleting data, you'll have to execute the ``ALTER TABLE``
statements manually in your database.
There are `external projects which handle schema updates
-<http://djangopackages.com/grids/g/database-migration/>`_, of which the current
+<http://www.djangopackages.com/grids/g/database-migration/>`_, of which the current
defacto standard is `south <http://south.aeracode.org/>`_.
Do Django models support multiple-column primary keys?
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 7650951e22..e1a6e7cbef 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -232,8 +232,8 @@ flush
.. django-admin:: flush
-Returns the database to the state it was in immediately after syncdb was
-executed. This means that all data will be removed from the database, any
+Returns the database to the state it was in immediately after :djadmin:`syncdb`
+was executed. This means that all data will be removed from the database, any
post-synchronization handlers will be re-executed, and the ``initial_data``
fixture will be re-installed.