diff --git a/docs/en/designers/language-basic-syntax/language-syntax-functions.xml b/docs/en/designers/language-basic-syntax/language-syntax-functions.xml index 748e45a6..2a2a1e2e 100644 --- a/docs/en/designers/language-basic-syntax/language-syntax-functions.xml +++ b/docs/en/designers/language-basic-syntax/language-syntax-functions.xml @@ -9,7 +9,7 @@ function and its attributes within delimiters like so: {funcname - attr1='val1' attrto='val2'}. + attr1='val1' attr2='val2'}. function syntax @@ -18,7 +18,7 @@ {config_load file='colors.conf'} {include file='header.tpl'} -{insert file='banner_ads.tpl'} +{insert file='banner_ads.tpl' title='Smarty is cool'} {if $logged_in} Welcome, {$name}! @@ -26,7 +26,7 @@ hi, {$name} {/if} -{include file='footer.tpl'} +{include file='footer.tpl' ad=$random_id} ]]> diff --git a/docs/en/designers/language-basic-syntax/language-syntax-variables.xml b/docs/en/designers/language-basic-syntax/language-syntax-variables.xml index 0750cdbb..b1d009ed 100644 --- a/docs/en/designers/language-basic-syntax/language-syntax-variables.xml +++ b/docs/en/designers/language-basic-syntax/language-syntax-variables.xml @@ -47,7 +47,7 @@ Many other combinations are allowed - Request variables such as $_GET, $_SESSION etc are available with the + Request variables such as $_GET, $_SESSION etc are available via the $smarty reserved variable. diff --git a/docs/en/designers/language-builtin-functions/language-function-capture.xml b/docs/en/designers/language-builtin-functions/language-function-capture.xml index efd761d1..e463e717 100644 --- a/docs/en/designers/language-builtin-functions/language-function-capture.xml +++ b/docs/en/designers/language-builtin-functions/language-function-capture.xml @@ -13,8 +13,9 @@ template from the variable $smarty.capture.foo where "foo" is the value passed in the name attribute. If you do not - supply a name attribute, then "default" will be used as in $smarty.capture.default. - You can nest capture commands. + supply a name attribute, then "default" will be used as the name + ie $smarty.capture.default + {capture}'s can be nested. diff --git a/docs/en/designers/language-modifiers/language-modifier-escape.xml b/docs/en/designers/language-modifiers/language-modifier-escape.xml index 3e767f3b..333fedc5 100644 --- a/docs/en/designers/language-modifiers/language-modifier-escape.xml +++ b/docs/en/designers/language-modifiers/language-modifier-escape.xml @@ -3,7 +3,7 @@ escape - This is used to encode/escape and a variable to html url single quotes, hex escape, hexentity, javascript and mail escape. + This is used to encode/escape a variable to html url single quotes, hex escape, hexentity, javascript and mail escape. By default its html escaped. @@ -74,6 +74,7 @@ $smarty->assign('EmailAddress','smarty@example.com'); {$articleTitle|escape:'quotes'} {$EmailAddress|escape:"hexentity"} {$EmailAddress|escape:'mail'} {* this converts to email to text *} +{'mail@example.com'|escape:'mail'} ]]> @@ -89,6 +90,7 @@ $smarty->assign('EmailAddress','smarty@example.com'); \'Stiff Opposition Expected to Casketless Funeral Plan\' bob..snip..et smarty [AT] example [DOT] com +mail [AT] example [DOT] com ]]> Note that native PHP functions can be used as modifiers so this will work