Fixed typos
merged branch pborreli/typos (PR #1028)

This PR was merged into the master branch.

Commits
-------

49488b8 Fixed typos

Discussion
----------

Fixed typos
Adding a section about the slice filter

This code example shows how to loop over a subset of values in order to implement one common use-case of "break" in PHP. I decided to use the "full" notation of slice rather than the sugared version (that example would just be "for user in users[:10]")
Update striptags.rst
Adding link to slice filter per Stof's suggestion
merged branch specialguest/patch-1 (PR #1034)

This PR was merged into the master branch.

Commits
-------

c6ef23a Update striptags.rst

Discussion
----------

Update striptags.rst

Hello

I just changed
{% some_html|striptags %}
to
{{ some_html|striptags }}

Regards

Julien
Revert "merged branch pierrejoye/master (PR #855)"

This reverts commit 347bc81d6ed8e2bb793236aa9917c7e83f81c2b3, reversing
changes made to 5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1.
merged branch tucksaun/fix-5.2-TSRM (PR #1037)

This PR was merged into the master branch.

Discussion
----------

Revert "merged branch pierrejoye/master (PR #855)"

This reverts commit 347bc81d6ed8e2bb793236aa9917c7e83f81c2b3

This commit make compilation failed for PHP5.2 with thread-safe enabled (see https://travis-ci.org/fabpot/Twig/jobs/5523865)

Commits
-------

4383388 Revert "merged branch pierrejoye/master (PR #855)"
minor typo in sort documentation
Fix filename for batch filter documentation
merged branch tommygnr/fix-docs-batch-filter (PR #1040)

This PR was merged into the master branch.

Discussion
----------

Fix filename for batch filter documentation

The documentation on the website for the batch filter currently 404s See: http://twig.sensiolabs.org/doc/filters/batch.html

I believe this is because the filename is incorrect. This PR fixes that.

Commits
-------

bb05942 Fix filename for batch filter documentation
merged branch ricardclau/typo_sort_doc (PR #1039)

This PR was merged into the master branch.

Discussion
----------

Minor typo in sort filter documentation

I've found this small typo while working on shuffle filter documentation in https://github.com/fabpot/Twig/pull/1038

I decided to create separate PR in case https://github.com/fabpot/Twig/pull/1038 got rejected

Best regards!

Commits
-------

1443b76 minor typo in sort documentation
merged branch beryllium/patch-1 (PR #1032)

This PR was merged into the master branch.

Discussion
----------

Adding a section about the slice filter to doc/tags/for.rst

This code example shows how to loop over a subset of values in order to implement one common use-case of "break" in PHP. I decided to use the "full" notation of slice rather than the sugared version (that example would just be "for user in users[:10]")

Commits
-------

202641a Adding link to slice filter per Stof's suggestion
8ebbaaa Adding a section about the slice filter
tweaked previous merge
Merge branch 'master' of https://github.com/fabpot/Twig