From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 14 Jun 2012 13:07:01 +0000 (+0200)
Subject: fixed doc (closes #744)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=793660510f6424adc738ccd76be8e76ba827cee0;p=konrad%2Ftwig.git

fixed doc (closes #744)
---

diff --git a/doc/filters/convert_encoding.rst b/doc/filters/convert_encoding.rst
index be40b0d..2febab2 100644
--- a/doc/filters/convert_encoding.rst
+++ b/doc/filters/convert_encoding.rst
@@ -15,8 +15,8 @@ is the input charset:
 .. note::
 
     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.
+    them must be installed. In case both are installed, `mbstring`_ is used by
+    default (Twig before 1.8.1 uses `iconv`_ by default).
 
 .. _`iconv`:    http://php.net/iconv
 .. _`mbstring`: http://php.net/mbstring