Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Small tweaks to docs/tutorial01.txt

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0c31254376c93eb90753bc3bb974296c6d5e19c5 1 parent 058ab89
Adrian Holovaty authored May 06, 2006

Showing 1 changed file with 16 additions and 13 deletions. Show diff stats Hide diff stats

  1. 29  docs/tutorial01.txt
29  docs/tutorial01.txt
@@ -5,12 +5,12 @@ Writing your first Django app, part 1
5 5
 Let's learn by example.
6 6
 
7 7
 Throughout this tutorial, we'll walk you through the creation of a basic
8  
-blogging application.
  8
+poll application.
9 9
 
10 10
 It'll consist of two parts:
11 11
 
12 12
     * A public site that lets people view polls and vote in them.
13  
-    * An admin site that lets you add, change and delete polls.
  13
+    * An admin site that lets you add, change and delete poll.
14 14
 
15 15
 We'll assume you have `Django installed`_ already. You can tell Django is
16 16
 installed by running the Python interactive interpreter and typing
@@ -33,9 +33,10 @@ code, then run the command ``django-admin.py startproject mysite``. This
33 33
 will create a ``mysite`` directory in your current directory.
34 34
 
35 35
 (``django-admin.py`` should be on your system path if you installed Django via
36  
-its ``setup.py`` utility. If it's not on your path, you can find it in
37  
-``site-packages/django/bin``; consider symlinking to it from some place
38  
-on your path, such as ``/usr/local/bin``.)
  36
+``python setup.py``. If it's not on your path, you can find it in
  37
+``site-packages/django/bin``, where ``site-packages`` is a directory within
  38
+your Python installation. Consider symlinking to ``django-admin.py`` from some
  39
+place on your path, such as ``/usr/local/bin``.)
39 40
 
40 41
 .. admonition:: Where should this code live?
41 42
 
@@ -80,17 +81,18 @@ the following output on the command line::
80 81
     Validating models...
81 82
     0 errors found.
82 83
 
83  
-    Django version 0.92, using settings 'mysite.settings'
  84
+    Django version 0.95 (post-magic-removal), using settings 'mysite.settings'
84 85
     Development server is running at http://127.0.0.1:8000/
85 86
     Quit the server with CONTROL-C (Unix) or CTRL-BREAK (Windows).
86 87
 
87  
-You've started the Django development server, a lightweight, pure-Python Web
88  
-server. We've included this with Django so you can develop things rapidly,
89  
-without having to deal with configuring a production server -- such as
  88
+You've started the Django development server, a lightweight Web server written
  89
+purely in Python. We've included this with Django so you can develop things
  90
+rapidly, without having to deal with configuring a production server -- such as
90 91
 Apache -- until you're ready for production.
91 92
 
92 93
 Now's a good time to note: DON'T use this server in anything resembling a
93  
-production environment. It's intended only for use while developing.
  94
+production environment. It's intended only for use while developing. (We're in
  95
+the business of making Web frameworks, not Web servers.)
94 96
 
95 97
 Now that the server's running, visit http://127.0.0.1:8000/ with your Web
96 98
 browser. You'll see a "Welcome to Django" page, in pleasant, light-blue pastel.
@@ -127,8 +129,8 @@ database's connection parameters:
127 129
 
128 130
 .. admonition:: Note
129 131
 
130  
-    Make sure you've created a database within PostgreSQL or MySQL by this
131  
-    point. Do that with "``CREATE DATABASE database_name;``" within your
  132
+    If you're using PostgreSQL or MySQL, make sure you've created a database by
  133
+    this point. Do that with "``CREATE DATABASE database_name;``" within your
132 134
     database's interactive prompt.
133 135
 
134 136
 While you're editing ``settings.py``, take note of the ``INSTALLED_APPS``
@@ -146,7 +148,8 @@ with Django:
146 148
     * ``django.contrib.sites`` -- A framework for managing multiple sites
147 149
       with one Django installation.
148 150
 
149  
-These applications are included by default as a convenience for the common case.
  151
+These applications are included by default as a convenience for the common
  152
+case.
150 153
 
151 154
 Each of these applications makes use of at least one database table, though,
152 155
 so we need to create the tables in the database before we can use them. To do

0 notes on commit 0c31254

Please sign in to comment.
Something went wrong with that request. Please try again.