From: Bilal Amarni <bilal.amarni@gmail.com>
Date: Wed, 16 Jan 2013 13:17:17 +0000 (+0100)
Subject: [doc] Installation - recommended Composer instead of tarball
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=d5de5e6d3b5a2d34b722d203a61ff4f7827fa510;p=web%2Fkonrad%2Ftwig.git

[doc] Installation - recommended Composer instead of tarball
---

diff --git a/doc/intro.rst b/doc/intro.rst
index 69ffe64..4d37635 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -29,32 +29,10 @@ Twig needs at least **PHP 5.2.4** to run.
 Installation
 ------------
 
-You have multiple ways to install Twig. If you are unsure what to do, go with
-the tarball.
+You have multiple ways to install Twig.
 
-Installing from the tarball release
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-1. Download the most recent tarball from the `download page`_
-2. Unpack the tarball
-3. Move the files somewhere in your project
-
-Installing the development version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-1. Install Subversion or Git
-2. For Git: ``git clone git://github.com/fabpot/Twig.git``
-3. For Subversion: ``svn co http://svn.twig-project.org/trunk/ twig``
-
-Installing the PEAR package
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-1. Install PEAR
-2. ``pear channel-discover pear.twig-project.org``
-3. ``pear install twig/Twig`` (or ``pear install twig/Twig-beta``)
-
-Installing via Composer
-~~~~~~~~~~~~~~~~~~~~~~~
+Installing via Composer (recommended)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 1. Install composer in your project:
 
@@ -82,6 +60,28 @@ Installing via Composer
     If you want to learn more about Composer, the ``composer.json`` file syntax
     and its usage, you can read the `online documentation`_.
 
+Installing from the tarball release
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Download the most recent tarball from the `download page`_
+2. Unpack the tarball
+3. Move the files somewhere in your project
+
+Installing the development version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Install Subversion or Git
+2. For Git: ``git clone git://github.com/fabpot/Twig.git``
+3. For Subversion: ``svn co http://svn.twig-project.org/trunk/ twig``
+
+Installing the PEAR package
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Install PEAR
+2. ``pear channel-discover pear.twig-project.org``
+3. ``pear install twig/Twig`` (or ``pear install twig/Twig-beta``)
+
+
 Installing the C extension
 ~~~~~~~~~~~~~~~~~~~~~~~~~~