From: Hugo Hamon <hugo.hamon@sensio.com>
Date: Fri, 25 May 2012 20:16:33 +0000 (+0200)
Subject: [doc] fixed Composer section of the introduction. Added a side note to the Composer... 
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=953a0ce602c70553b8a4c5ffdd9f872c0ae81597;p=web%2Fkonrad%2Ftwig.git

[doc] fixed Composer section of the introduction. Added a side note to the Composer official documentation for getting more information.
---

diff --git a/doc/intro.rst b/doc/intro.rst
index f75ff19..f9dc226 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -68,7 +68,7 @@ Installing via Composer
 
     {
         "require": {
-            "twig/twig": "1.6.0"
+            "twig/twig": "1.*"
         }
     }
 
@@ -78,6 +78,10 @@ Installing via Composer
 
     php composer.phar install
 
+.. note::
+    If you want to learn more about Composer, the ``composer.json`` file syntax
+    and its usage, you can read the `online documentation`_.
+
 Installing the C extension
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -152,4 +156,5 @@ filesystem loader::
     echo $twig->render('index.html', array('name' => 'Fabien'));
 
 .. _`download page`: https://github.com/fabpot/Twig/tags
+.. _`online documentation`: http://getcomposer.org/doc
 .. _`pre-build DLL`: https://github.com/stealth35/stealth35.github.com/downloads