geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 10:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged branch hhamon/doc_fixes (PR #737)

Browse Source 
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!
This commit is contained in:
Fabien Potencier
2012-05-28 08:44:30 +02:00
parent 45d0f6fe67 953a0ce602
commit 47e9b95c37
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/intro.rst
+6 -1
View File
@@ -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