projects
/
web/konrad/twig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
c5ef990
)
Updated 'convert_encoding' filter documentation
author
Raul Fraile
<raulfraile@gmail.com>
Tue, 13 Mar 2012 16:33:49 +0000 (17:33 +0100)
committer
Raul Fraile
<raulfraile@gmail.com>
Tue, 13 Mar 2012 16:33:49 +0000 (17:33 +0100)
doc/filters/convert_encoding.rst
patch
|
blob
|
history
diff --git
a/doc/filters/convert_encoding.rst
b/doc/filters/convert_encoding.rst
index
569b6bf
..
be40b0d
100644
(file)
--- a/
doc/filters/convert_encoding.rst
+++ b/
doc/filters/convert_encoding.rst
@@
-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