cvs: smarty /docs/en getting-started.xml language-snippets.ent /docs/en/designers chapter-debugging-console.xml config-files.xml /docs/en/designers/language-basic-syntax language-escaping.xml language-syntax-functions.xml language-syntax-quotes.xml language-syntax-variables.xml /docs/en/designers/language-builtin-functions language-function-capture.xml language-function-include-php.xml language-function-ldelim.xml /docs/en/designers/language-custom-functions language-function-assign.xml language-function-debug.xml language-function-fetch.xml /docs/en/designers/language-variables language-assigned-variables.xml language-config-variables.xml language-variables-smarty.xml /docs/en/programmers caching.xml smarty-constants.xml /docs/en/programmers/advanced-features advanced-features-objects.xml template-resources.xml /docs/en/programmers/api-functions api-append- by-ref.xml

"Messju Mohr" <[email protected]>
Newsgroups gmane.comp.php.cvs.smarty
Message-ID <cvsmessju1116862982@cvsserver>
messju		Mon May 23 11:43:02 2005 EDT

  Modified files:              
    /smarty/docs/en	getting-started.xml language-snippets.ent 
    /smarty/docs/en/designers	chapter-debugging-console.xml 
                             	config-files.xml 
    /smarty/docs/en/designers/language-basic-syntax	
                                                   	language-escaping.xml 
                                                   	language-syntax-functions.xml 
                                                   	language-syntax-quotes.xml 
                                                   	language-syntax-variables.xml 
    /smarty/docs/en/designers/language-builtin-functions	
                                                        	language-function-capture.xml 
                                                        	language-function-include-php.xml 
                                                        	language-function-ldelim.xml 
    /smarty/docs/en/designers/language-custom-functions	
                                                       	language-function-assign.xml 
                                                       	language-function-debug.xml 
                                                       	language-function-fetch.xml 
    /smarty/docs/en/designers/language-variables	
                                                	language-assigned-variables.xml 
                                                	language-config-variables.xml 
                                                	language-variables-smarty.xml 
    /smarty/docs/en/programmers	caching.xml smarty-constants.xml 
    /smarty/docs/en/programmers/advanced-features	
                                                 	advanced-features-objects.xml 
                                                 	template-resources.xml 
    /smarty/docs/en/programmers/api-functions	api-append-by-ref.xml 
                                             	api-append.xml 
                                             	api-assign-by-ref.xml 
                                             	api-assign.xml 
                                             	api-clear-all-assign.xml 
                                             	api-clear-all-cache.xml 
                                             	api-clear-assign.xml 
                                             	api-clear-cache.xml 
                                             	api-clear-config.xml 
                                             	api-config-load.xml 
                                             	api-display.xml 
                                             	api-fetch.xml 
                                             	api-get-config-vars.xml 
                                             	api-is-cached.xml 
    /smarty/docs/en/programmers/api-variables	variable-cache-dir.xml 
                                             	variable-cache-handler-func.xml 
                                             	variable-cache-lifetime.xml 
                                             	variable-caching.xml 
                                             	variable-compile-check.xml 
                                             	variable-compile-id.xml 
                                             	variable-config-dir.xml 
                                             	variable-config-read-hidden.xml 
                                             	variable-debug-tpl.xml 
                                             	variable-debugging-ctrl.xml 
                                             	variable-debugging.xml 
                                             	variable-error-reporting.xml 
                                             	variable-force-compile.xml 
                                             	variable-plugins-dir.xml 
                                             	variable-request-use-auto-globals.xml 
                                             	variable-request-vars-order.xml 
                                             	variable-secure-dir.xml 
                                             	variable-security-settings.xml 
                                             	variable-security.xml 
                                             	variable-trusted-dir.xml 
    /smarty/docs/en/programmers/caching	caching-setting-up.xml 
  Log:
  Lots of additional cross linking by Peter.

-- 
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
messju-20050523114302.txt (text/plain, 92.4 KB)
http://cvs.php.net/diff.php/smarty/docs/en/getting-started.xml?r1=1.7&r2=1.8&ty=u
Index: smarty/docs/en/getting-started.xml
diff -u smarty/docs/en/getting-started.xml:1.7 smarty/docs/en/getting-started.xml:1.8
--- smarty/docs/en/getting-started.xml:1.7	Sat Nov 20 21:04:00 2004
+++ smarty/docs/en/getting-started.xml	Mon May 23 11:42:59 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <part id="getting.started">
  <title>Getting Started</title>
 
@@ -85,42 +85,53 @@
    </listitem>
    <listitem>
     <para>
-     Configurable template delimiter tag syntax, so you can use
+     Configurable template
+     <link linkend="variable.left.delimiter">delimiter tag</link>
+      syntax, so you can use
      {}, {{}}, &lt;!--{}--&gt;, etc.
     </para>
    </listitem>
    <listitem>
     <para>
-     The if/elseif/else/endif constructs are passed to the
+     The <link
+     linkend="language.function.if">if/elseif/else/endif</link>
+     constructs are passed to the
      PHP parser, so the {if ...} expression syntax can be as simple or as 
      complex as you like.
     </para>
    </listitem>
    <listitem>
     <para>
-     Unlimited nesting of sections, ifs, etc. allowed.
+     Unlimited nesting of
+     <link linkend="language.function.section">sections</link>,
+     ifs, etc. allowed.
     </para>
    </listitem>
    <listitem>
     <para>
-     It is possible to embed PHP code right in your template files, although
+     It is possible to
+     <link linkend="language.function.php">embed PHP code</link>
+     right in your template files, although
      this may not be needed (nor recommended) since the engine is so 
      customizable.
     </para>
    </listitem>
    <listitem>
     <para>
-     Built-in caching support
+     Built-in <link linkend="caching">caching</link> support
     </para>
    </listitem>
    <listitem>
     <para>
-     Arbitrary template sources
+     Arbitrary <link
+     linkend="template.resources">template</link> sources
     </para>
    </listitem>
    <listitem>
     <para>
-     Custom cache handling functions
+     Custom <link
+     linkend="section.template.cache.handler.func">cache handling</link>
+     functions
     </para>
    </listitem>
    <listitem>
@@ -241,9 +252,16 @@
     <filename class="directory">templates_c</filename>, <filename 
     class="directory">configs</filename> and <filename 
     class="directory">cache</filename>. Each of these are definable by the 
-    Smarty class properties <varname>$template_dir</varname>,
-    <varname>$compile_dir</varname>, <varname>$config_dir</varname>, and
-    <varname>$cache_dir</varname> respectively. It is highly recommended
+    Smarty class properties
+    <link linkend="variable.template.dir">
+    <varname>$template_dir</varname></link>,
+    <link linkend="variable.compile.dir">
+    <varname>$compile_dir</varname></link>,
+    <link linkend="variable.config.dir">
+    <varname>$config_dir</varname></link>, and
+    <link linkend="variable.cache.dir">
+    <varname>$cache_dir</varname></link> respectively.
+    It is highly recommended
     that you setup a separate set of these directories for each application
     that will use Smarty.
    </para>
@@ -310,8 +328,12 @@
    </example>
 
    <para>
-    Smarty will need write access to the <emphasis>$compile_dir</emphasis> and
-    <emphasis>$cache_dir</emphasis>, so be sure the web server user can write
+    Smarty will need write access to the
+    <link linkend="variable.compile.dir">
+    <emphasis>$compile_dir</emphasis></link> and
+    <link linkend="variable.cache.dir">
+    <emphasis>$cache_dir</emphasis></link>,
+    so be sure the web server user can write
     to them. This is usually user "nobody" and group "nobody". For OS X users,
     the default is user "www" and group "www". If you are using Apache, you can
     look in your httpd.conf file (usually in "/usr/local/apache/conf/") to see
http://cvs.php.net/diff.php/smarty/docs/en/language-snippets.ent?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/language-snippets.ent
diff -u smarty/docs/en/language-snippets.ent:1.2 smarty/docs/en/language-snippets.ent:1.3
--- smarty/docs/en/language-snippets.ent:1.2	Tue Apr 20 07:37:05 2004
+++ smarty/docs/en/language-snippets.ent	Mon May 23 11:42:59 2005
@@ -1,11 +1,12 @@
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
 <!ENTITY note.parameter.merge '<note>
  <title>Technical Note</title>
  <para>
   The <parameter>merge</parameter> parameter respects array keys, so if
   you merge two numerically indexed arrays, they may overwrite each other
-  or result in non-sequential keys. This is unlike the array_merge() function
+  or result in non-sequential keys. This is unlike the
+  <ulink url="&url.php-manual;array_merge">array_merge()</ulink> function
   of PHP which wipes out numerical keys and renumbers them.
  </para>
 </note>'>
@@ -15,10 +16,13 @@
  This is in the event that you want to compile different versions of
  the same template, such as having separate templates compiled
  for different languages. Another use for compile_id is when you
- use more than one $template_dir but only one $compile_dir. Set
- a separate <parameter>compile_id</parameter> for each $template_dir, otherwise
+ use more than one
+ <link linkend="variable.template.dir">$template_dir</link>
+ but only one
+ <link linkend="variable.compile.dir">$compile_dir</link>.
+ Set a separate <parameter>$compile_id</parameter> for each
+ <link linkend="variable.template.dir">$template_dir</link>, otherwise
  templates of the same name will overwrite each other. You can
- also set the <link
- linkend="variable.compile.id">$compile_id</link> variable once
+ also set the $compile_id variable once
  instead of passing this to each call to this function.
 </para>'>
http://cvs.php.net/diff.php/smarty/docs/en/designers/chapter-debugging-console.xml?r1=1.5&r2=1.6&ty=u
Index: smarty/docs/en/designers/chapter-debugging-console.xml
diff -u smarty/docs/en/designers/chapter-debugging-console.xml:1.5 smarty/docs/en/designers/chapter-debugging-console.xml:1.6
--- smarty/docs/en/designers/chapter-debugging-console.xml:1.5	Sat Sep  4 06:59:50 2004
+++ smarty/docs/en/designers/chapter-debugging-console.xml	Mon May 23 11:43:00 2005
@@ -1,19 +1,27 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <chapter id="chapter.debugging.console">
  <title>Debugging Console</title>
  <para>
   There is a debugging console included with Smarty. The console informs you
