Skip to content

Commit

Permalink
[1.7.x] Made minor edits to docs/intro/tutorial01.text
Browse files Browse the repository at this point in the history
Backport of f3b51f5 from master
  • Loading branch information
garwoodpr authored and timgraham committed May 19, 2015
1 parent 4dc85b5 commit ba4237c
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions docs/intro/tutorial01.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ These files are:
Database setup
--------------

Now, edit :file:`mysite/settings.py`. It's a normal Python module with
Now, open up :file:`mysite/settings.py`. It's a normal Python module with
module-level variables representing Django settings.

By default, the configuration uses SQLite. If you're new to databases, or
Expand Down Expand Up @@ -195,7 +195,7 @@ come with Django:

These applications are included by default as a convenience for the common case.

Some of these applications makes use of at least one database table, though,
Some of these applications make use of at least one database table, though,
so we need to create the tables in the database before we can use them. To do
that, run the following command:

Expand Down Expand Up @@ -270,7 +270,7 @@ It worked!

If you want to change the server's IP, pass it along with the port. So to
listen on all public IPs (useful if you want to show off your work on other
computers), use:
computers on your network), use:

.. code-block:: console

Expand Down Expand Up @@ -525,8 +525,8 @@ Note the following:
* It's tailored to the database you're using, so database-specific field types
such as ``auto_increment`` (MySQL), ``serial`` (PostgreSQL), or ``integer
primary key autoincrement`` (SQLite) are handled for you automatically. Same
goes for quoting of field names -- e.g., using double quotes or single
quotes.
goes for the quoting of field names -- e.g., using double quotes or
single quotes.

* The :djadmin:`sqlmigrate` command doesn't actually run the migration on your
database - it just prints it to the screen so that you can see what SQL
Expand Down Expand Up @@ -566,10 +566,10 @@ but for now, remember the three-step guide to making model changes:
* Run :djadmin:`python manage.py migrate <migrate>` to apply those changes to
the database.

The reason there's separate commands to make and apply migrations is because
you'll commit migrations to your version control system and ship them with
your app; they not only make your development easier, they're also useable by
other developers and in production.
The reason that there are separate commands to make and apply migrations is
because you'll commit migrations to your version control system and ship them
with your app; they not only make your development easier, they're also
useable by other developers and in production.

Read the :doc:`django-admin.py documentation </ref/django-admin>` for full
information on what the ``manage.py`` utility can do.
Expand Down

0 comments on commit ba4237c

Please sign in to comment.