cvs: smarty /docs/en/designers/language-builtin-functions language-function-capture.xml language-function-include-php.xml language-function-include.xml language-function-strip.xml

pete_morgan		Sat Feb 18 13:17:30 2006 UTC

  Modified files:              
    /smarty/docs/en/designers/language-builtin-functions	
                                                        	language-function-capture.xml 
                                                        	language-function-include-php.xml 
                                                        	language-function-include.xml 
                                                        	language-function-strip.xml 
  Log:
  tweaks
  
http://cvs.php.net/viewcvs.cgi/smarty/docs/en/designers/language-builtin-functions/language-function-capture.xml?r1=1.10&r2=1.11&diff_format=u
Index: smarty/docs/en/designers/language-builtin-functions/language-function-capture.xml
diff -u smarty/docs/en/designers/language-builtin-functions/language-function-capture.xml:1.10 smarty/docs/en/designers/language-builtin-functions/language-function-capture.xml:1.11
--- smarty/docs/en/designers/language-builtin-functions/language-function-capture.xml:1.10	Tue Sep 13 19:01:35 2005
+++ smarty/docs/en/designers/language-builtin-functions/language-function-capture.xml	Sat Feb 18 13:17:30 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <sect1 id="language.function.capture">
  <title>{capture}</title>
  
@@ -57,7 +57,7 @@
    Be careful when capturing <link
    linkend="language.function.insert">{insert}</link>
    output. If you have
-   <link linkend="caching">caching</link>
+   <link linkend="caching">$caching</link>
    enabled and you have
    <link linkend="language.function.insert">{insert}</link>
    commands that you expect to run
@@ -93,13 +93,13 @@
      <link linkend="language.function.popup">{popup}</link> 
      function</para>
      <programlisting>
-  <![CDATA[
-  {capture name=some_content assign=popText}
-    .... some content ....
-  {/capture}
-  
-  <a href="#" {popup caption='Help' text=$popText}>help</a>
-  ]]>
+<![CDATA[
+{capture name=some_content assign=popText}
+.... some popup content ....
+{/capture}
+
+<a href="#" {popup caption='Help' text=$popText}>help</a>
+]]>
      </programlisting>
   </example>
   
http://cvs.php.net/viewcvs.cgi/smarty/docs/en/designers/language-builtin-functions/language-function-include-php.xml?r1=1.9&r2=1.10&diff_format=u
Index: smarty/docs/en/designers/language-builtin-functions/language-function-include-php.xml
diff -u smarty/docs/en/designers/language-builtin-functions/language-function-include-php.xml:1.9 smarty/docs/en/designers/language-builtin-functions/language-function-include-php.xml:1.10
--- smarty/docs/en/designers/language-builtin-functions/language-function-include-php.xml:1.9	Tue Sep 13 18:41:44 2005
+++ smarty/docs/en/designers/language-builtin-functions/language-function-include-php.xml	Sat Feb 18 13:17:30 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <sect1 id="language.function.include.php">
  <title>{include_php}</title>
   <note>
@@ -63,7 +63,7 @@
 
  <para>
   {include_php} tags are used to include a php script in your template.
-  If <link linkend="variable.security">security is enabled</link>,
+  If <link linkend="variable.security">$security</link> is enabled,
   then the php script must be located in the <link
   linkend="variable.trusted.dir">$trusted_dir</link> path.
   The {include_php} tag must have the attribute
@@ -97,9 +97,9 @@
 <?php
 
 // load in variables from a mysql db and assign them to the template
-require_once("MySQL.class.php");
+require_once('MySQL.class.php');
 $sql = new MySQL;
-$sql->query("select * from site_nav_sections order by name",SQL_ALL);
+$sql->query('select * from site_nav_sections order by name',SQL_ALL);
 $this->assign('sections',$sql->record);
 
 ?>
@@ -111,7 +111,7 @@
   <programlisting>
 <![CDATA[
 {* absolute path, or relative to $trusted_dir *}
-{include_php file="/path/to/load_nav.php"}
+{include_php file='/path/to/load_nav.php'}
 
 {foreach item="curr_section" from=$sections}
   <a href="{$curr_section.url}">{$curr_section.name}</a><br />
http://cvs.php.net/viewcvs.cgi/smarty/docs/en/designers/language-builtin-functions/language-function-include.xml?r1=1.11&r2=1.12&diff_format=u
Index: smarty/docs/en/designers/language-builtin-functions/language-function-include.xml
diff -u smarty/docs/en/designers/language-builtin-functions/language-function-include.xml:1.11 smarty/docs/en/designers/language-builtin-functions/language-function-include.xml:1.12
--- smarty/docs/en/designers/language-builtin-functions/language-function-include.xml:1.11	Fri Feb 17 22:18:51 2006
+++ smarty/docs/en/designers/language-builtin-functions/language-function-include.xml	Sat Feb 18 13:17:30 2006
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <sect1 id="language.function.include">
  <title>{include}</title>
  <para>
   {include} tags are used for including other templates in the current
   template. Any variables available in the current template are also
   available within the included template. The {include} tag must have
-  the attribute "file", which contains the template resource path.
+  the attribute <emphasis>'file'</emphasis>, 
+  which contains the template resource path.
  </para>
  <para>
   You can optionally pass the <emphasis>'assign'</emphasis> attribute,
http://cvs.php.net/viewcvs.cgi/smarty/docs/en/designers/language-builtin-functions/language-function-strip.xml?r1=1.8&r2=1.9&diff_format=u
Index: smarty/docs/en/designers/language-builtin-functions/language-function-strip.xml
diff -u smarty/docs/en/designers/language-builtin-functions/language-function-strip.xml:1.8 smarty/docs/en/designers/language-builtin-functions/language-function-strip.xml:1.9
--- smarty/docs/en/designers/language-builtin-functions/language-function-strip.xml:1.8	Tue Sep 13 18:41:44 2005
+++ smarty/docs/en/designers/language-builtin-functions/language-function-strip.xml	Sat Feb 18 13:17:30 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <sect1 id="language.function.strip">
  <title>{strip}</title>
  <para>
@@ -19,9 +19,9 @@
  <note>
   <title>Technical Note</title>
   <para>
-   {strip}{/strip} does not affect the contents of template variables.
-   See the
-   <link linkend="language.modifier.strip">strip modifier</link>.
+   {strip}{/strip} does not affect the contents of template variables,
+   see the
+   <link linkend="language.modifier.strip">strip modifier</link> instead.
   </para>
  </note>
  <example>