cvs: smarty /docs/en/designers language-variables.xml /docs/en/designers/language-builtin-functions language-function-config-load.xml
language-function-foreach.xml language-function-if.xml /docs/en/designers/language-modifiers language-modifier-cat.xml language-modifier-wordwrap.xml
/docs/en/designers/language-variables language-variables-smarty.xml

mohrt Thu May 3 16:01:42 2007 UTC Modified files: /smarty/docs/en/designers language-variables.xml /smarty/docs/en/designers/language-builtin-functions language-function-config-load.xml language-function-foreach.xml language-function-if.xml /smarty/docs/en/designers/language-modifiers language-modifier-cat.xml language-modifier-wordwrap.xml /smarty/docs/en/designers/language-variables language-variables-smarty.xml Log: update documentation corrections from marcello in the forums. Thanks marcello!

http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-variables.xml?r1=1.8&r2=1.9&diff_format=u Index: smarty/docs/en/designers/language-variables.xml diff -u smarty/docs/en/designers/language-variables.xml:1.8 smarty/docs/en/designers/language-variables.xml:1.9 --- smarty/docs/en/designers/language-variables.xml:1.8 Tue Sep 26 03:45:51 2006 +++ smarty/docs/en/designers/language-variables.xml Thu May 3 16:01:42 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <chapter id="language.variables"> <title>Variables</title> <para> @@ -30,7 +30,7 @@ </example> <note> <title>Top Tip</title> -<para>As easy way to examine Smarty variables is with the +<para>An easy way to examine Smarty variables is with the <link linkend="chapter.debugging.console">debugging console</link>. </para> </note> http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-builtin-functions/language-function-config-load.xml?r1=1.12&r2=1.13&diff_format=u Index: smarty/docs/en/designers/language-builtin-functions/language-function-config-load.xml diff -u smarty/docs/en/designers/language-builtin-functions/language-function-config-load.xml:1.12 smarty/docs/en/designers/language-builtin-functions/language-function-config-load.xml:1.13 --- smarty/docs/en/designers/language-builtin-functions/language-function-config-load.xml:1.12 Mon Sep 25 21:47:31 2006 +++ smarty/docs/en/designers/language-builtin-functions/language-function-config-load.xml Thu May 3 16:01:42 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.13 $ --> <sect1 id="language.function.config.load"> <title>{config_load}</title> <para> @@ -114,7 +114,9 @@ <link linkend="config.files">Config Files</link> may also contain sections. You can load variables from within a section with the added attribute - <parameter>section</parameter>. + <parameter>section</parameter>. Note that global config + variables are always loaded along with section variables, + and same-named section variables overwrite the globals. </para> <note> <para> http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-builtin-functions/language-function-foreach.xml?r1=1.11&r2=1.12&diff_format=u Index: smarty/docs/en/designers/language-builtin-functions/language-function-foreach.xml diff -u smarty/docs/en/designers/language-builtin-functions/language-function-foreach.xml:1.11 smarty/docs/en/designers/language-builtin-functions/language-function-foreach.xml:1.12 --- smarty/docs/en/designers/language-builtin-functions/language-function-foreach.xml:1.11 Mon Sep 25 22:17:33 2006 +++ smarty/docs/en/designers/language-builtin-functions/language-function-foreach.xml Thu May 3 16:01:42 2007 @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <sect1 id="language.function.foreach"> <title>{foreach},{foreachelse}</title> <para> - <varname>{foreach}</varname> is used to loop over a - <emphasis role="bold">single associative array</emphasis>, + <varname>{foreach}</varname> is used to loop over an + <emphasis role="bold">associative array</emphasis> as well a numerically-indexed array, unlike <link linkend="language.function.section"><varname>{section}</varname></link> - which is for looping over <emphasis role="bold">arrays of data</emphasis>. + which is for looping over <emphasis role="bold">numerically-indexed arrays only</emphasis>. The syntax for <varname>{foreach}</varname> is much easier than <link linkend="language.function.section"><varname>{section}</varname></link>, http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-builtin-functions/language-function-if.xml?r1=1.10&r2=1.11&diff_format=u Index: smarty/docs/en/designers/language-builtin-functions/language-function-if.xml diff -u smarty/docs/en/designers/language-builtin-functions/language-function-if.xml:1.10 smarty/docs/en/designers/language-builtin-functions/language-function-if.xml:1.11 --- smarty/docs/en/designers/language-builtin-functions/language-function-if.xml:1.10 Mon Sep 25 21:47:31 2006 +++ smarty/docs/en/designers/language-builtin-functions/language-function-if.xml Thu May 3 16:01:42 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <sect1 id="language.function.if"> <title>{if},{elseif},{else}</title> <para> @@ -15,9 +15,10 @@ <emphasis>is_array()</emphasis>, etc. </para> <para> - If <link linkend="variable.security"><parameter>$security</parameter></link> is enabled - then <emphasis>IF_FUNCS</emphasis> array in the <link - linkend="variable.security.settings"><parameter>$security_settings</parameter></link> array. + If <link linkend="variable.security"><parameter>$security</parameter></link> is enabled, + only PHP functions from the <emphasis>IF_FUNCS</emphasis> array from <link + linkend="variable.security.settings"><parameter>$security_settings</parameter></link> + are allowed. </para> <para> The following is a list of recognized qualifiers, which must be @@ -227,7 +228,7 @@ <title>{if} with more examples</title> <programlisting> <![CDATA[ -{if isset($name) && $name = 'Blog'} +{if isset($name) && $name == 'Blog'} {* do something *} {elseif $name == $foo} {* do something *} @@ -260,4 +261,4 @@ 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 +--> http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-modifiers/language-modifier-cat.xml?r1=1.4&r2=1.5&diff_format=u Index: smarty/docs/en/designers/language-modifiers/language-modifier-cat.xml diff -u smarty/docs/en/designers/language-modifiers/language-modifier-cat.xml:1.4 smarty/docs/en/designers/language-modifiers/language-modifier-cat.xml:1.5 --- smarty/docs/en/designers/language-modifiers/language-modifier-cat.xml:1.4 Tue Sep 26 19:28:45 2006 +++ smarty/docs/en/designers/language-modifiers/language-modifier-cat.xml Thu May 3 16:01:42 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <sect1 id="language.modifier.cat"> <title>cat</title> <para> @@ -17,7 +17,7 @@ <entry>Parameter Position</entry> <entry>Type</entry> <entry>Required</entry> - <entry>cat</entry> + <entry>Default</entry> <entry>Description</entry> </row> </thead> @@ -81,4 +81,4 @@ 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 +--> http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-modifiers/language-modifier-wordwrap.xml?r1=1.6&r2=1.7&diff_format=u Index: smarty/docs/en/designers/language-modifiers/language-modifier-wordwrap.xml diff -u smarty/docs/en/designers/language-modifiers/language-modifier-wordwrap.xml:1.6 smarty/docs/en/designers/language-modifiers/language-modifier-wordwrap.xml:1.7 --- smarty/docs/en/designers/language-modifiers/language-modifier-wordwrap.xml:1.6 Tue Sep 26 19:28:45 2006 +++ smarty/docs/en/designers/language-modifiers/language-modifier-wordwrap.xml Thu May 3 16:01:42 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <sect1 id="language.modifier.wordwrap"> <title>wordwrap</title> <para> @@ -85,7 +85,7 @@ {$articleTitle|wordwrap:30:"<br />\n"} -{$articleTitle|wordwrap:30:"\n":true} +{$articleTitle|wordwrap:26:"\n":true} ]]> </programlisting> <para> @@ -108,9 +108,9 @@ from dad she hasn't seen in<br /> 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. ]]> </screen> </example> http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-variables/language-variables-smarty.xml?r1=1.18&r2=1.19&diff_format=u Index: smarty/docs/en/designers/language-variables/language-variables-smarty.xml diff -u smarty/docs/en/designers/language-variables/language-variables-smarty.xml:1.18 smarty/docs/en/designers/language-variables/language-variables-smarty.xml:1.19 --- smarty/docs/en/designers/language-variables/language-variables-smarty.xml:1.18 Fri Nov 10 15:26:43 2006 +++ smarty/docs/en/designers/language-variables/language-variables-smarty.xml Thu May 3 16:01:42 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.18 $ --> +<!-- $Revision: 1.19 $ --> <sect1 id="language.variables.smarty"> <title>{$smarty} reserved variable</title> <para> @@ -156,7 +156,7 @@ <para> Returns the name of the current template being processed. The following example shows the <filename>container.tpl</filename> and the - <filename>included banner.tpl</filename> with + included <filename>banner.tpl</filename> with <parameter>{$smarty.template}</parameter> within both. </para> <programlisting>