From: Fabien Potencier Date: Mon, 28 May 2012 06:44:30 +0000 (+0200) Subject: merged branch hhamon/doc_fixes (PR #737) X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=47e9b95c37d20dd40d94ccbb260bc835b6b1d540;p=web%2Fkonrad%2Ftwig.git merged branch hhamon/doc_fixes (PR #737) Commits ------- 953a0ce [doc] fixed Composer section of the introduction. Added a side note to the Composer official documentation for getting more information. Discussion ---------- [doc] fixed twig version in installation documentation. --------------------------------------------------------------------------- by lyrixx at 2012-05-25T23:30:01Z why not use something like "1.*" ? --------------------------------------------------------------------------- by fabpot at 2012-05-26T05:55:16Z This is just an example and we are not going to update it with each new release. So, we can either use `1.*` as suggested by @lyrixx or/and add a note referring to the Composer docs. --------------------------------------------------------------------------- by hhamon at 2012-05-28T05:34:54Z That's better indeed! --------------------------------------------------------------------------- by hhamon at 2012-05-28T05:40:46Z @fabpot you can merge this PR --------------------------------------------------------------------------- by fabpot at 2012-05-28T06:07:05Z Can you squash? --------------------------------------------------------------------------- by hhamon at 2012-05-28T06:31:42Z @fabpot squashed! --- 47e9b95c37d20dd40d94ccbb260bc835b6b1d540