Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge with upstream

  • Loading branch information...
commit b05113af3a39a4e8af737e84a5c234293b5c4a3b 2 parents f0734a3 + ed376a4
Michael Daugherty mpdaugherty authored

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

  1. +14 14 chapter02.rst
28 chapter02.rst
Source Rendered
@@ -49,11 +49,11 @@ Installation
49 49 If you're on Linux or Mac OS X, you probably have Python already installed.
50 50 Type ``python`` at a command prompt (or in Applications/Utilities/Terminal, in
51 51 OS X). If you see something like this, then Python is installed::
52   -
53   - Python 2.7.3rc2 (default, Apr 22 2012, 22:30:17)
  52 +
  53 + Python 2.7.3rc2 (default, Apr 22 2012, 22:30:17)
54 54 [GCC 4.6.3] on linux2
55 55 Type "help", "copyright", "credits" or "license" for more information.
56   - >>>
  56 + >>>
57 57
58 58 Otherwise, you'll need to download and install Python. It's fast and easy, and
59 59 detailed instructions are available at http://www.python.org/download/
@@ -74,7 +74,7 @@ in the documentation and by members of the community.
74 74 Installing an Official Release
75 75 ------------------------------
76 76
77   -Official releases have a version number, such as 1.4.2 or 1.4, and the latest
  77 +Official releases have a version number, such as 1.4.2, 1.4.1 or 1.4, and the latest
78 78 one is always available at http://www.djangoproject.com/download/.
79 79
80 80 If you're on a Linux distribution that includes a package of Django, it's a
@@ -128,7 +128,7 @@ won't be broken at any given moment. With that said, though, some members of the
128 128 Django team run production sites on the development version, so they have an
129 129 incentive to keep it stable.
130 130
131   -To grab the latest Django development version, follow these steps:
  131 +To grab the latest Django, follow these steps:
132 132
133 133 #. Make sure you have Git installed. You can get the
134 134 software free from http://git-scm.com/, and you can find
@@ -161,7 +161,7 @@ To grab the latest Django development version, follow these steps:
161 161 After downloading from Git and following the preceding steps, there's no
162 162 need to run ``python setup.py install``-- you've just done the work by hand!
163 163
164   -Because the Django development version changes often with bug fixes and feature
  164 +Because the Django code changes often with bug fixes and feature
165 165 additions, you'll probably want to update it every once in a while. To update
166 166 the code, just run the command ``git pull origin master`` from within the
167 167 ``djmaster`` directory. When you run that command, Git will contact
@@ -174,7 +174,7 @@ out which version of Django you're running. Knowing your version number is
174 174 important if you ever need to reach out to the community for help, or if you
175 175 submit improvements to the framework. In these cases, you should tell people the
176 176 revision, also known as a "commit," that you're using. To find out your current
177   -commit (the most recent commit is often called HEAD), type "git log -1" from
  177 +commit, type "git log -1" from
178 178 within the ``django`` directory, and look for the identifier after
179 179 "commit". This number changes each time Django is changed, whether through a bug
180 180 fix, feature addition, documentation improvement or anything else.
@@ -190,7 +190,7 @@ successful, you should be able to import the module ``django``:
190 190
191 191 >>> import django
192 192 >>> django.VERSION
193   - (1, 4, 1, 'final', 0)
  193 + (1, 4, 2, 'final', 0)
194 194
195 195 .. admonition:: Interactive Interpreter Examples
196 196
@@ -389,14 +389,14 @@ The ``startproject`` command creates a directory containing five files::
389 389
390 390 .. note:: Doesn't match what you see?
391 391
392   - The default project layout recently changed. If you're seeing a
  392 + The default project layout recently changed. If you're seeing a
393 393 "flat" layout (with no inner ``mysite/`` directory), you're probably using
394 394 a version of Django that doesn't match this tutorial version. This book covers
395   - Django 1.4 and above, so if you're using an older version you probably want to
  395 + Django 1.4 and above, so if you're using an older version you probably want to
396 396 consult Django's official documentation.
397   -
  397 +
398 398 The documentation for Django 1.X version is available at https://docs.djangoproject.com/en/1.X/.
399   -
  399 +
400 400 These files are as follows:
401 401
402 402 * ``mysite/``: The outer ``mysite/`` directory is just a container for your project.
@@ -422,7 +422,7 @@ These files are as follows:
422 422 * ``urls.py``: The URLs for this Django project. Think of this as the
423 423 "table of contents" of your Django-powered site.
424 424
425   -* ``wsgi.py``: An entry-point for WSGI-compatible webservers to serve your project.
  425 +* ``wsgi.py``: An entry-point for WSGI-compatible webservers to serve your project.
426 426 See How to deploy with WSGI (https://docs.djangoproject.com/en/1.4/howto/deployment/wsgi/) for more details.
427 427
428 428 Despite their small size, these files already constitute a working Django
@@ -458,7 +458,7 @@ You'll see something like this::
458 458
459 459 This launches the server locally, on port 8000, accessible only to connections
460 460 from your own computer. Now that it's running, visit http://127.0.0.1:8000/
461   -with your Web browser. You might see a different Django version depending on
  461 +with your Web browser. You might see a different Django version depending on
462 462 which version of Django you have installed. You'll see a "Welcome to Django" page shaded in a
463 463 pleasant pastel blue. It worked!
464 464

0 comments on commit b05113a

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