diff --git a/docs/en/designers/language-builtin-functions/language-function-config-load.xml b/docs/en/designers/language-builtin-functions/language-function-config-load.xml
index 37d50c44..fe840433 100644
--- a/docs/en/designers/language-builtin-functions/language-function-config-load.xml
+++ b/docs/en/designers/language-builtin-functions/language-function-config-load.xml
@@ -114,7 +114,9 @@ pageTitle = "Customer Info"
Config Files
may also contain sections. You can load variables from
within a section with the added attribute
- section.
+ section. Note that global config
+ variables are always loaded along with section variables,
+ and same-named section variables overwrite the globals.
diff --git a/docs/en/designers/language-builtin-functions/language-function-foreach.xml b/docs/en/designers/language-builtin-functions/language-function-foreach.xml
index f1064b86..04cfe4f2 100644
--- a/docs/en/designers/language-builtin-functions/language-function-foreach.xml
+++ b/docs/en/designers/language-builtin-functions/language-function-foreach.xml
@@ -3,10 +3,10 @@
{foreach},{foreachelse}
- {foreach} is used to loop over a
- single associative array,
+ {foreach} is used to loop over an
+ associative array as well a numerically-indexed array,
unlike {section}
- which is for looping over arrays of data.
+ which is for looping over numerically-indexed arrays only.
The syntax for
{foreach} is much easier than
{section},
diff --git a/docs/en/designers/language-builtin-functions/language-function-if.xml b/docs/en/designers/language-builtin-functions/language-function-if.xml
index c5a74000..48477344 100644
--- a/docs/en/designers/language-builtin-functions/language-function-if.xml
+++ b/docs/en/designers/language-builtin-functions/language-function-if.xml
@@ -15,9 +15,10 @@
is_array(), etc.
- If $security is enabled
- then IF_FUNCS array in the $security_settings array.
+ If $security is enabled,
+ only PHP functions from the IF_FUNCS array from $security_settings
+ are allowed.
The following is a list of recognized qualifiers, which must be
@@ -227,7 +228,7 @@
{if} with more examples
\ No newline at end of file
+-->
diff --git a/docs/en/designers/language-modifiers/language-modifier-cat.xml b/docs/en/designers/language-modifiers/language-modifier-cat.xml
index 2d207e4c..70b3ed8b 100644
--- a/docs/en/designers/language-modifiers/language-modifier-cat.xml
+++ b/docs/en/designers/language-modifiers/language-modifier-cat.xml
@@ -17,7 +17,7 @@
Parameter PositionTypeRequired
- cat
+ DefaultDescription
@@ -81,4 +81,4 @@ End:
vim600: syn=xml fen fdm=syntax fdl=2 si
vim: et tw=78 syn=sgml
vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/docs/en/designers/language-modifiers/language-modifier-wordwrap.xml b/docs/en/designers/language-modifiers/language-modifier-wordwrap.xml
index 0a9abfef..579e235a 100644
--- a/docs/en/designers/language-modifiers/language-modifier-wordwrap.xml
+++ b/docs/en/designers/language-modifiers/language-modifier-wordwrap.xml
@@ -85,7 +85,7 @@ $smarty->assign('articleTitle',
{$articleTitle|wordwrap:30:" \n"}
-{$articleTitle|wordwrap:30:"\n":true}
+{$articleTitle|wordwrap:26:"\n":true}
]]>
@@ -108,9 +108,9 @@ Blind woman gets new kidney
from dad she hasn't seen in
years.
-Blind woman gets new kidney
-from dad she hasn't seen in
-years.
+Blind woman gets new kidn
+ey from dad she hasn't se
+en in years.
]]>
diff --git a/docs/en/designers/language-variables.xml b/docs/en/designers/language-variables.xml
index 455d1b7e..88c175e6 100644
--- a/docs/en/designers/language-variables.xml
+++ b/docs/en/designers/language-variables.xml
@@ -30,7 +30,7 @@
Top Tip
-As easy way to examine Smarty variables is with the
+An easy way to examine Smarty variables is with the
debugging console.
diff --git a/docs/en/designers/language-variables/language-variables-smarty.xml b/docs/en/designers/language-variables/language-variables-smarty.xml
index c613e034..1732e6cb 100644
--- a/docs/en/designers/language-variables/language-variables-smarty.xml
+++ b/docs/en/designers/language-variables/language-variables-smarty.xml
@@ -156,7 +156,7 @@ define('MY_CONST_VAL','CHERRIES');
Returns the name of the current template being processed.
The following example shows the container.tpl and the
- included banner.tpl with
+ included banner.tpl with
{$smarty.template} within both.