-  of all the included templates, assigned variables and config file variables
+  of all the
+  <link linkend="language.function.include">included</link> templates,
+  <link linkend="api.assign">assigned</link> variables and
+  <link linkend="language.config.variables">config</link>
+  file variables
   for the current invocation of the template. A template named "debug.tpl" is
   included with the distribution of Smarty which controls the formatting of
-  the console. Set $debugging to true in Smarty, and if needed set $debug_tpl
-  to the template resource path for debug.tpl (this is in SMARTY_DIR by
+  the console. Set
+  <link linkend="variable.debugging">$debugging</link> to true in Smarty, and if needed set
+  <link linkend="variable.debug.tpl">$debug_tpl</link>
+  to the template resource path for debug.tpl (this is in
+  <link linkend="constant.smarty.dir">SMARTY_DIR</link> by
   default.) When you load the page, a javascript console window should pop up
   and give you the names of all the included templates and assigned variables
   for the current page. To see the available variables for a particular
   templates, see the <link linkend="language.function.debug">{debug}</link>
-  template function. To disable the debugging console, set $debugging to
+  template function. To disable the debugging console, set
+  <link linkend="variable.debugging">$debugging</link> to
   false. You can also temporarily turn on the debugging console by putting
   SMARTY_DEBUG in the URL if you enable this option with <link
   linkend="variable.debugging.ctrl">$debugging_ctrl</link>.
@@ -21,8 +29,11 @@
  <note>
   <title>Technical Note</title>
   <para>
-   The debugging console does not work when you use the fetch()
-   API, only when using display(). It is a set of javascript statements added
+   The debugging console does not work when you use the
+   <link linkend="api.fetch">fetch()</link>
+   API, only when using
+   <link linkend="api.display">display()</link>.
+   It is a set of javascript statements added
    to the very bottom of the generated template. If you do not like javascript,
    you can edit the debug.tpl template to format the output however you like.
    Debug data is not cached and debug.tpl info is not included in the output of
@@ -57,3 +68,5 @@
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
+
+
http://cvs.php.net/diff.php/smarty/docs/en/designers/config-files.xml?r1=1.4&r2=1.5&ty=u
Index: smarty/docs/en/designers/config-files.xml
diff -u smarty/docs/en/designers/config-files.xml:1.4 smarty/docs/en/designers/config-files.xml:1.5
--- smarty/docs/en/designers/config-files.xml:1.4	Sat Nov 20 21:04:01 2004
+++ smarty/docs/en/designers/config-files.xml	Mon May 23 11:43:00 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <chapter id="config.files">
  <title>Config Files</title>
  <para>
@@ -40,7 +40,9 @@
   </programlisting>
  </example>
  <para>
-  Values of config file variables can be in quotes, but not necessary.
+  Values of
+  <link linkend="language.config.variables">config file variables</link>
+  can be in quotes, but not necessary.
   You can use either single or double quotes. If you have a value that
   spans more than one line, enclose the entire value with triple quotes
   ("""). You can put comments into config files by any syntax that is not
@@ -56,11 +58,16 @@
   section is loaded, then the global variables and the variables from that
   section are also loaded. If a variable exists both as a global and in a
   section, the section variable is used. If you name two variables the
-  same within a section, the last one will be used.
+  same within a section, the last one will be used. (see
+  <link linkend="variable.config.overwrite">$config_overwrite</link>)
  </para>
  <para>
   Config files are loaded into templates with the built-in function
-  <command>config_load</command>.
+  <link
+  linkend="language.function.config.load"><command>{config_load}</command></link>
+  , and
+  <link
+  linkend="api.config.load"><command>config_load()</command></link>.
  </para>
  <para>
   You can hide variables or entire sections by prepending the variable
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-basic-syntax/language-escaping.xml?r1=1.3&r2=1.4&ty=u
Index: smarty/docs/en/designers/language-basic-syntax/language-escaping.xml
diff -u smarty/docs/en/designers/language-basic-syntax/language-escaping.xml:1.3 smarty/docs/en/designers/language-basic-syntax/language-escaping.xml:1.4
--- smarty/docs/en/designers/language-basic-syntax/language-escaping.xml:1.3	Thu Sep  2 15:08:13 2004
+++ smarty/docs/en/designers/language-basic-syntax/language-escaping.xml	Mon May 23 11:43:00 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <sect1 id="language.escaping">
  <title>Escaping Smarty Parsing</title>
  <para>
@@ -20,8 +20,7 @@
   Similar to HTML entity usage, you can use <link 
   linkend="language.function.ldelim">{ldelim}</link>,<link 
   linkend="language.function.ldelim">{rdelim}</link> or <link 
-  linkend="language.variables.smarty.ldelim">{$smarty.ldelim}</link>,<link
-  linkend="language.variables.smarty.rdelim">{$smarty.rdelim}</link>
+  linkend="language.variables.smarty.ldelim">{$smarty.ldelim}</link>
   to display the current delimiters.
  </para>
 
@@ -60,6 +59,9 @@
 ]]>
   </programlisting>
  </example>
+ <para>
+  See also <link linkend="language.modifier.escape">escape modifier</link>
+ </para>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-basic-syntax/language-syntax-functions.xml?r1=1.4&r2=1.5&ty=u
Index: smarty/docs/en/designers/language-basic-syntax/language-syntax-functions.xml
diff -u smarty/docs/en/designers/language-basic-syntax/language-syntax-functions.xml:1.4 smarty/docs/en/designers/language-basic-syntax/language-syntax-functions.xml:1.5
--- smarty/docs/en/designers/language-basic-syntax/language-syntax-functions.xml:1.4	Sat May 21 08:41:14 2005
+++ smarty/docs/en/designers/language-basic-syntax/language-syntax-functions.xml	Mon May 23 11:43:00 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <sect1 id="language.syntax.functions">
  <title>Functions</title>
  <para>
@@ -32,14 +32,14 @@
   and <link linkend="language.custom.functions">custom functions</link>
   have the same syntax in the templates. Built-in functions are the
   inner workings of Smarty, such as
-  <link linkend="language.function.if"><command>if</command></link>,
-  <link linkend="language.function.section"><command>section</command></link> and
-  <link linkend="language.function.strip"><command>strip</command></link>.
+  <link linkend="language.function.if">{if}</link>,
+  <link linkend="language.function.section">{section}</link> and
+  <link linkend="language.function.strip">{strip}</link>.
   They cannot be modified. Custom functions are
   additional functions implemented via <link linkend="plugins">plugins</link>.
   They can be modified to your liking, or you can add new ones.
-  <link linkend="language.function.html.options"><command>html_options</command></link> and
-  <link linkend="language.function.html.select.date"><command>html_select_date</command></link>
+  <link linkend="language.function.html.options">{html_options}</link> and
+  <link linkend="language.function.html.select.date">{html_select_date}</link>
   are examples of custom functions.
  </para>
 </sect1>
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-basic-syntax/language-syntax-quotes.xml?r1=1.5&r2=1.6&ty=u
Index: smarty/docs/en/designers/language-basic-syntax/language-syntax-quotes.xml
diff -u smarty/docs/en/designers/language-basic-syntax/language-syntax-quotes.xml:1.5 smarty/docs/en/designers/language-basic-syntax/language-syntax-quotes.xml:1.6
--- smarty/docs/en/designers/language-basic-syntax/language-syntax-quotes.xml:1.5	Sat May 21 08:41:14 2005
+++ smarty/docs/en/designers/language-basic-syntax/language-syntax-quotes.xml	Mon May 23 11:43:00 2005
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <sect1 id="language.syntax.quotes">
  <title>Embedding Vars in Double Quotes</title>
  <para>
-  Smarty will recognize assigned variables embedded in double quotes so long as
+  Smarty will recognize <link
+  linkend="api.assign">assigned</link>
+  <link   linkend="language.syntax.variables">variables</link>
+  embedded in double quotes so long as
   the variables contain only numbers, letters, underscores and brackets [].
   With any other characters (period, object reference, etc.) the variable must
-  be surrounded by backticks. You cannot embed modifiers, they must always be
-  applied outside of quotes.
+  be surrounded by backticks. You cannot embed
+  <link linkend="language.modifiers">modifiers</link>,
+  they must always be applied outside of quotes.
  </para>
  <example>
   <title>embedded quotes syntax</title>
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-basic-syntax/language-syntax-variables.xml?r1=1.5&r2=1.6&ty=u
Index: smarty/docs/en/designers/language-basic-syntax/language-syntax-variables.xml
diff -u smarty/docs/en/designers/language-basic-syntax/language-syntax-variables.xml:1.5 smarty/docs/en/designers/language-basic-syntax/language-syntax-variables.xml:1.6
--- smarty/docs/en/designers/language-basic-syntax/language-syntax-variables.xml:1.5	Sat May 21 08:41:14 2005
+++ smarty/docs/en/designers/language-basic-syntax/language-syntax-variables.xml	Mon May 23 11:43:00 2005
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <sect1 id="language.syntax.variables">
  <title>Variables</title>
  <para>
   Template variables start with a dollar sign. They can contain numbers,
-  letters and underscores, much like a PHP variable. You can reference arrays
+  letters and underscores, much like a
+  <ulink url="&url.php-manual;language.variables">PHP variable</ulink>.
+  You can reference arrays
   that are indexed numerically or non-numerically. You can also reference
-  object properties and methods. Config file variables are an exception to the
-  dollar sign syntax. They can be referenced with surrounding hashmarks, or
+  object properties and methods.
+  <link linkend="language.config.variables">Config file variables</link>
+  are an exception to the dollar sign syntax.
+  They can be referenced with surrounding #hashmarks#, or
   with the special
   <link linkend="language.variables.smarty.config">$smarty.config</link> variable.
  </para>
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-builtin-functions/language-function-capture.xml?r1=1.4&r2=1.5&ty=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.4 smarty/docs/en/designers/language-builtin-functions/language-function-capture.xml:1.5
--- smarty/docs/en/designers/language-builtin-functions/language-function-capture.xml:1.4	Sat May 21 08:41:15 2005
+++ smarty/docs/en/designers/language-builtin-functions/language-function-capture.xml	Mon May 23 11:43:00 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <sect1 id="language.function.capture">
  <title>capture</title>
  <informaltable frame="all">
@@ -59,7 +59,9 @@
   <para>
    Be careful when capturing <link
    linkend="language.function.insert"><command>insert</command></link>
-   output. If you have caching turned on and you have
+   output. If you have
+   <link linkend="caching">caching</link>
+   turned on and you have
    <command>insert</command> commands that you expect to run
    within cached content, do not capture this content.
   </para>
@@ -85,7 +87,8 @@
   </example>
  </para>
  <para>
-  See also <link linkend="language.function.assign">assign </link>.
+  See also <link linkend="language.function.eval">{eval}</link>
+  and <link linkend="language.function.assign">{assign}</link>.
  </para>
 </sect1>
 
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-builtin-functions/language-function-include-php.xml?r1=1.4&r2=1.5&ty=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.4 smarty/docs/en/designers/language-builtin-functions/language-function-include-php.xml:1.5
--- smarty/docs/en/designers/language-builtin-functions/language-function-include-php.xml:1.4	Sat May 21 08:41:15 2005
+++ smarty/docs/en/designers/language-builtin-functions/language-function-include-php.xml	Mon May 23 11:43:00 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <sect1 id="language.function.include.php">
  <title>include_php</title>
  <informaltable frame="all">
@@ -64,7 +64,9 @@
   linkend="variable.trusted.dir">$trusted_dir</link> path.
   The include_php tag must have the attribute
   "file", which contains the path to the included php file, either
-  relative to $trusted_dir, or an absolute path.
+  relative to
+  <link linkend="variable.trusted.dir">$trusted_dir</link>,
+  or an absolute path.
  </para>
  <para>
   include_php is a nice way to handle <link
@@ -126,6 +128,16 @@
 ]]>
   </programlisting>
  </example>
+
+ <para>
+  See also
+  <link linkend="language.function.include">{include}</link>,
+   <link linkend="language.function.php">{php}</link>,
+    <link linkend="language.function.capture">{capture}</link>,
+    <link linkend="template.resources">Template Resources</link> and
+    <link linkend="tips.componentized.templates">Componentized Templates</link>
+ </para>
+
 </sect1>
 
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-builtin-functions/language-function-ldelim.xml?r1=1.5&r2=1.6&ty=u
Index: smarty/docs/en/designers/language-builtin-functions/language-function-ldelim.xml
diff -u smarty/docs/en/designers/language-builtin-functions/language-function-ldelim.xml:1.5 smarty/docs/en/designers/language-builtin-functions/language-function-ldelim.xml:1.6
--- smarty/docs/en/designers/language-builtin-functions/language-function-ldelim.xml:1.5	Sun May  8 15:47:01 2005
+++ smarty/docs/en/designers/language-builtin-functions/language-function-ldelim.xml	Mon May 23 11:43:00 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
  <sect1 id="language.function.ldelim">
   <title>ldelim,rdelim</title>
   <para>
@@ -7,8 +7,8 @@
    "{" or "}". You can also use <link
     linkend="language.function.literal">{literal}{/literal}</link> to escape
    blocks of text.
-    See also <link linkend="language.variables.smarty.ldelim">{$smarty.ldelim}</link>
-    and <link linkend="language.variables.smarty.rdelim">{$smarty.rdelim}</link>
+    See also <link
+    linkend="language.variables.smarty.ldelim">{$smarty.ldelim}</link>.
   </para>
   <example>
    <title>ldelim, rdelim</title>
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-custom-functions/language-function-assign.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-assign.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-assign.xml:1.2 smarty/docs/en/designers/language-custom-functions/language-function-assign.xml:1.3
--- smarty/docs/en/designers/language-custom-functions/language-function-assign.xml:1.2	Tue May 10 17:14:36 2005
+++ smarty/docs/en/designers/language-custom-functions/language-function-assign.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <sect1 id="language.function.assign">
  <title>assign</title>
  <informaltable frame="all">
@@ -37,7 +37,7 @@
   </tgroup>
  </informaltable>
  <para>
-  assign is used for assigning template variables during the execution
+  {assign} is used for assigning template variables during the execution
   of the template.
  </para>
  <example>
@@ -58,6 +58,11 @@
 ]]>
   </screen>
  </example>
+ <para>
+ See also <link linkend="api.assign">assign()</link>
+   and
+  <link linkend="api.get.template.vars">get_template_vars()</link>.
+ </para>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-custom-functions/language-function-debug.xml?r1=1.3&r2=1.4&ty=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-debug.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-debug.xml:1.3 smarty/docs/en/designers/language-custom-functions/language-function-debug.xml:1.4
--- smarty/docs/en/designers/language-custom-functions/language-function-debug.xml:1.3	Thu May 19 10:28:28 2005
+++ smarty/docs/en/designers/language-custom-functions/language-function-debug.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <sect1 id="language.function.debug">
  <title>debug</title>
  <informaltable frame="all">
@@ -37,6 +37,9 @@
   are in use. But, you see all the currently available variables
   within the scope of this template.
  </para>
+ <para>
+ See also <link linkend="chapter.debugging.console">Debugging console</link>
+ </para>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-custom-functions/language-function-fetch.xml?r1=1.5&r2=1.6&ty=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-fetch.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-fetch.xml:1.5 smarty/docs/en/designers/language-custom-functions/language-function-fetch.xml:1.6
--- smarty/docs/en/designers/language-custom-functions/language-function-fetch.xml:1.5	Tue May 10 17:14:36 2005
+++ smarty/docs/en/designers/language-custom-functions/language-function-fetch.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <sect1 id="language.function.fetch">
  <title>fetch</title>
  <informaltable frame="all">
@@ -63,7 +63,7 @@
    If template security is turned on and you are
    fetching a file from the local file system, this will only allow
    files from within one of the defined secure directories.
-   ($secure_dir)
+   (<link linkend="variable.secure.dir">$secure_dir</link>)
   </para>
  </note>
  <example>
@@ -87,6 +87,9 @@
 ]]>
   </programlisting>
  </example>
+ <para>
+ See also <link linkend="api.fetch">api fetch()</link>.
+ </para>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-variables/language-assigned-variables.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/designers/language-variables/language-assigned-variables.xml
diff -u smarty/docs/en/designers/language-variables/language-assigned-variables.xml:1.2 smarty/docs/en/designers/language-variables/language-assigned-variables.xml:1.3
--- smarty/docs/en/designers/language-variables/language-assigned-variables.xml:1.2	Sat May 21 08:41:15 2005
+++ smarty/docs/en/designers/language-variables/language-assigned-variables.xml	Mon May 23 11:43:01 2005
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <sect1 id="language.assigned.variables">
  <title>Variables assigned from PHP</title>
  <para>
   Variables that are assigned from PHP are referenced by preceding them with
   a dollar sign <literal>$</literal>. Variables assigned from within the
-  template with the <link linkend="language.function.assign">assign</link>
+  template with the <link linkend="language.function.assign">{assign}</link>
   function are also displayed this way.
  </para>
  <example>
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-variables/language-config-variables.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/designers/language-variables/language-config-variables.xml
diff -u smarty/docs/en/designers/language-variables/language-config-variables.xml:1.2 smarty/docs/en/designers/language-variables/language-config-variables.xml:1.3
--- smarty/docs/en/designers/language-variables/language-config-variables.xml:1.2	Tue May 10 12:01:12 2005
+++ smarty/docs/en/designers/language-variables/language-config-variables.xml	Mon May 23 11:43:01 2005
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <sect1 id="language.config.variables">
 			<title>Variables loaded from config files</title>
 			<para>
-			 Variables that are loaded from the config files are referenced by
+ Variables that are loaded from the
+ <link linkend="config.files">config files</link>
+ are referenced by
 			 enclosing them within hash marks (#), or with the smarty variable
 			 <link
 			 linkend="language.variables.smarty.config">$smarty.config</link>.
@@ -89,7 +91,8 @@
 		 	after they are loaded in from a config file. This procedure is
 		 	explained later in this document under <link linkend="api.config.load"><command>config_load</command></link>.
 			</para>
-			<para>See also <link linkend="language.syntax.variables">Variables</link> and <link linkend="language.variables.smarty">$smarty reserved variables</link></para>
+			<para>See also <link linkend="language.syntax.variables">Variables</link> and <link linkend="language.variables.smarty">$smarty reserved
+			variables</link></para>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/diff.php/smarty/docs/en/designers/language-variables/language-variables-smarty.xml?r1=1.6&r2=1.7&ty=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.6 smarty/docs/en/designers/language-variables/language-variables-smarty.xml:1.7
--- smarty/docs/en/designers/language-variables/language-variables-smarty.xml:1.6	Tue May 10 12:01:12 2005
+++ smarty/docs/en/designers/language-variables/language-variables-smarty.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <sect1 id="language.variables.smarty">
    <title>{$smarty} reserved variables</title>
    <para>
@@ -72,6 +72,8 @@
 			<title>{$smarty.const}</title>
 			<para>
 		 	You can access PHP constant values directly.
+  See also <link
+  linkend="smarty.constants">smarty constants</link>
 			</para>
    <example>
     <title>using {$smarty.const}</title>
@@ -95,19 +97,22 @@
 		<sect2 id="language.variables.smarty.config">
 			<title>{$smarty.config}</title>
 			<para>
-			 {$smarty} variable can be used to refer to loaded config variables.
+ {$smarty} variable can be used to refer to loaded
+  <link
+ linkend="language.config.variables">config variables</link>.
 			 {$smarty.config.foo} is a synonym for {#foo#}. See the section on
-			 <link linkend="language.function.config.load">config_load</link> for an example.
+ <link
+ linkend="language.function.config.load">config_load</link> for an example.
 			</para>
 		</sect2>
 
   <sect2 id="language.variables.smarty.loops">
 			<title>{$smarty.section}, {$smarty.foreach}</title>
 			<para>
-		 	{$smarty} variable can be used to refer to 'section' and
-		 	'foreach' loop properties. See docs for
-		 	<link linkend="language.function.section">section</link> and
-			 <link linkend="language.function.foreach">foreach</link>.
+  {$smarty} variable can be used to refer to
+  <link linkend="language.function.section">'section'</link> and
+  <link linkend="language.function.foreach">'foreach'</link>
+  loop properties.
 			</para>
 		</sect2>
 
@@ -125,21 +130,21 @@
 			</para>
 		</sect2>
 		<sect2 id="language.variables.smarty.ldelim">
-			<title>{$smarty.ldelim}</title>
+			<title>{$smarty.ldelim}, {$smarty.rdelim}</title>
 			<para>
-    This variable is used for printing the left-delimiter value literally.
-    See also <link linkend="language.function.ldelim">{ldelim},{rdelim}</link>.
+    This variable is used for printing the left-delimiter and right-delimiter value literally.
+    See <link linkend="language.function.ldelim">{ldelim},{rdelim}</link>.
 			</para>
-		</sect2>
-		<sect2 id="language.variables.smarty.rdelim">
-			<title>{$smarty.rdelim}</title>
 			<para>
-    This variable is used for printing the right-delimiter value literally.
-    See also <link linkend="language.function.ldelim">{ldelim},{rdelim}</link>.
+			 See also
+			 <link linkend="language.syntax.variables">Variables</link> and
+			 <link linkend="language.config.variables">Config Variables</link>
 			</para>
-			<para>See also <link linkend="language.syntax.variables">Variables</link> and <link linkend="language.config.variables">Config Variables</link></para>
 		</sect2>
 
+
+
+
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
@@ -161,3 +166,4 @@
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
+
http://cvs.php.net/diff.php/smarty/docs/en/programmers/caching.xml?r1=1.3&r2=1.4&ty=u
Index: smarty/docs/en/programmers/caching.xml
diff -u smarty/docs/en/programmers/caching.xml:1.3 smarty/docs/en/programmers/caching.xml:1.4
--- smarty/docs/en/programmers/caching.xml:1.3	Tue Apr 13 07:39:11 2004
+++ smarty/docs/en/programmers/caching.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <chapter id="caching">
    <title>Caching</title>
    <para>
@@ -9,7 +9,9 @@
    cached version of the call is available, that is displayed instead of
    regenerating the output. Caching can speed things up tremendously,
    especially templates with longer computation times. Since the output of
-   display() or fetch() is cached, one cache file could conceivably be made up
+   <link linkend="api.display">display()</link> or
+   <link linkend="api.fetch">fetch()</link> is cached,
+   one cache file could conceivably be made up
    of several template files, config files, etc.
    </para>
    <para>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/smarty-constants.xml?r1=1.3&r2=1.4&ty=u
Index: smarty/docs/en/programmers/smarty-constants.xml
diff -u smarty/docs/en/programmers/smarty-constants.xml:1.3 smarty/docs/en/programmers/smarty-constants.xml:1.4
--- smarty/docs/en/programmers/smarty-constants.xml:1.3	Thu Sep 16 20:33:24 2004
+++ smarty/docs/en/programmers/smarty-constants.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <chapter id="smarty.constants">
    <title>Constants</title>
 
@@ -24,13 +24,19 @@
 ]]>
      </programlisting>
     </example>
+        <para>
+        See also
+        <link linkend="language.variables.smarty.const">$smarty.const</link>
+    </para>
    </sect1>
    <sect1 id="constant.smarty.core.dir">
     <title>SMARTY_CORE_DIR</title>
     <para>
      This should be the full system path to the location of the Smarty core
      files. If not defined, Smarty will default this constant to the internals/
-     sub-directory below SMARTY_DIR. If defined, the path must end with a slash.
+     sub-directory below
+     <link linkend="constant.smarty.dir">SMARTY_DIR</link>.
+     If defined, the path must end with a slash.
      Use this constant when manually including any of the core.* files.
     </para>
     <example>
@@ -45,6 +51,11 @@
 ]]>
      </programlisting>
     </example>
+
+    <para>
+    See also
+    <link linkend="language.variables.smarty.const">$smarty.const</link>
+    </para>
    </sect1>
 </chapter>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/advanced-features/advanced-features-objects.xml?r1=1.3&r2=1.4&ty=u
Index: smarty/docs/en/programmers/advanced-features/advanced-features-objects.xml
diff -u smarty/docs/en/programmers/advanced-features/advanced-features-objects.xml:1.3 smarty/docs/en/programmers/advanced-features/advanced-features-objects.xml:1.4
--- smarty/docs/en/programmers/advanced-features/advanced-features-objects.xml:1.3	Thu Nov 25 17:01:37 2004
+++ smarty/docs/en/programmers/advanced-features/advanced-features-objects.xml	Mon May 23 11:43:01 2005
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <sect1 id="advanced.features.objects">
  <title>Objects</title>
  <para>
   Smarty allows access to PHP objects through the templates. There are
-	 two ways to access them. One way is to register objects to the template,
+ two ways to access them. One way is to
+ <link linkend="api.register.object">register objects</link> to the template,
 	 then use access them via syntax similar to custom functions. The other way
-	 is to assign objects to the templates and access them much like any other
+ is to <link linkend="api.assign">assign objects</link>
+ to the templates and access them much like any other
 	 assigned variable. The first method has a much nicer template syntax. It
 	 is also more secure, as a registered object can be restricted to certain
-	 methods or properties. However, a registered object cannot be looped over
-	 or assigned in arrays of objects, etc. The method you choose will be
+ methods or properties. However,
+ <emphasis role="bold">a registered object cannot be looped over
+ or assigned in arrays of objects</emphasis>, etc. The method you choose will be
 	 determined by your needs, but use the first method whenever possible to
 	 keep template syntax to a minimum.
  </para>
 	<para>
-  If security is enabled, no private methods or functions can be accessed
+  If <link linkend="variable.security">security is enabled</link>,
+  no private methods or functions can be accessed
  	(begininning with "_"). If a method and property of the same name exist,
  	the method will be used.
 	</para>
@@ -25,7 +29,9 @@
 	</para>
 	<para>
 	 By default, parameters passed to objects through the templates are passed
-	 the same way custom functions get them. An associative array is passed
+  the same way
+  <link linkend="language.custom.functions">custom functions</link> get them.
+  An associative array is passed
 	 as the first parameter, and the smarty object as the second. If you want
 	 the parameters passed one at a time for each argument like traditional
 	 object parameter passing, set the fourth registration parameter to false.
http://cvs.php.net/diff.php/smarty/docs/en/programmers/advanced-features/template-resources.xml?r1=1.3&r2=1.4&ty=u
Index: smarty/docs/en/programmers/advanced-features/template-resources.xml
diff -u smarty/docs/en/programmers/advanced-features/template-resources.xml:1.3 smarty/docs/en/programmers/advanced-features/template-resources.xml:1.4
--- smarty/docs/en/programmers/advanced-features/template-resources.xml:1.3	Thu Nov 25 18:01:07 2004
+++ smarty/docs/en/programmers/advanced-features/template-resources.xml	Mon May 23 11:43:01 2005
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <sect1 id="template.resources">
    <title>Resources</title>
    <para>
-	   The templates may come from a variety of sources. When you display or fetch
+  The templates may come from a variety of sources. When you
+  <link linkend="api.display">display()</link> or
+  <link linkend="api.fetch">fetch()</link>
 	   a template, or when you include a template from within another template,
 	   you supply a resource type, followed by the appropriate path and template
    	name. If a resource is not explicitly given the value of <link
@@ -13,10 +15,12 @@
    <sect2 id="templates.from.template.dir">
     <title>Templates from $template_dir</title>
     <para>
-     Templates from the $template_dir do not require a template
+     Templates from the
+     <link linkend="variable.template.dir">$template_dir</link> do not require a template
      resource, although you can use the file: resource for consistancy.
-     Just supply the path to the template you want to use relative to
-     the $template_dir root directory.
+     Just supply the path to the template you want to use relative to the
+     <link linkend="variable.template.dir">$template_dir</link>
+     root directory.
     </para>
     <example>
      <title>using templates from $template_dir</title>
@@ -38,7 +42,9 @@
    <sect2 id="templates.from.any.dir">
     <title>Templates from any directory</title>
     <para>
-     Templates outside of the $template_dir require the file: template
+     Templates outside of the
+     <link linkend="variable.template.dir">$template_dir</link>
+     require the file: template
      resource type, followed by the absolute path and name of the
      template.
     </para>
@@ -200,7 +206,8 @@
 <?php
 // put this function somewhere in your application
 
-function make_template ($resource_type, $resource_name, &$template_source, &$template_timestamp, &$smarty_obj)
+function make_template ($resource_type, $resource_name, &$template_source, &$template_timestamp,
+&$smarty_obj)
 {
 	if( $resource_type == 'file' ) {
 		if ( ! is_readable ( $resource_name )) {
@@ -244,3 +251,4 @@
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
+
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-append-by-ref.xml?r1=1.3&r2=1.4&ty=u
Index: smarty/docs/en/programmers/api-functions/api-append-by-ref.xml
diff -u smarty/docs/en/programmers/api-functions/api-append-by-ref.xml:1.3 smarty/docs/en/programmers/api-functions/api-append-by-ref.xml:1.4
--- smarty/docs/en/programmers/api-functions/api-append-by-ref.xml:1.3	Tue Apr 20 07:27:15 2004
+++ smarty/docs/en/programmers/api-functions/api-append-by-ref.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <refentry id="api.append.by.ref">
  <refnamediv>
   <refname>append_by_ref</refname>
@@ -14,9 +14,11 @@
    <methodparam choice="opt"><type>bool</type><parameter>merge</parameter></methodparam>
   </methodsynopsis>
   <para>
-   This is used to append values to the templates by reference.
+   This is used to
+   <link linkend="api.append">append</link> values to the templates by reference.
    If you append a variable by reference then change its
-   value, the appended value sees the change as well. For objects, 
+   value, the appended value sees the change as well. For
+   <link linkend="advanced.features.objects">objects</link>,
    append_by_ref() also avoids an in-memory copy of the appended object.
    See the PHP manual on variable referencing for an in-depth
    explanation. If you pass the optional third parameter of true,
@@ -29,12 +31,17 @@
 <![CDATA[
 <?php
 // appending name/value pairs
-$smarty->append_by_ref("Name", $myname);
-$smarty->append_by_ref("Address", $address);
+$smarty->append_by_ref('Name', $myname);
+$smarty->append_by_ref('Address', $address);
 ?>
 ]]>
    </programlisting>
   </example>
+<para>
+   See also <link linkend="api.append">append()</link> and
+  <link linkend="api.assign">assign()</link>.
+</para>
+
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-append.xml?r1=1.3&r2=1.4&ty=u
Index: smarty/docs/en/programmers/api-functions/api-append.xml
diff -u smarty/docs/en/programmers/api-functions/api-append.xml:1.3 smarty/docs/en/programmers/api-functions/api-append.xml:1.4
--- smarty/docs/en/programmers/api-functions/api-append.xml:1.3	Tue Apr 20 07:27:15 2004
+++ smarty/docs/en/programmers/api-functions/api-append.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <refentry id="api.append">
  <refnamediv>
   <refname>append</refname>
@@ -36,11 +36,17 @@
 $smarty->append("Address", $address);
 
 // passing an associative array
-$smarty->append(array("city" => "Lincoln", "state" => "Nebraska"));
+$smarty->append(array('city' => 'Lincoln', 'state' => 'Nebraska'));
 ?>
 ]]>
    </programlisting>
   </example>
+  <para>See also
+  <link linkend="api.append.by.ref">append_by_ref()</link>,
+  <link linkend="api.assign">assign()</link>
+  and
+  <link linkend="api.get.template.vars">get_template_vars()</link>
+  </para>
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-assign-by-ref.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-assign-by-ref.xml
diff -u smarty/docs/en/programmers/api-functions/api-assign-by-ref.xml:1.2 smarty/docs/en/programmers/api-functions/api-assign-by-ref.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-assign-by-ref.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-assign-by-ref.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.assign.by.ref">
  <refnamediv>
   <refname>assign_by_ref</refname>
@@ -21,7 +21,8 @@
    <para>
     This is used to assign values to the templates by reference.
     If you assign a variable by reference then change its
-    value, the assigned value sees the change as well. For objects, 
+    value, the assigned value sees the change as well. For
+    <link linkend="advanced.features.objects">objects</link>,
     assign_by_ref() also avoids an in-memory copy of the assigned object.
     See the PHP manual on variable referencing for an in-depth
     explanation.
@@ -39,6 +40,13 @@
 ]]>
    </programlisting>
   </example>
+   <para>
+   See also <link linkend="api.assign">assign()</link>,
+   <link linkend="api.clear.all.assign">clear_all_assign()</link>,
+   <link linkend="api.append">append()</link>
+   and <link linkend="language.function.assign">{assign} function</link>
+   </para>
+
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
@@ -61,3 +69,4 @@
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
+
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-assign.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-assign.xml
diff -u smarty/docs/en/programmers/api-functions/api-assign.xml:1.2 smarty/docs/en/programmers/api-functions/api-assign.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-assign.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-assign.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.assign">
  <refnamediv>
   <refname>assign</refname>
@@ -31,11 +31,19 @@
 $smarty->assign('Address', $address);
 
 // passing an associative array
-$smarty->assign(array("city" => "Lincoln", "state" => "Nebraska"));
+$smarty->assign(array('city' => 'Lincoln', 'state' => 'Nebraska'));
 ?>
 ]]>
    </programlisting>
   </example>
+  <para>
+ See also <link linkend="api.assign.by.ref">assign_by_ref()</link>,
+ <link linkend="api.clear.assign">clear_assign()</link>,
+ <link linkend="api.append">append()</link>,
+ <link linkend="language.function.assign">{assign}</link>.
+ and
+ <link linkend="api.get.template.vars">get_template_vars()</link>
+ </para>
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-clear-all-assign.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-clear-all-assign.xml
diff -u smarty/docs/en/programmers/api-functions/api-clear-all-assign.xml:1.2 smarty/docs/en/programmers/api-functions/api-clear-all-assign.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-clear-all-assign.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-clear-all-assign.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.clear.all.assign">
  <refnamediv>
   <refname>clear_all_assign</refname>
@@ -25,6 +25,13 @@
 ]]>
    </programlisting>
   </example>
+  <para>
+  See also
+  <link linkend="api.clear.assign">clear_assign()</link>,
+  <link linkend="api.clear.config">clear_config()</link>,
+  <link linkend="api.assign">assign()</link>
+  and <link linkend="api.append">append()</link>
+  </para>
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
@@ -47,3 +54,4 @@
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
+
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-clear-all-cache.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-clear-all-cache.xml
diff -u smarty/docs/en/programmers/api-functions/api-clear-all-cache.xml:1.2 smarty/docs/en/programmers/api-functions/api-clear-all-cache.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-clear-all-cache.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-clear-all-cache.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.clear.all.cache">
  <refnamediv>
   <refname>clear_all_cache</refname>
@@ -27,6 +27,12 @@
 ]]>
    </programlisting>
   </example>
+  <para>
+  See also
+  <link linkend="api.clear.cache">clear_cache()</link>
+  and
+  <link linkend="caching">caching</link>
+  </para>
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-clear-assign.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-clear-assign.xml
diff -u smarty/docs/en/programmers/api-functions/api-clear-assign.xml:1.2 smarty/docs/en/programmers/api-functions/api-clear-assign.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-clear-assign.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-clear-assign.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.clear.assign">
  <refnamediv>
   <refname>clear_assign</refname>
@@ -29,6 +29,13 @@
 ]]>
    </programlisting>
   </example>
+  <para>
+    See also
+    <link linkend="api.clear.all.assign">clear_all_assign()</link>,
+    <link linkend="api.clear.config">clear_config()</link>,
+    <link linkend="api.assign">assign()</link>
+    and <link linkend="api.append">append()</link>
+  </para>
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-clear-cache.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-clear-cache.xml
diff -u smarty/docs/en/programmers/api-functions/api-clear-cache.xml:1.2 smarty/docs/en/programmers/api-functions/api-clear-cache.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-clear-cache.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-clear-cache.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.clear.cache">
  <refnamediv>
   <refname>clear_cache</refname>
@@ -40,6 +40,10 @@
 ]]>
    </programlisting>
   </example>
+  <para>
+  See also
+  <link linkend="caching">caching</link>.
+  </para>
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-clear-config.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-clear-config.xml
diff -u smarty/docs/en/programmers/api-functions/api-clear-config.xml:1.2 smarty/docs/en/programmers/api-functions/api-clear-config.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-clear-config.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-clear-config.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.clear.config">
  <refnamediv>
   <refname>clear_config</refname>
@@ -12,7 +12,9 @@
    <methodparam choice="opt"><type>string</type><parameter>var</parameter></methodparam>
   </methodsynopsis>
   <para>
-   This clears all assigned config variables. If a variable name is
+   This clears all assigned
+   <link linkend="language.config.variables">config variables</link>.
+   If a variable name is
    supplied, only that variable is cleared.
   </para>
   <example>
@@ -29,6 +31,15 @@
 ]]>
    </programlisting>
   </example>
+  <para>
+  See also
+  <link linkend="language.config.variables">config variables</link>,
+  <link linkend="config.files">config files</link>,
+  <link linkend="language.function.config.load">{config_load}</link>,
+  <link linkend="api.config.load">config_load()</link>
+  and
+  <link linkend="api.clear.assign">clear_assign()</link>
+  </para>
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-config-load.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-config-load.xml
diff -u smarty/docs/en/programmers/api-functions/api-config-load.xml:1.2 smarty/docs/en/programmers/api-functions/api-config-load.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-config-load.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-config-load.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.config.load">
  <refnamediv>
   <refname>config_load</refname>
@@ -13,20 +13,25 @@
    <methodparam choice="opt"><type>string</type><parameter>section</parameter></methodparam>
   </methodsynopsis>
   <para>
-   This loads config <parameter>file</parameter> data and assigns it to
+   This loads
+   <link linkend="config.files">config file</link>
+   data and assigns it to
    the template. This works identical to the template <link
-   linkend="language.function.config.load">config_load</link>
+   linkend="language.function.config.load">{config_load}</link>
    function.
   </para>
   <note>
    <title>Technical Note</title>
    <para>
     As of Smarty 2.4.0, assigned template variables are kept across
-    invocations of fetch() and display(). Config vars loaded from
+    invocations of
+    <link linkend="api.fetch">fetch()</link>
+    and <link linkend="api.display">display()</link>.
+    Config vars loaded from
     config_load() are always global scope. Config files are also
     compiled for faster execution, and respect the <link
-    linkend="variable.force.compile">force_compile</link> and <link
-    linkend="variable.compile.check">compile_check</link> settings.
+    linkend="variable.force.compile">$force_compile</link> and <link
+    linkend="variable.compile.check">$compile_check</link> settings.
    </para>
   </note>
   <example>
@@ -43,6 +48,13 @@
 ]]>
    </programlisting>
   </example>
+  <para>
+  See also
+  <link linkend="language.function.config.load">{config_load}</link>,
+  <link linkend="api.clear.config">clear_config()</link>,
+  and
+  <link linkend="language.config.variables">config variables</link>
+  </para>
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-display.xml?r1=1.4&r2=1.5&ty=u
Index: smarty/docs/en/programmers/api-functions/api-display.xml
diff -u smarty/docs/en/programmers/api-functions/api-display.xml:1.4 smarty/docs/en/programmers/api-functions/api-display.xml:1.5
--- smarty/docs/en/programmers/api-functions/api-display.xml:1.4	Sun May  8 15:47:01 2005
+++ smarty/docs/en/programmers/api-functions/api-display.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <refentry id="api.display">
  <refnamediv>
   <refname>display</refname>
@@ -17,7 +17,8 @@
    This displays the template. Supply a valid <link
    linkend="template.resources">template resource</link>
    type and path. As an optional second parameter, you can pass a
-   cache id. See the <link linkend="caching">caching
+   $cache id.
+   See the <link linkend="caching">caching
    section</link> for more information.
   </para>
   &parameter.compileid;
@@ -80,7 +81,7 @@
   </example>
   <para>
    See also <link linkend="api.fetch">fetch()</link> and
-   <link linkend="api.template.exists">template_exists</link>.
+   <link linkend="api.template.exists">template_exists()</link>.
   </para>
  </refsect1>
 </refentry>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-fetch.xml?r1=1.4&r2=1.5&ty=u
Index: smarty/docs/en/programmers/api-functions/api-fetch.xml
diff -u smarty/docs/en/programmers/api-functions/api-fetch.xml:1.4 smarty/docs/en/programmers/api-functions/api-fetch.xml:1.5
--- smarty/docs/en/programmers/api-functions/api-fetch.xml:1.4	Sun May  8 15:47:01 2005
+++ smarty/docs/en/programmers/api-functions/api-fetch.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <refentry id="api.fetch">
  <refnamediv>
   <refname>fetch</refname>
@@ -62,8 +62,12 @@
    </example>
   </para>
   <para>
-   See also <link linkend="api.display">display()</link> and
-   <link linkend="api.template.exists">template_exists</link>.
+   See also
+   <link linkend="language.function.fetch">{fetch}</link>
+   <link linkend="api.display">display()</link>,
+   <link linkend="language.function.eval">{eval}</link>,
+   and
+   <link linkend="api.template.exists">template_exists()</link>.
   </para>
  </refsect1>
 </refentry>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-get-config-vars.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-functions/api-get-config-vars.xml
diff -u smarty/docs/en/programmers/api-functions/api-get-config-vars.xml:1.2 smarty/docs/en/programmers/api-functions/api-get-config-vars.xml:1.3
--- smarty/docs/en/programmers/api-functions/api-get-config-vars.xml:1.2	Sun Apr 18 15:22:55 2004
+++ smarty/docs/en/programmers/api-functions/api-get-config-vars.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="api.get.config.vars">
  <refnamediv>
   <refname>get_config_vars</refname>
@@ -32,6 +32,16 @@
 ]]>
    </programlisting>
   </example>
+  <para>
+   See also
+  <link linkend="api.clear.config">clear_config()</link>,
+   <link linkend="language.function.config.load">{config_load}</link>
+   and
+<link linkend="api.config.load">config_load()</link>,
+
+
+  </para>
+
  </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-functions/api-is-cached.xml?r1=1.3&r2=1.4&ty=u
Index: smarty/docs/en/programmers/api-functions/api-is-cached.xml
diff -u smarty/docs/en/programmers/api-functions/api-is-cached.xml:1.3 smarty/docs/en/programmers/api-functions/api-is-cached.xml:1.4
--- smarty/docs/en/programmers/api-functions/api-is-cached.xml:1.3	Fri Jul  2 04:33:32 2004
+++ smarty/docs/en/programmers/api-functions/api-is-cached.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <refentry id="api.is.cached">
  <refnamediv>
   <refname>is_cached</refname>
@@ -16,7 +16,7 @@
   <para>
    This returns &true; if there is a valid cache for this template.
    This only works if <link
-   linkend="variable.caching">caching</link> is set to true.
+   linkend="variable.caching">$caching</link> is set to true.
   </para>
   <example>
    <title>is_cached</title>
@@ -35,11 +35,13 @@
    </programlisting>
   </example>
   <para>
-   You can also pass a cache id as an optional second parameter
+   You can also pass a $cache id as an optional second parameter
    in case you want multiple caches for the given template.
   </para>
   <para>
-   You can supply a compile id as an optional third parameter.
+   You can supply a
+   <link linkend="variable.compile.id">$compile id</link>
+   as an optional third parameter.
    If you omit that parameter the persistent 
    <link linkend="variable.compile.id">$compile_id</link> is used.
   </para>
@@ -78,7 +80,7 @@
    display in the example above. This also means calls to
    <link linkend="api.clear.cache">clear_cache()</link>
    and other changes of the cache-settings may have no effect after
-   <literal>is_cached</literal> returned true.
+   is_cached() returned true.
   </para>
   </note>
  </refsect1>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-cache-dir.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-cache-dir.xml
diff -u smarty/docs/en/programmers/api-variables/variable-cache-dir.xml:1.2 smarty/docs/en/programmers/api-variables/variable-cache-dir.xml:1.3
--- smarty/docs/en/programmers/api-variables/variable-cache-dir.xml:1.2	Wed Apr 14 11:53:39 2004
+++ smarty/docs/en/programmers/api-variables/variable-cache-dir.xml	Mon May 23 11:43:01 2005
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
      <sect1 id="variable.cache.dir">
       <title>$cache_dir</title>
       <para>
        This is the name of the directory where template caches are
        stored. By default this is "./cache", meaning that it will look
        for the cache directory in the same directory as the executing
-       php script. You can also use your own custom cache handler
+       php script. You can also use your own
+       <link linkend="section.template.cache.handler.func">
+       custom cache handler</link>
        function to control cache files, which will ignore this
        setting.
       </para>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-cache-handler-func.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-cache-handler-func.xml
diff -u smarty/docs/en/programmers/api-variables/variable-cache-handler-func.xml:1.2 smarty/docs/en/programmers/api-variables/variable-cache-handler-func.xml:1.3
--- smarty/docs/en/programmers/api-variables/variable-cache-handler-func.xml:1.2	Wed Apr 14 11:53:39 2004
+++ smarty/docs/en/programmers/api-variables/variable-cache-handler-func.xml	Mon May 23 11:43:01 2005
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
      <sect1 id="variable.cache.handler.func">
       <title>$cache_handler_func</title>
       <para>
        You can supply a custom function to handle cache files instead
-       of using the built-in method using the $cache_dir. See the
+       of using the built-in method using the
+       <link linkend="variable.cache.dir">$cache_dir</link>. See the
        custom  <link linkend="section.template.cache.handler.func">cache
        handler function section</link> for details.
       </para>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-cache-lifetime.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-cache-lifetime.xml
diff -u smarty/docs/en/programmers/api-variables/variable-cache-lifetime.xml:1.2 smarty/docs/en/programmers/api-variables/variable-cache-lifetime.xml:1.3
--- smarty/docs/en/programmers/api-variables/variable-cache-lifetime.xml:1.2	Wed Apr 14 11:53:39 2004
+++ smarty/docs/en/programmers/api-variables/variable-cache-lifetime.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
    <sect1 id="variable.cache.lifetime">
     <title>$cache_lifetime</title>
     <para>
@@ -24,8 +24,9 @@
      <para>
       If you want to give certain templates their own cache lifetime, you could
       do this by setting <link linkend="variable.caching">$caching</link> = 2,
-      then set $cache_lifetime to a unique value just before calling display()
-      or fetch().
+      then set $cache_lifetime to a unique value just before calling
+      <link linkend="api.display">display()</link>
+      or <link linkend="api.fetch">fetch()</link>.
      </para>
     </note>
    </sect1>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-caching.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-caching.xml
diff -u smarty/docs/en/programmers/api-variables/variable-caching.xml:1.1 smarty/docs/en/programmers/api-variables/variable-caching.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-caching.xml:1.1	Tue Apr 13 07:39:14 2004
+++ smarty/docs/en/programmers/api-variables/variable-caching.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.caching">
       <title>$caching</title>
       <para>
@@ -8,17 +8,22 @@
 	   redundant redundant content, it is advisable to turn on caching. This
 	   will result in significant performance gains. You can also have multiple
 	   caches for the same template. A value of 1 or 2 enables caching. 1 tells
-	   Smarty to use the current $cache_lifetime variable to determine if the
+	   Smarty to use the current
+	   <link linkend="variable.cache.lifetime">$cache_lifetime</link>
+	   variable to determine if the
 	   cache has expired. A value of 2 tells Smarty to use the cache_lifetime
 	   value at the time the cache was generated. This way you can set the
 	   cache_lifetime just before fetching the template to have granular
-	   control over when that particular cache expires. See also <link
-	   linkend="api.is.cached">is_cached</link>.
+	   control over when that particular cache expires.
+	   See also <link linkend="api.is.cached">is_cached()</link>.
       </para>
       <para>
-	   If $compile_check is enabled, the cached content will be regenerated if
+	   If <link linkend="variable.compile.check">$compile_check</link>
+	   is enabled, the cached content will be regenerated if
 	   any of the templates or config files that are part of this cache are
-	   changed. If $force_compile is enabled, the cached content will always be
+	   changed. If
+	   <link linkend="variable.force.compile">$force_compile</link>
+	   is enabled, the cached content will always be
 	   regenerated.
       </para>
 </sect1>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-compile-check.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-compile-check.xml
diff -u smarty/docs/en/programmers/api-variables/variable-compile-check.xml:1.1 smarty/docs/en/programmers/api-variables/variable-compile-check.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-compile-check.xml:1.1	Tue Apr 13 07:39:14 2004
+++ smarty/docs/en/programmers/api-variables/variable-compile-check.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.compile.check">
       <title>$compile_check</title>
       <para>
@@ -12,11 +12,13 @@
 	   step is no longer needed. Be sure to set $compile_check to "false" for
 	   maximal performance. Note that if you change this to "false" and a
 	   template file is changed, you will *not* see the change since the
-	   template will not get recompiled. If caching is enabled and
+	   template will not get recompiled. If
+	   <link linkend="variable.caching">caching</link>
+	   is enabled and
 	   compile_check is enabled, then the cache files will get regenerated if
 	   an involved template file or config file was updated. See <link
 	   linkend="variable.force.compile">$force_compile</link> or <link
-	   linkend="api.clear.compiled.tpl">clear_compiled_tpl</link>.
+	   linkend="api.clear.compiled.tpl">clear_compiled_tpl()</link>.
       </para>
 </sect1>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-compile-id.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-compile-id.xml
diff -u smarty/docs/en/programmers/api-variables/variable-compile-id.xml:1.2 smarty/docs/en/programmers/api-variables/variable-compile-id.xml:1.3
--- smarty/docs/en/programmers/api-variables/variable-compile-id.xml:1.2	Wed Apr  6 15:29:49 2005
+++ smarty/docs/en/programmers/api-variables/variable-compile-id.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <sect1 id="variable.compile.id">
  <title>$compile_id</title>
  <para>
@@ -9,12 +9,17 @@
  </para>
  <para>
   With a compile_id you can work around the limitation that you cannot
-  use the same compile_dir for different template_dirs.  If you set a
+  use the same
+  <link linkend="variable.compile.dir">$compile_dir</link>
+  for different
+  <link linkend="variable.template.dir">$template_dirs</link>.  If you set a
   distinct compile_id for each template_dir then smarty can tell the
   compiled templates apart by their compile_id.
  </para>
  <para>
-  If you have for example a prefilter that localizes your templates
+  If you have for example a
+  <link linkend="plugins.prefilters.postfilters">prefilter</link>
+  that localizes your templates
   (that is: translates language dependend parts) at compile time, then
   you should use the current language as compile_id and you will get a
   set of compiled templates for each language you use.
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-config-dir.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-config-dir.xml
diff -u smarty/docs/en/programmers/api-variables/variable-config-dir.xml:1.1 smarty/docs/en/programmers/api-variables/variable-config-dir.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-config-dir.xml:1.1	Tue Apr 13 07:39:14 2004
+++ smarty/docs/en/programmers/api-variables/variable-config-dir.xml	Mon May 23 11:43:01 2005
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
     <sect1 id="variable.config.dir">
       <title>$config_dir</title>
       <para>
-       This is the directory used to store config files used in the
+       This is the directory used to store
+       <link linkend="config.files">config files</link>
+       used in the
        templates. Default is "./configs", meaning that it will look
        for the configs directory in the same directory as the
        executing php script.
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-config-read-hidden.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-config-read-hidden.xml
diff -u smarty/docs/en/programmers/api-variables/variable-config-read-hidden.xml:1.1 smarty/docs/en/programmers/api-variables/variable-config-read-hidden.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-config-read-hidden.xml:1.1	Tue Apr 13 07:39:14 2004
+++ smarty/docs/en/programmers/api-variables/variable-config-read-hidden.xml	Mon May 23 11:43:01 2005
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.config.read.hidden">
       <title>$config_read_hidden</title>
       <para>
 	   If set to true, hidden sections (section names beginning with a period)
-	   in config files can be read from templates. Typically you would leave
+	   in
+	   <link linkend="config.files">config files</link>
+	   can be read from templates. Typically you would leave
 	   this false, that way you can store sensitive data in the config files
 	   such as database parameters and not worry about the template loading
 	   them. false by default.
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-debug-tpl.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-debug-tpl.xml
diff -u smarty/docs/en/programmers/api-variables/variable-debug-tpl.xml:1.1 smarty/docs/en/programmers/api-variables/variable-debug-tpl.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-debug-tpl.xml:1.1	Tue Apr 13 07:39:14 2004
+++ smarty/docs/en/programmers/api-variables/variable-debug-tpl.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.debug.tpl">
       <title>$debug_tpl</title>
       <para>
@@ -7,6 +7,12 @@
 	   default, it is named debug.tpl and is located in the <link
 	   linkend="constant.smarty.dir">SMARTY_DIR</link>.
       </para>
+      <para>
+      See also
+      <link linkend="variable.debugging">$debugging</link>
+      and
+      <link linkend="chapter.debugging.console">Debugging console</link>
+      </para>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-debugging-ctrl.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-debugging-ctrl.xml
diff -u smarty/docs/en/programmers/api-variables/variable-debugging-ctrl.xml:1.1 smarty/docs/en/programmers/api-variables/variable-debugging-ctrl.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-debugging-ctrl.xml:1.1	Tue Apr 13 07:39:14 2004
+++ smarty/docs/en/programmers/api-variables/variable-debugging-ctrl.xml	Mon May 23 11:43:01 2005
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.debugging.ctrl">
       <title>$debugging_ctrl</title>
       <para>
        This allows alternate ways to enable debugging. NONE means no
        alternate methods are allowed. URL means when the keyword
        SMARTY_DEBUG is found in the QUERY_STRING, debugging is enabled
-       for that invocation of the script. If $debugging is true, this
+       for that invocation of the script. If
+       <link linkend="variable.debugging">$debugging</link> is true, this
        value is ignored.
       </para>
+      <para>
+      See also <link linkend="chapter.debugging.console">Debugging console</link>.
+      </para>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-debugging.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-debugging.xml
diff -u smarty/docs/en/programmers/api-variables/variable-debugging.xml:1.1 smarty/docs/en/programmers/api-variables/variable-debugging.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-debugging.xml:1.1	Tue Apr 13 07:39:14 2004
+++ smarty/docs/en/programmers/api-variables/variable-debugging.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.debugging">
       <title>$debugging</title>
       <para>
@@ -9,6 +9,12 @@
        included templates and assigned variables for the current
        template page.
       </para>
+      <para>
+      See also
+      <link linkend="language.function.debug">{debug}</link>,
+      <link linkend="variable.debug.tpl">$debug_tpl</link>,
+      and <link linkend="variable.debugging.ctrl">$debuging_ctrl</link>
+      </para>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-error-reporting.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-error-reporting.xml
diff -u smarty/docs/en/programmers/api-variables/variable-error-reporting.xml:1.2 smarty/docs/en/programmers/api-variables/variable-error-reporting.xml:1.3
--- smarty/docs/en/programmers/api-variables/variable-error-reporting.xml:1.2	Sun May  8 15:47:01 2005
+++ smarty/docs/en/programmers/api-variables/variable-error-reporting.xml	Mon May 23 11:43:01 2005
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <sect1 id="variable.error.reporting">
  <title>$error_reporting</title>
  <para>
   When this value is set to a non-null-value it's value is used as php's
-  error_reporting-level inside of <link linkend="api.display">display()</link>
+  <ulink url="&url.php-manual;error_reporting">error_reporting</ulink>
+  level inside of <link linkend="api.display">display()</link>
   and <link linkend="api.fetch">fetch()</link>. When <link
    linkend="chapter.debugging.console">debugging</link> is enabled this value
   is ignored and the error-level is left untouched.
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-force-compile.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-force-compile.xml
diff -u smarty/docs/en/programmers/api-variables/variable-force-compile.xml:1.1 smarty/docs/en/programmers/api-variables/variable-force-compile.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-force-compile.xml:1.1	Tue Apr 13 07:39:14 2004
+++ smarty/docs/en/programmers/api-variables/variable-force-compile.xml	Mon May 23 11:43:01 2005
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.force.compile">
       <title>$force_compile</title>
       <para>
        This forces Smarty to (re)compile templates on every
-       invocation. This setting overrides $compile_check. By default
-       this is disabled. This is handy for development and debugging.
-       It should never be used in a production environment. If caching
+       invocation. This setting overrides
+       <link linkend="variable.compile.check">$compile_check</link>.
+       By default
+       this is disabled. This is handy for development and
+       <link linkend="chapter.debugging.console">debugging</link>.
+       It should never be used in a production environment. If
+       <link linkend="variable.caching">caching</link>
        is enabled, the cache file(s) will be regenerated every time.
       </para>
 </sect1>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-plugins-dir.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-plugins-dir.xml
diff -u smarty/docs/en/programmers/api-variables/variable-plugins-dir.xml:1.2 smarty/docs/en/programmers/api-variables/variable-plugins-dir.xml:1.3
--- smarty/docs/en/programmers/api-variables/variable-plugins-dir.xml:1.2	Fri Feb 11 10:58:11 2005
+++ smarty/docs/en/programmers/api-variables/variable-plugins-dir.xml	Mon May 23 11:43:01 2005
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
      <sect1 id="variable.plugins.dir">
       <title>$plugins_dir</title>
       <para>
        This is the directory (or directories) where Smarty will look for the
-       plugins that it needs. Default is "plugins" under the SMARTY_DIR. If you
-       supply a relative path, Smarty will first look under the SMARTY_DIR, then
+       plugins that it needs. Default is "plugins" under the
+       <link linkend="constant.smarty.dir">SMARTY_DIR</link>. If you
+       supply a relative path, Smarty will first look under the
+       <link linkend="constant.smarty.dir">SMARTY_DIR</link>, then
        relative to the cwd (current working directory), then relative to the PHP
        include_path. If $plugins_dir is an array of directories, Smarty will
        search for your plugin in each plugin directory in the order they are
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-request-use-auto-globals.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-request-use-auto-globals.xml
diff -u smarty/docs/en/programmers/api-variables/variable-request-use-auto-globals.xml:1.1 smarty/docs/en/programmers/api-variables/variable-request-use-auto-globals.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-request-use-auto-globals.xml:1.1	Tue Apr 13 07:39:14 2004
+++ smarty/docs/en/programmers/api-variables/variable-request-use-auto-globals.xml	Mon May 23 11:43:01 2005
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.request.use.auto.globals">
       <title>$request_use_auto_globals</title>
       <para>
 	   Specifies if Smarty should use php's $HTTP_*_VARS[]
 	   ($request_use_auto_globals=false which is the default value) or
 	   $_*[] ($request_use_auto_globals=true). This affects templates
-	   that make use of {$smarty.request.*}, {$smarty.get.*} etc. .
+ that make use of
+ <link linkend="language.variables.smarty">{$smarty.request.*}, {$smarty.get.*}</link> etc. .
 	   Caution: If you set $request_use_auto_globals to true, <link
-	   linkend="variable.request.vars.order">variable.request.vars.order
+ linkend="variable.request.vars.order">$request_vars_order
 	   </link> has no effect but php's configuration value
 	   <literal>gpc_order</literal> is used.
       </para>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-request-vars-order.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-request-vars-order.xml
diff -u smarty/docs/en/programmers/api-variables/variable-request-vars-order.xml:1.1 smarty/docs/en/programmers/api-variables/variable-request-vars-order.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-request-vars-order.xml:1.1	Tue Apr 13 07:39:15 2004
+++ smarty/docs/en/programmers/api-variables/variable-request-vars-order.xml	Mon May 23 11:43:01 2005
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.request.vars.order">
       <title>$request_vars_order</title>
       <para>
        The order in which request variables are registered, similar to
        variables_order in php.ini
       </para>
+ <para>
+ See also <link linkend="language.variables.smarty">$smarty.request</link>
+ and
+ <link linkend="variable.request.use.auto.globals">$request_use_auto_globals</link>.
+ </para>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-secure-dir.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-secure-dir.xml
diff -u smarty/docs/en/programmers/api-variables/variable-secure-dir.xml:1.1 smarty/docs/en/programmers/api-variables/variable-secure-dir.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-secure-dir.xml:1.1	Tue Apr 13 07:39:15 2004
+++ smarty/docs/en/programmers/api-variables/variable-secure-dir.xml	Mon May 23 11:43:01 2005
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.secure.dir">
       <title>$secure_dir</title>
       <para>
        This is an array of all local directories that are considered
-       secure. {include} and {fetch} use this when security is enabled.
+ secure.
+ <link linkend="language.function.include">{include}</link>
+ and <link linkend="language.function.fetch">{fetch}</link>
+ use this when
+ <link linkend="variable.security">security is enabled</link>.
       </para>
+<para>
+ See also
+ <link linkend="variable.security.settings">Security settings</link>,
+ and <link linkend="variable.trusted.dir">$trusted_dir</link>.
+</para>
+
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-security-settings.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-security-settings.xml
diff -u smarty/docs/en/programmers/api-variables/variable-security-settings.xml:1.2 smarty/docs/en/programmers/api-variables/variable-security-settings.xml:1.3
--- smarty/docs/en/programmers/api-variables/variable-security-settings.xml:1.2	Thu Jan  6 04:18:13 2005
+++ smarty/docs/en/programmers/api-variables/variable-security-settings.xml	Mon May 23 11:43:01 2005
@@ -1,26 +1,54 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
      <sect1 id="variable.security.settings">
       <title>$security_settings</title>
       <para>
        These are used to override or specify the security settings when
-       security is enabled. These are the possible settings:
+<link linkend="variable.security">security is enabled</link>.
+These are the possible settings:
       </para>
       <itemizedlist>
-       <listitem><para>PHP_HANDLING - true/false. If set to true, the
-         $php_handling setting is not checked for security.</para></listitem>
-       <listitem><para>IF_FUNCS - This is an array of the names of permitted
-         PHP functions in IF statements.</para></listitem>
-       <listitem><para>INCLUDE_ANY - true/false. If set to true, any
+<listitem>
+ <para>
+  PHP_HANDLING - true/false. If set to true, the
+  <link linkend="variable.php.handling">$php_handling</link>
+  setting is not checked for security.
+ </para>
+</listitem>
+<listitem>
+ <para>
+  IF_FUNCS - This is an array of the names of permitted PHP functions in
+  <link linkend="language.function.if">IF</link> statements.
+ </para>
+</listitem>
+<listitem>
+ <para>
+  INCLUDE_ANY - true/false. If set to true, any
          template can be included from the file system, regardless of the
-         $secure_dir list.</para></listitem>
-       <listitem><para>PHP_TAGS - true/false. If set to true, {php}{/php}
-         tags are permitted in the templates.</para></listitem>
-       <listitem><para>MODIFIER_FUNCS - This is an array of the names of permitted
-         PHP functions used as variable modifiers.</para></listitem>
-       <listitem><para>ALLOW_CONSTANTS - true/false. If set to true, constants via
-         {$smarty.const.name} are allowed in the templates. The defaults is set to
-         "false" for security.</para></listitem>
+  <link linkend="variable.secure.dir">$secure_dir</link> list.
+ </para>
+</listitem>
+<listitem>
+ <para>
+  PHP_TAGS - true/false. If set to true,
+  <link linkend="language.function.php">{php}{/php}</link>
+  tags are permitted in the templates.
+ </para>
+</listitem>
+<listitem>
+ <para>
+  MODIFIER_FUNCS - This is an array of the names of permitted
+  PHP functions used as variable modifiers.
+ </para>
+</listitem>
+<listitem>
+ <para>
+  ALLOW_CONSTANTS - true/false. If set to true, constants via
+  <link linkend="language.variables.smarty.const">{$smarty.const.name}</link>
+  are allowed in the templates. The defaults is set to
+  "false" for security.
+ </para>
+</listitem>
       </itemizedlist>
 </sect1>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-security.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-security.xml
diff -u smarty/docs/en/programmers/api-variables/variable-security.xml:1.1 smarty/docs/en/programmers/api-variables/variable-security.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-security.xml:1.1	Tue Apr 13 07:39:15 2004
+++ smarty/docs/en/programmers/api-variables/variable-security.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.security">
       <title>$security</title>
       <para>
@@ -8,20 +8,39 @@
        (via ftp for example) and you want to reduce the risk of system
        security compromises through the template language. Turning on
        security enforces the following rules to the template language,
-       unless specifially overridden with $security_settings:
+ unless specifially overridden with
+ <link linkend="variable.security.settings">$security_settings</link>:
       </para>
       <itemizedlist>
-       <listitem><para>If $php_handling is set to SMARTY_PHP_ALLOW, this is
-         implicitly changed to SMARTY_PHP_PASSTHRU</para></listitem>
-       <listitem><para>PHP functions are not allowed in IF statements,
-         except those specified in the $security_settings</para></listitem>
-       <listitem><para>templates can only be included from directories
-         listed in the $secure_dir array</para></listitem>
-       <listitem><para>local files can only be fetched from directories
-         listed in the $secure_dir array using {fetch}</para></listitem>
-       <listitem><para>{php}{/php} tags are not allowed</para></listitem>
-       <listitem><para>PHP functions are not allowed as modifiers, except
-         those specified in the $security_settings</para></listitem>
+<listitem>
+<para>If <link linkend="variable.php.handling">$php_handling</link>
+is set to SMARTY_PHP_ALLOW, this is
+implicitly changed to SMARTY_PHP_PASSTHRU
+</para></listitem>
+<listitem>
+<para>
+PHP functions are not allowed in <link
+linkend="language.function.if">{if}</link> statements,
+except those specified in the
+<link linkend="variable.security.settings">$security_settings</link>
+</para></listitem>
+<listitem><para>
+templates can only be included from directories
+listed in the
+<link linkend="variable.secure.dir">$secure_dir</link> array
+</para></listitem>
+<listitem><para>
+local files can only be fetched from directories listed in the
+<link linkend="variable.secure.dir">$secure_dir</link>
+array using <link linkend="language.function.fetch">{fetch}</link>
+</para></listitem>
+<listitem><para>
+<link linkend="language.function.php">{php}{/php}</link> tags are not allowed
+</para></listitem>
+<listitem><para>
+PHP functions are not allowed as modifiers, except those specified in the
+<link linkend="variable.security.settings">$security_settings</link>
+</para></listitem>
       </itemizedlist>
 </sect1>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/en/programmers/api-variables/variable-trusted-dir.xml?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/en/programmers/api-variables/variable-trusted-dir.xml
diff -u smarty/docs/en/programmers/api-variables/variable-trusted-dir.xml:1.1 smarty/docs/en/programmers/api-variables/variable-trusted-dir.xml:1.2
--- smarty/docs/en/programmers/api-variables/variable-trusted-dir.xml:1.1	Tue Apr 13 07:39:15 2004
+++ smarty/docs/en/programmers/api-variables/variable-trusted-dir.xml	Mon May 23 11:43:01 2005
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
      <sect1 id="variable.trusted.dir">
       <title>$trusted_dir</title>
       <para>
-	   $trusted_dir is only for use when $security is enabled. This is an array
-	   of all directories that are considered trusted. Trusted directories are
-	   where you keep php scripts that are executed directly from the templates
+  $trusted_dir is only for use when
+  <link linkend="variable.security">$security</link> is enabled.
+  This is an array  of all directories that are considered trusted.
+  Trusted directories are where you keep php scripts that are executed
+  directly from the templates
 	   with <link linkend="language.function.include.php">{include_php}</link>.
       </para>
 </sect1>
http://cvs.php.net/diff.php/smarty/docs/en/programmers/caching/caching-setting-up.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/en/programmers/caching/caching-setting-up.xml
diff -u smarty/docs/en/programmers/caching/caching-setting-up.xml:1.2 smarty/docs/en/programmers/caching/caching-setting-up.xml:1.3
--- smarty/docs/en/programmers/caching/caching-setting-up.xml:1.2	Tue Apr 13 08:14:17 2004
+++ smarty/docs/en/programmers/caching/caching-setting-up.xml	Mon May 23 11:43:01 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <sect1 id="caching.setting.up">
    <title>Setting Up Caching</title>
    <para>
@@ -31,7 +31,9 @@
    <note>
     <title>Technical Note</title>
     <para>
-     The files in the $cache_dir are named similar to the template name.
+     The files in the
+     <link linkend="variable.cache.dir">$cache_dir</link>
+     are named similar to the template name.
      Although they end in the ".php" extention, they are not really executable
      php scripts. Do not edit these files!
     </para>
@@ -41,7 +43,9 @@
     linkend="variable.cache.lifetime">$cache_lifetime</link>. The default value
     is 3600 seconds, or 1 hour. After that time expires, the cache is
     regenerated. It is possible to give individual caches their own expiration
-    time by setting $caching = 2. See the documentation on <link
+    time by setting
+    <link linkend="variable.caching">$caching</link> = 2.
+    See the documentation on <link
     linkend="variable.cache.lifetime">$cache_lifetime</link> for details.
    </para>
    <example>
@@ -77,7 +81,9 @@
     every template file and config file that is involved with the cache file is
     checked for modification. If any of the files have been modified since the
     cache was generated, the cache is immediately regenerated. This is a slight
-    overhead so for optimum performance, leave $compile_check set to false.
+    overhead so for optimum performance, leave
+    <link linkend="variable.compile.check">$compile_check</link>
+    set to false.
    </para>
    <example>
     <title>enabling $compile_check</title>
@@ -98,7 +104,9 @@
    <para>
     If <link linkend="variable.force.compile">$force_compile</link> is enabled,
     the cache files will always be regenerated. This effectively turns off
-    caching. $force_compile is usually for debugging purposes only, a more
+    caching.
+    <link linkend="variable.force.compile">$force_compile</link>
+    is usually for debugging purposes only, a more
     efficient way of disabling caching is to set <link
     linkend="variable.caching">$caching</link> = false (or 0.)
    </para>
@@ -131,11 +139,11 @@
    </example>
    <para>
     You can keep parts of a page dynamic with the <link
-    linkend="language.function.insert">insert</link> template function. Let's
+    linkend="language.function.insert">{insert}</link> template function. Let's
     say the whole page can be cached except for a banner that is displayed down
     the right side of the page. By using an insert function for the banner, you
     can keep this element dynamic within the cached content. See the
-    documentation on <link linkend="language.function.insert">insert</link> for
+    documentation on <link linkend="language.function.insert">{insert}</link> for
     details and examples.
    </para>
    <para>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.