projects
/
web/konrad/twig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
e2d2a25
)
Added note about array_merge php function
author
Andrej Hudec
<pulzarraider2@gmail.com>
Sat, 23 Aug 2014 22:31:40 +0000 (
00:31
+0200)
committer
Andrej Hudec
<pulzarraider2@gmail.com>
Sat, 23 Aug 2014 22:31:40 +0000 (
00:31
+0200)
doc/filters/merge.rst
patch
|
blob
|
history
diff --git
a/doc/filters/merge.rst
b/doc/filters/merge.rst
index
05a2ae7
..
cb8b1b2
100644
(file)
--- a/
doc/filters/merge.rst
+++ b/
doc/filters/merge.rst
@@
-39,3
+39,9
@@
overridden.
{% set items = { 'apple': 'unknown' }|merge(items) %}
{# items now contains { 'apple': 'fruit', 'orange': 'fruit' } #}
+
+.. note::
+
+ Internally, Twig uses the PHP `array_merge`_ function.
+
+.. _`array_merge`: http://php.net/array_merge