From b9232cd955496b69444ca458fa2ba45ab9e25c34 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Thu, 12 Jul 2007 14:41:32 +0000
Subject: [PATCH] Fixed #4538 -- Split the installation instructions to
 differentiate between installing a distribution package and installing an
 official release. Thanks to Carl Karsten for the idea, and Paul Bissex for
 the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/install.txt | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/docs/install.txt b/docs/install.txt
index e850e48955..1b2919f1bc 100644
--- a/docs/install.txt
+++ b/docs/install.txt
@@ -109,25 +109,29 @@ Install the Django code
 =======================
 
 Installation instructions are slightly different depending on whether you're
-using the latest official version or the latest development version.
+installing a distribution-specific package, downloading the the latest official
+release, or fetching the latest development version.
 
-It's easy either way.
+It's easy, no matter which way you choose.
 
-Installing the official version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Installing a distribution-specific package
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    1. Check the `distribution specific notes`_ to see if your
-       platform/distribution provides official Django packages/installers.
-       Distribution-provided packages will typically allow for automatic
-       installation of dependancies and easy upgrade paths.
+Check the `distribution specific notes`_ to see if your
+platform/distribution provides official Django packages/installers.
+Distribution-provided packages will typically allow for automatic
+installation of dependancies and easy upgrade paths.
 
-    2. Download the latest release from our `download page`_.
+Installing an official release
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    3. Untar the downloaded file (e.g. ``tar xzvf Django-NNN.tar.gz``).
+    1. Download the latest release from our `download page`_.
 
-    4. Change into the downloaded directory (e.g. ``cd Django-NNN``).
+    2. Untar the downloaded file (e.g. ``tar xzvf Django-NNN.tar.gz``).
 
-    5. Run ``sudo python setup.py install``.
+    3. Change into the downloaded directory (e.g. ``cd Django-NNN``).
+
+    4. Run ``sudo python setup.py install``.
 
 The command will install Django in your Python installation's ``site-packages``
 directory.