geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-11 18:06:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged branch raulfraile/patch-1 (PR #665)

Browse Source 
Commits
-------

0519419 Updated 'convert_encoding' filter documentation

Discussion
----------

Updated 'convert_encoding' filter documentation

Updated 'convert_encoding' filter documentation to clarify which extension will be used in case both `iconv` and `mbstring` are installed.
This commit is contained in:
Fabien Potencier
2012-03-13 17:44:20 +01:00
parent c5ef990807 0519419bfd
commit f034073fed
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/filters/convert_encoding.rst
+3 -2
View File
@@ -14,8 +14,9 @@ is the input charset:
.. note::
This filter relies on the `iconv`_ or `mbstring`_ extension. So one of
them must be installed.
This filter relies on the `iconv`_ or `mbstring`_ extension, so one of
them must be installed. In case both are installed, `iconv`_ is used
by default.
.. _`iconv`: http://php.net/iconv
.. _`mbstring`: http://php.net/mbstring