tweaked documentation
tweaked doc for the merge filter
added string support for the reverse filter
fixed core filters phpdoc
added a slice filter
added support for optional length in the slice [] notation
Added a link to the documentation site
fixed CS
merged branch aerialls/patch-2 (PR #597)

Commits
-------

924c8b3 fixed CS

Discussion
----------

fixed CS
merged branch lyrixx/patch-4 (PR #596)

Commits
-------

fa2501f Added a link to the documentation site

Discussion
----------

Added a link to the documentation site

Now, on the github project page, there is a link to http://twig.sensiolabs.org/documentation. (like silex)
made a cosmetic change
Syncing Twig extension with latest changes in Twig master
merged branch Partugal/twig-ext (PR #598)

Commits
-------

75bfb4e Syncing Twig extension with latest changes in Twig master

Discussion
----------

Syncing Twig extension with latest changes in Twig master
Reset globals when a new global is added
Reset parsers, visitors, filters, tests, functions when a new one or new extension is added
merged branch Seldaek/globals_fix (PR #600)

Commits
-------

43ebae1 Reset parsers, visitors, filters, tests, functions when a new one or new extension is added
3db62da Reset globals when a new global is added

Discussion
----------

Reset globals when a new global is added

if getGlobals() is called before adding a new global, it is never taken into account

---------------------------------------------------------------------------

by fabpot at 2012-01-16T14:27:02Z

Is it related to #594?

---------------------------------------------------------------------------

by Seldaek at 2012-01-16T14:30:08Z

Seems like it yes. It means that reading globals + writing + reading again will call getGlobals on all extensions again though.

A slight improvement would be to cache the extension globals in another var that can be re-applied at once over the staged globals.

The fastest would be to just set directly in ->globals if it's already initalized, but that means addGlobal can override extension globals. Not sure if that is a problem, but it creates a somewhat non-deterministic factor.

I can adjust as required.

---------------------------------------------------------------------------

by stof at 2012-01-16T14:45:49Z

@Seldaek shouldn't the same be done for other methods (filters, functions, tags, tests and operators) ?

---------------------------------------------------------------------------

by Seldaek at 2012-01-16T14:53:28Z

Indeed, I was just focused on my crazy issue here :) Once @fabpot decides which way he prefers I can apply it to everything.

---------------------------------------------------------------------------

by fabpot at 2012-01-16T21:05:19Z

+1 for the the approach in this PR. @Seldaek: Can you apply it to everything else as well? Thanks.

---------------------------------------------------------------------------

by Seldaek at 2012-01-17T00:54:08Z

Done, also did it for adding and removing extensions since they potentially override stuff.
cast $name to a string as $name can in fact be an object implementing __toString function as true in my case.
fixed typo in doc (closes #604)
typo
merged branch Tobion/patch-2 (PR #606)

Commits
-------

83a3073 typo

Discussion
----------

typo