From: Raul Fraile <raulfraile@gmail.com>
Date: Tue, 13 Mar 2012 16:33:49 +0000 (+0100)
Subject: Updated 'convert_encoding' filter documentation
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=0519419bfd4ff62ce1844fe3a1b7643972cd2ff8;p=web%2Fkonrad%2Ftwig.git

Updated 'convert_encoding' filter documentation
---

diff --git a/doc/filters/convert_encoding.rst b/doc/filters/convert_encoding.rst
index 569b6bf..be40b0d 100644
--- 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