Browse code

Update doc to correspond to the following: http://twig.sensiolabs.org/documentation http://twig.sensiolabs.org/doc/filters/escape.html

eadel authored on 10/10/2012 23:22:09
Showing 1 changed files
... ...
@@ -96,10 +96,11 @@ The following options are available:
96 96
 
97 97
 * ``autoescape``: If set to ``true``, auto-escaping will be enabled by default
98 98
   for all templates (default to ``true``). As of Twig 1.8, you can set the
99
-  escaping strategy to use (``html``, ``js``, ``css``, ``false`` to disable,
100
-  or a PHP callback that takes the template "filename" and must return the
101
-  escaping strategy to use -- the callback cannot be a function name to avoid
102
-  collision with built-in escaping strategies).
99
+  escaping strategy to use (``html``, ``js``, ``false`` to disable).
100
+  As of Twig 1.9, you can set the escaping strategy to use (``css``, ``url``, 
101
+  ``html_attr``, or a PHP callback that takes the template "filename" and must 
102
+  return the escaping strategy to use -- the callback cannot be a function name
103
+  to avoid collision with built-in escaping strategies).
103 104
 
104 105
 * ``optimizations``: A flag that indicates which optimizations to apply
105 106
   (default to ``-1`` -- all optimizations are enabled; set it to ``0`` to
... ...
@@ -269,6 +270,13 @@ The ``core`` extension defines all the core features of Twig:
269 270
   * ``from``
270 271
   * ``set``
271 272
   * ``spaceless``
273
+  * ``autoescape``
274
+  * ``do``
275
+  * ``embed``
276
+  * ``flush``
277
+  * ``raw``
278
+  * ``sandbox``
279
+  * ``use``
272 280
 
273 281
 * Filters:
274 282
 
... ...
@@ -291,6 +299,14 @@ The ``core`` extension defines all the core features of Twig:
291 299
   * ``keys``
292 300
   * ``escape``
293 301
   * ``e``
302
+  * ``abs``
303
+  * ``convert_encoding``
304
+  * ``date_modify``
305
+  * ``nl2br``
306
+  * ``number_format``
307
+  * ``raw``
308
+  * ``slice``
309
+  * ``trim``
294 310
 
295 311
 * Functions:
296 312
 
... ...
@@ -299,6 +315,10 @@ The ``core`` extension defines all the core features of Twig:
299 315
   * ``cycle``
300 316
   * ``parent``
301 317
   * ``block``
318
+  * ``attribute``
319
+  * ``date``
320
+  * ``dump``
321
+  * ``random``
302 322
 
303 323
 * Tests:
304 324
 
... ...
@@ -310,6 +330,7 @@ The ``core`` extension defines all the core features of Twig:
310 330
   * ``divisibleby``
311 331
   * ``constant``
312 332
   * ``empty``
333
+  * ``iterable``
313 334
 
314 335
 Escaper Extension
315 336
 ~~~~~~~~~~~~~~~~~