diff --git a/CHANGELOG b/CHANGELOG index 8a368fd0c..256f4fe9b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ * 2.0.0 (201X-XX-XX) + * made the loader a required argument of Twig_Environment constructor * removed Twig_Environment::clearTemplateCache() * removed Twig_Autoloader (use Composer instead) * removed `true` as an equivalent to `html` for the auto-escaping strategy diff --git a/doc/recipes.rst b/doc/recipes.rst index 72a259e76..026ee4bce 100644 --- a/doc/recipes.rst +++ b/doc/recipes.rst @@ -103,7 +103,7 @@ syntax. But for specific projects, it can make sense to change the defaults. To change the block delimiters, you need to create your own lexer object:: - $twig = new Twig_Environment(); + $twig = new Twig_Environment(...); $lexer = new Twig_Lexer($twig, array( 'tag_comment' => array('{#', '#}'),