summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorLoic Bistuer <loic.bistuer@sixmedia.com>2013-11-21 21:04:31 +0700
committerBaptiste Mispelon <bmispelon@gmail.com>2013-11-21 15:12:39 +0100
commit27f04e79b1a639b2f6360e9159f003a3db60f567 (patch)
treea635be089d0c81a2250d414e212a05ce639995a4 /docs/ref
parentb6a6cf4ab791b092e18ab16537aa88dd7ae9bc36 (diff)
Fixed #21479 -- Favor 'migrate' over 'syncdb' in the docs.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/gis/layermapping.txt2
-rw-r--r--docs/ref/contrib/gis/tutorial.txt14
-rw-r--r--docs/ref/models/options.txt2
3 files changed, 9 insertions, 9 deletions
diff --git a/docs/ref/contrib/gis/layermapping.txt b/docs/ref/contrib/gis/layermapping.txt
index 381c7df133..376c6115b1 100644
--- a/docs/ref/contrib/gis/layermapping.txt
+++ b/docs/ref/contrib/gis/layermapping.txt
@@ -52,7 +52,7 @@ Example
PRIMEM["Greenwich",0],
UNIT["Degree",0.017453292519943295]]
-2. Now we define our corresponding Django model (make sure to use ``syncdb``)::
+2. Now we define our corresponding Django model (make sure to use :djadmin:`migrate`)::
from django.contrib.gis.db import models
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 99a4814f3d..17ce1edbf0 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -262,8 +262,8 @@ argument. Use an integer representing the coordinate system's EPSG code.
__ http://en.wikipedia.org/wiki/SRID
-Run ``syncdb``
---------------
+Run ``migrate``
+---------------
After defining your model, you need to sync it with the database. First,
let's look at the SQL that will generate the table for the
@@ -296,14 +296,14 @@ This command should produce the following output:
CREATE INDEX "world_worldborder_mpoly_id" ON "world_worldborder" USING GIST ( "mpoly" GIST_GEOMETRY_OPS );
COMMIT;
-If this looks correct, run ``syncdb`` to create this table in the database::
+If this looks correct, run :djadmin:`migrate` to create this table in the database::
- $ python manage.py syncdb
+ $ python manage.py migrate
Creating table world_worldborder
Installing custom SQL for world.WorldBorder model
-The ``syncdb`` command may also prompt you to create an admin user. Either
-do so now, or later by running ``django-admin.py createsuperuser``.
+The :djadmin:`migrate` command may also prompt you to create an admin user.
+Either do so now, or later by running ``django-admin.py createsuperuser``.
Importing Spatial Data
======================
@@ -742,7 +742,7 @@ Start up the Django development server:
$ python manage.py runserver
Finally, browse to ``http://localhost:8000/admin/``, and log in with the admin
-user created after running ``syncdb``. Browse to any of the ``WorldBorder``
+user created after running :djadmin:`migrate`. Browse to any of the ``WorldBorder``
entries -- the borders may be edited by clicking on a polygon and dragging
the vertexes to the desired position.
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
index 22ced5fe7d..c1bf34ba86 100644
--- a/docs/ref/models/options.txt
+++ b/docs/ref/models/options.txt
@@ -263,7 +263,7 @@ Django quotes column and table names behind the scenes.
Defaults to ``('add', 'change', 'delete')``. You may customize this list,
for example, by setting this to an empty list if your app doesn't require
any of the default permissions. It must be specified on the model before
- the model is created by :djadmin:`syncdb` in order to prevent any omitted
+ the model is created by :djadmin:`migrate` in order to prevent any omitted
permissions from being created.
``proxy``