Django

Code

Changeset 2853

Show
Ignore:
Timestamp:
05/05/06 22:31:26 (2 years ago)
Author:
adrian
Message:

Small tweaks to docs/tutorial01.txt

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/docs/tutorial01.txt

    r2832 r2853  
    66 
    77Throughout this tutorial, we'll walk you through the creation of a basic 
    8 blogging application. 
     8poll application. 
    99 
    1010It'll consist of two parts: 
    1111 
    1212    * 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. 
    1414 
    1515We'll assume you have `Django installed`_ already. You can tell Django is 
    …… 
    3434 
    3535(``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 
     38your Python installation. Consider symlinking to ``django-admin.py`` from some 
     39place on your path, such as ``/usr/local/bin``.) 
    3940 
    4041.. admonition:: Where should this code live? 
    …… 
    8182    0 errors found. 
    8283 
    83     Django version 0.92, using settings 'mysite.settings' 
     84    Django version 0.95 (post-magic-removal), using settings 'mysite.settings' 
    8485    Development server is running at http://127.0.0.1:8000/ 
    8586    Quit the server with CONTROL-C (Unix) or CTRL-BREAK (Windows). 
    8687 
    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 
     88You've started the Django development server, a lightweight Web server written 
     89purely in Python. We've included this with Django so you can develop things 
     90rapidly, without having to deal with configuring a production server -- such as 
    9091Apache -- until you're ready for production. 
    9192 
    9293Now'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. 
     94production environment. It's intended only for use while developing. (We're in 
     95the business of making Web frameworks, not Web servers.) 
    9496 
    9597Now that the server's running, visit http://127.0.0.1:8000/ with your Web 
    …… 
    128130.. admonition:: Note 
    129131 
    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 
    132134    database's interactive prompt. 
    133135 
    …… 
    147149      with one Django installation. 
    148150 
    149 These applications are included by default as a convenience for the common case. 
     151These applications are included by default as a convenience for the common 
     152case. 
    150153 
    151154Each of these applications makes use of at least one database table, though,