carlwitt 59d0eed9f7 Update merge.rst ...

Typo in first line:
The merge filter merges an array with [removed: the] another array

2013-03-04 10:54:34 +01:00

..

filters

Update merge.rst

2013-03-04 10:54:34 +01:00

functions

ordered tags, filters, functions, and tests in doc indexes

2013-02-21 07:47:52 +01:00

tags

ordered tags, filters, functions, and tests in doc indexes

2013-02-21 07:47:52 +01:00

tests

ordered tags, filters, functions, and tests in doc indexes

2013-02-21 07:47:52 +01:00

advanced_legacy.rst

…

advanced.rst

fixed small typo in the docs

2012-12-11 15:30:16 +01:00

api.rst

removed list of built-in items in the docs in favor of a link (easier to maintain and better for discoverability)

2013-01-31 11:19:12 +01:00

coding_standards.rst

…

deprecated.rst

relaxed globals management to avoid a BC break (closes #965)

2013-01-15 20:48:33 +01:00

index.rst

…

internals.rst

…

intro.rst

Fixes and minor additions to the docs.

2013-01-31 09:30:58 +01:00

recipes.rst

Fixes and minor additions to the docs.

2013-01-31 09:30:58 +01:00

templates.rst

added a note about how to use quotes in strings (closes #973)

2013-02-08 19:58:08 +01:00