Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Remove whitespace at end of lines, wrap lines at 80 characters.

  • Loading branch information...
commit 039ceb70519f23ad924a46be8d13d8b07c4e032a 1 parent 80b07fb
Michael Daugherty mpdaugherty authored

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

  1. +18 18 chapter02.rst
36 chapter02.rst
Source Rendered
@@ -22,9 +22,9 @@ framework is to make sure you have Python installed.
22 22 Python Versions
23 23 ---------------
24 24
25   -The core Django framework (version 1.4+) works with any Python version from 2.5 to 2.7,
26   -inclusive. Django's optional GIS (Geographic Information Systems) support
27   -requires Python 2.5 to 2.7.
  25 +The core Django framework (version 1.4+) works with any Python version from 2.5
  26 +to 2.7, inclusive. Django's optional GIS (Geographic Information Systems)
  27 +support requires Python 2.5 to 2.7.
28 28
29 29 If you're not sure which version of Python to install and you have complete
30 30 freedom over the decision, pick the latest one in the 2.x series: version 2.7.
@@ -51,11 +51,11 @@ Installation
51 51 If you're on Linux or Mac OS X, you probably have Python already installed.
52 52 Type ``python`` at a command prompt (or in Applications/Utilities/Terminal, in
53 53 OS X). If you see something like this, then Python is installed::
54   -
55   - Python 2.7.3rc2 (default, Apr 22 2012, 22:30:17)
  54 +
  55 + Python 2.7.3rc2 (default, Apr 22 2012, 22:30:17)
56 56 [GCC 4.6.3] on linux2
57 57 Type "help", "copyright", "credits" or "license" for more information.
58   - >>>
  58 + >>>
59 59
60 60 Otherwise, you'll need to download and install Python. It's fast and easy, and
61 61 detailed instructions are available at http://www.python.org/download/
@@ -111,7 +111,7 @@ for third-party libraries. Usually it's in a place like
111 111 Installing the "Development" Version
112 112 ------------------------------
113 113
114   -Django uses Git (http://git-scm.com) for its source control. The latest and greatest
  114 +Django uses Git (http://git-scm.com) for its source control. The latest and greatest
115 115 Django development version available from Django's official Git repository
116 116 (https://github.com/django/django). You should consider installing this version
117 117 if you want to work on the bleeding edge, or if you want to contribute code
@@ -120,13 +120,13 @@ to Django itself.
120 120 Git is a free, open source distributed revision-control system, and the Django team
121 121 uses it to manage changes to the Django codebase. You can download and install Git from
122 122 http://git-scm.com/download but it is easier to install with your operating system's
123   -package manager. You can use Git to grab the very latest Django source code
  123 +package manager. You can use Git to grab the very latest Django source code
124 124 and, at any given time, you can update your local version of the Django code
125 125 to get the latest changes and improvements made by Django developers.
126 126
127   -When using the development version, keep in mind there's no guarantee
128   -things won't be broken at any given moment. With that said, though,
129   -some members of the Django team run production sites on development version,
  127 +When using the development version, keep in mind there's no guarantee
  128 +things won't be broken at any given moment. With that said, though,
  129 +some members of the Django team run production sites on development version,
130 130 so they have an incentive to keep it stable.
131 131
132 132 To grab the latest Django trunk, follow these steps:
@@ -174,7 +174,7 @@ Finally, if you use Django development version, you should know how to figure ou
174 174 which version of trunk you're running. Knowing your version number is important
175 175 if you ever need to reach out to the community for help, or if you submit improvements to the
176 176 framework. In these cases, you should tell people the revision, also known
177   -as a "changeset," that you're using. To find out your HEAD changeset,
  177 +as a "changeset," that you're using. To find out your HEAD changeset,
178 178 type "git log -1" from within the ``django`` directory, and
179 179 look for the identifier after "commit". This number changes each time
180 180 Django is changed, whether through a bug fix, feature addition, documentation
@@ -405,14 +405,14 @@ The ``startproject`` command creates a directory containing four files::
405 405
406 406 .. note:: Doesn't match what you see?
407 407
408   - The default project layout recently changed. If you're seeing a
  408 + The default project layout recently changed. If you're seeing a
409 409 "flat" layout (with no inner ``mysite/`` directory), you're probably using
410 410 a version of Django that doesn't match this tutorial version. This book covers
411   - Django 1.4 and above, so if you're using an older version you probably want to
  411 + Django 1.4 and above, so if you're using an older version you probably want to
412 412 consult Django's official documentation.
413   -
  413 +
414 414 The documentation for Django 1.X version is available at https://docs.djangoproject.com/en/1.X/.
415   -
  415 +
416 416 These files are as follows:
417 417
418 418 * ``mysite/``: The outer ``mysite/`` directory is just a container for your project.
@@ -438,7 +438,7 @@ These files are as follows:
438 438 * ``urls.py``: The URLs for this Django project. Think of this as the
439 439 "table of contents" of your Django-powered site.
440 440
441   -* ``wsgi.py``: An entry-point for WSGI-compatible webservers to serve your project.
  441 +* ``wsgi.py``: An entry-point for WSGI-compatible webservers to serve your project.
442 442 See How to deploy with WSGI (https://docs.djangoproject.com/en/1.4/howto/deployment/wsgi/) for more details.
443 443
444 444 Despite their small size, these files already constitute a working Django
@@ -474,7 +474,7 @@ You'll see something like this::
474 474
475 475 This launches the server locally, on port 8000, accessible only to connections
476 476 from your own computer. Now that it's running, visit http://127.0.0.1:8000/
477   -with your Web browser. You might see a different Django version depending on
  477 +with your Web browser. You might see a different Django version depending on
478 478 which version of Django you have installed. You'll see a "Welcome to Django" page shaded in a
479 479 pleasant pastel blue. It worked!
480 480

0 comments on commit 039ceb7

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