summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-05-19 12:59:43 -0400
committerTim Graham <timograham@gmail.com>2015-05-19 13:00:45 -0400
commit3908c3cb71b8d66ea152b8e5f0d6f92a6ef8d47e (patch)
tree8280d9ef50f7a0fcedd40d0cad9a510f1a67f021
parentba4237c3b31906aa7cf1c2ec02751b878c962c53 (diff)
Reverted "[1.7.x] Made minor edits to docs/intro/tutorial01.text"
This reverts commit ba4237c3b31906aa7cf1c2ec02751b878c962c53. Claude asked that these fixes not be backported as they affect translations.
-rw-r--r--docs/intro/tutorial01.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index a5195d2250..882586d316 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -128,7 +128,7 @@ These files are:
Database setup
--------------
-Now, open up :file:`mysite/settings.py`. It's a normal Python module with
+Now, edit :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
@@ -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 on your network), use:
+ computers), use:
.. code-block:: console
@@ -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 the quoting of field names -- e.g., using double quotes or
- single quotes.
+ goes for 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
@@ -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 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.
+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.
Read the :doc:`django-admin.py documentation </ref/django-admin>` for full
information on what the ``manage.py`` utility can do.