sync with EN

2025-08-06 03:14:27 +02:00 · 2006-07-20 11:56:09 +00:00
parent 88b4bb7b34
commit 787b4b1f09
11 changed files with 179 additions and 98 deletions
--- a/docs/ru/designers/language-custom-functions/language-function-assign.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-assign.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.6 Maintainer: freespace Status: ready -->
+<!-- EN-Revision: 1.8 Maintainer: freespace Status: ready -->
 <sect1 id="language.function.assign">
 <title>{assign}</title>
 <para>
@@ -63,10 +63,20 @@
  </screen>
 </example>
 
+ <example>
+  <title>{assign} <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></title>
+  <para><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></para>
+  <programlisting>
+<![CDATA[
+{assign var=running_total value=`$running_total+$some_array[loop].some_value`}
+]]>
+  </programlisting>
+ </example>
+ 
 <example>
  <title><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {assign} <20><> PHP-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.</title>
  <para>
-   <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {assign} <20><> PHP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+   <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {assign} <20><> PHP-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
   <link linkend="api.get.template.vars">get_template_vars()</link>.
   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>
   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
--- a/docs/ru/designers/language-custom-functions/language-function-eval.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-eval.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
+<!-- EN-Revision: 1.6 Maintainer: freespace Status: ready -->
 <sect1 id="language.function.eval">
 	<title>{eval}</title>
 <para>
@@ -69,28 +69,26 @@
  <title>{eval}</title>
  <programlisting>
 <![CDATA[
-   setup.conf
-   ----------
-
-   emphstart = <strong>
-   emphend = </strong>
-   title = Welcome to {$company}'s home page!
-   ErrorCity = You must supply a {#emphstart#}city{#emphend#}.
-   ErrorState = You must supply a {#emphstart#}state{#emphend#}.
+#setup.conf
+#----------
+emphstart = <strong>
+emphend = </strong>
+title = Welcome to {$company}'s home page!
+ErrorCity = You must supply a {#emphstart#}city{#emphend#}.
+ErrorState = You must supply a {#emphstart#}state{#emphend#}.
 ]]>
  </programlisting>
  <para>
-   index.tpl:
+   <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
  </para>
  <programlisting>
 <![CDATA[
-   {config_load file="setup.conf"}
-
-   {eval var=$foo}
-   {eval var=#title#}
-   {eval var=#ErrorCity#}
-   {eval var=#ErrorState# assign="state_error"}
-   {$state_error}
+{config_load file='setup.conf'}
+{eval var=$foo}
+{eval var=#title#}
+{eval var=#ErrorCity#}
+{eval var=#ErrorState# assign='state_error'}
+{$state_error}
 ]]>
  </programlisting>
  <para>
@@ -98,13 +96,37 @@
  </para>
  <screen>
 <![CDATA[
-   This is the contents of foo.
-   Welcome to Foobar Pub & Grill's home page!
-   You must supply a <strong>city</strong>.
-   You must supply a <strong>state</strong>.
+This is the contents of foo.
+Welcome to Foobar Pub & Grill's home page!
+You must supply a <strong>city</strong>.
+You must supply a <strong>state</strong>.
 ]]>
  </screen>
 </example>
+ 
+ <example>
+  <title><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {eval}</title>
+  <para>
+   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <20> IP-<2D><><EFBFBD><EFBFBD><EFBFBD>. 
+   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> $str <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><>.
+  </para>
+  <programlisting role="php">
+<![CDATA[
+// php script
+$str = 'The server name is {$smarty.server.SERVER_NAME|upper} '
+       .'at {$smarty.server.SERVER_ADDR}';
+$smarty->assign('foo',$str);
+]]>
+  </programlisting>
+  <para>
+   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
+  </para>
+  <programlisting>
+<![CDATA[
+    {eval var=$foo}
+]]>
+  </programlisting>
+ </example>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
--- a/docs/ru/designers/language-custom-functions/language-function-fetch.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-fetch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.9 Maintainer: freespace Status: ready -->
+<!-- EN-Revision: 1.11 Maintainer: freespace Status: ready -->
 <sect1 id="language.function.fetch">
 <title>{fetch}</title>
 <para>
@@ -14,8 +14,7 @@
 </para>
 <para>
  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "assign", <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {fetch}
-  <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>
-  Smarty <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1.5.0.
+  <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
 </para>
 
 <informaltable frame="all">
@@ -63,29 +62,31 @@
 <note>
  <title><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></title>
  <para>
-   <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> security <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>
-   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-   (<link linkend="variable.secure.dir">$secure_dir</link>).
+   <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <link linkend="variable.security">$security</link>
+   <20> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>
+   <20><><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+   <link linkend="variable.secure.dir"><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD></link>.
  </para>
 </note>
 <example>
-  <title>{fetch}</title>
+  <title><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {fetch}</title>
  <programlisting>
 <![CDATA[
 {* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> javascript <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *}
-{fetch file="/export/httpd/www.example.com/docs/navbar.js"}
+{fetch file='/export/httpd/www.example.com/docs/navbar.js'}

 {* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *}
-{fetch file="http://www.myweather.com/68502/"}
+{fetch file='http://www.myweather.com/68502/'}

 {* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> ftp <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *}
-{fetch file="ftp://user:password@ftp.example.com/path/to/currentheadlines.txt"}
+{fetch file='ftp://user:password@ftp.example.com/path/to/currentheadlines.txt'}
+{* <20><><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *}
+{fetch file="ftp://`$user`:`$password`@`$server`/`$path`"}

 {* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *}
-{fetch file="http://www.myweather.com/68502/" assign="weather"}
-{if $weather ne ""}
-  <b>{$weather}</b>
+{fetch file='http://www.myweather.com/68502/' assign='weather'}
+{if $weather ne ''}
+  <div id="weather">{$weather}</div>
 {/if}
 ]]>
  </programlisting>
@@ -94,7 +95,8 @@
 <para>
 <20><>. <20><><EFBFBD><EFBFBD><EFBFBD>
 <link linkend="language.function.capture">{capture}</link>,
- <link linkend="language.function.eval">{eval}</link>
+ <link linkend="language.function.eval">{eval}</link>,
+ <link linkend="language.function.assign">{assign}</link>
 <20>
 <link linkend="api.fetch">fetch()</link>.
 </para>
--- a/docs/ru/designers/language-custom-functions/language-function-html-checkboxes.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-html-checkboxes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.11 Maintainer: freespace Status: ready -->
+<!-- EN-Revision: 1.16 Maintainer: freespace Status: ready -->
 <sect1 id="language.function.html.checkboxes">
 <title>{html_checkboxes}</title>
 <para>
@@ -9,7 +9,7 @@
  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> HTML <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
  <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> values <20> output <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-  options. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> XHTML.
+  options. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> XHTML.
 </para>
 
 <informaltable frame="all">
@@ -78,6 +78,13 @@
    <entry><emphasis>true</emphasis></entry>
    <entry><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &lt;label&gt;-<2D><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD></entry>
   </row>
+   <row>
+    <entry>assign</entry>
+    <entry>string</entry>
+    <entry><EFBFBD><EFBFBD><EFBFBD></entry>
+    <entry><emphasis><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></emphasis></entry>
+    <entry><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD></entry>
+   </row>
  </tbody>
  </tgroup>
 </informaltable>
--- a/docs/ru/designers/language-custom-functions/language-function-html-image.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-html-image.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.7 Maintainer: freespace Status: ready -->
+<!-- EN-Revision: 1.8 Maintainer: freespace Status: ready -->
 <sect1 id="language.function.html.image">
 <title>{html_image}</title>
 <para>
@@ -114,22 +114,18 @@
  </para>
 </note>
 <example>
-  <title>{html_image}</title>
+  <title><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> html_image</title>
  <programlisting>
 <![CDATA[
-{html_image file="pumpkin.jpg"}
-{html_image file="/path/from/docroot/pumpkin.jpg"}
-{html_image file="../path/relative/to/currdir/pumpkin.jpg"}
-
-OUTPUT: (possible)
-
-<img src="pumpkin.jpg" width="44" height="68">
-<img src="/path/under/docroot/pumpkin.jpg" width="44" height="68">
-<img src="../path/relative/to/currdir/pumpkin.jpg" width="44" height="68">
+index.tpl:
+-------------------
+{html_image file='pumpkin.jpg'}
+{html_image file='/path/from/docroot/pumpkin.jpg'}
+{html_image file='../path/relative/to/currdir/pumpkin.jpg'}
 ]]>
  </programlisting>
  <para>
-   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
+    <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
  </para>
  <screen>
 <![CDATA[
--- a/docs/ru/designers/language-custom-functions/language-function-html-options.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-html-options.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.12 Maintainer: freespace Status: ready -->
+<!-- EN-Revision: 1.14 Maintainer: freespace Status: ready -->
 <sect1 id="language.function.html.options">
 <title>{html_options}</title>
 <para>{html_options} <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -158,11 +158,11 @@ $smarty->assign('customer_id', 1001);
 <![CDATA[
 <?php

-$sql = 'select type_id, types from types order by type';
-$smarty->assign('types',$db->getAssoc($sql));
+$sql = 'select type_id, types from contact_types order by type';
+$smarty->assign('contact_types',$db->getAssoc($sql));

-$sql = 'select contact_id, name, email, type_id
-        from contacts where contact_id='.$contact_id;
+$sql = 'select contact_id, name, email, contact_type_id
+         from contacts where contact_id='.$contact_id;
 $smarty->assign('contact',$db->getRow($sql));

 ?>
@@ -175,7 +175,7 @@ $smarty->assign('contact',$db->getRow($sql));
 <![CDATA[
 <select name="type_id">
    <option value='null'>-- none --</option>
-    {html_options name="type" options=$types selected=$contact.type_id}
+    {html_options options=$contact_types selected=$contact.type_id}
 </select>
 ]]>
  </programlisting>
--- a/docs/ru/designers/language-custom-functions/language-function-html-radios.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-html-radios.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.11 Maintainer: freespace Status: ready -->
+<!-- EN-Revision: 1.16 Maintainer: freespace Status: ready -->
 <sect1 id="language.function.html.radios">
 <title>{html_radios}</title>
 <para>{html_radios} <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -8,7 +8,7 @@
  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> HTML <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
  <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> values <20> output <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-  options. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> XHTML.
+  options. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> XHTML.
 </para>
 
 <informaltable frame="all">
@@ -71,6 +71,13 @@
             <entry><emphasis><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></emphasis></entry>
             <entry><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD></entry>
         </row>
+    <row>
+     <entry>assign</entry>
+     <entry>string</entry>
+     <entry><EFBFBD><EFBFBD><EFBFBD></entry>
+     <entry><emphasis><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></emphasis></entry>
+     <entry><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> radio <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD></entry>
+    </row>
     </tbody>
     </tgroup>
 </informaltable>
@@ -81,7 +88,7 @@
 </para>

 <example>
-  <title>{html_radios}: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>1</title>
+  <title>{html_radios} - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>1</title>
  <programlisting role="php">
 <![CDATA[
 <?php
@@ -103,13 +110,13 @@ $smarty->assign('customer_id', 1001);
  </para>
  <programlisting>
 <![CDATA[
-{html_radios name="id" values=$cust_ids output=$cust_names
-       selected=$customer_id separator="<br />"}
+{html_radios name='id' values=$cust_ids output=$cust_names
+       selected=$customer_id separator='<br />'}
 ]]>
  </programlisting>
 </example>
 <example>
-  <title>{html_radios}: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>2</title>
+  <title>{html_radios} - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>2</title>
  <programlisting role="php">
 <![CDATA[
 <?php
@@ -133,7 +140,7 @@ $smarty->assign('customer_id', 1001);
 ]]>
  </programlisting>
  <para>
-   Both examples will output:
+   <EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
  </para>
  <screen>
 <![CDATA[
@@ -146,16 +153,16 @@ $smarty->assign('customer_id', 1001);
  </screen>
 </example>
 <example>
-  <title>{html_radios}- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, PEAR <20><><EFBFBD> ADODB):</title>
+  <title>{html_radios} - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, PEAR <20><><EFBFBD> ADODB):</title>
  <programlisting role="php">
 <![CDATA[
 <?php

-$sql = 'select type_id, types from types order by type';
-$smarty->assign('types',$db->getAssoc($sql));
+$sql = 'select type_id, types from contact_types order by type';
+$smarty->assign('contact_types',$db->getAssoc($sql));

-$sql = 'select contact_id, name, email, type_id
-        from contacts where contact_id='.$contact_id;
+$sql = 'select contact_id, name, email, contact_type_id '
+        .'from contacts where contact_id='.$contact_id;
 $smarty->assign('contact',$db->getRow($sql));

 ?>
@@ -166,7 +173,8 @@ $smarty->assign('contact',$db->getRow($sql));
  </para>
  <programlisting>
 <![CDATA[
-{html_radios name="type" options=$types selected=$contact.type_id separator="<br />"}
+{html_radios name='contact_type_id' options=$contact_types 
+     selected=$contact.contact_type_id separator='<br />'}
 ]]>
  </programlisting>
 </example>
--- a/docs/ru/designers/language-custom-functions/language-function-html-table.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-html-table.xml
@@ -42,7 +42,7 @@
    </row>
    <row>
     <entry>cols</entry>
-     <entry>integer</entry>
+     <entry>mixed</entry>
     <entry><EFBFBD><EFBFBD><EFBFBD></entry>
     <entry><emphasis>3</emphasis></entry>
     <entry>
@@ -51,6 +51,8 @@
      <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>
      <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28> rows, <20> cols) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
      cols <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 3.
+      <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>-<2D><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+      <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>-<2D><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
     </entry>
    </row>
    <row>
@@ -76,6 +78,15 @@
      <emphasis>rows</emphasis> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
     </entry>
    </row>
+    <row>
+     <entry>caption</entry>
+     <entry>string</entry>
+     <entry><EFBFBD><EFBFBD><EFBFBD></entry>
+     <entry><emphasis><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></emphasis></entry>
+     <entry>
+      <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
+     </entry>
+    </row>
    <row>
     <entry>table_attr</entry>
     <entry>string</entry>
@@ -83,18 +94,25 @@
     <entry><emphasis>border="1"</emphasis></entry>
     <entry><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> table</entry>
    </row>
+    <row>
+     <entry>th_attr</entry>
+     <entry>string</entry>
+     <entry><EFBFBD><EFBFBD><EFBFBD></entry>
+     <entry><emphasis><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></emphasis></entry>
+     <entry><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> th (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)</entry>
+    </row>
    <row>
     <entry>tr_attr</entry>
     <entry>string</entry>
     <entry><EFBFBD><EFBFBD><EFBFBD></entry>
-     <entry><emphasis>empty</emphasis></entry>
+     <entry><emphasis><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></emphasis></entry>
     <entry><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> tr (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)</entry>
    </row>
    <row>
     <entry>td_attr</entry>
     <entry>string</entry>
     <entry><EFBFBD><EFBFBD><EFBFBD></entry>
-     <entry><emphasis>empty</emphasis></entry>
+     <entry><emphasis><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></emphasis></entry>
     <entry><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> td (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)</entry>
    </row>
    <row>
@@ -153,7 +171,7 @@ $smarty->display('index.tpl');
 <![CDATA[
 {html_table loop=$data}
 {html_table loop=$data cols=4 table_attr='border="0"'}
-{html_table loop=$data cols=4 tr_attr=$tr}
+{html_table loop=$data cols="first,second,third,fourth" tr_attr=$tr}
 ]]>
  </programlisting>
  <para>
@@ -162,19 +180,30 @@ $smarty->display('index.tpl');
  <screen>
 <![CDATA[
 <table border="1">
+<tbody>
 <tr><td>1</td><td>2</td><td>3</td></tr>
 <tr><td>4</td><td>5</td><td>6</td></tr>
 <tr><td>7</td><td>8</td><td>9</td></tr>
+</tbody>
 </table>
 <table border="0">
+<tbody>
 <tr><td>1</td><td>2</td><td>3</td><td>4</td></tr>
 <tr><td>5</td><td>6</td><td>7</td><td>8</td></tr>
 <tr><td>9</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+</tbody>
 </table>
 <table border="1">
+<thead>
+<tr>
+<th>first</th><th>second</th><th>third</th><th>fourth</th>
+</tr>
+</thead>
+<tbody>
 <tr bgcolor="#eeeeee"><td>1</td><td>2</td><td>3</td><td>4</td></tr>
 <tr bgcolor="#dddddd"><td>5</td><td>6</td><td>7</td><td>8</td></tr>
 <tr bgcolor="#eeeeee"><td>9</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+</tbody>
 </table>
 ]]>
  </screen>
--- a/docs/ru/designers/language-custom-functions/language-function-mailto.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-mailto.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.6 Maintainer: freespace Status: ready -->
+<!-- EN-Revision: 1.7 Maintainer: freespace Status: ready -->
 <sect1 id="language.function.mailto">
 <title>{mailto}</title>
  <para>
@@ -113,38 +113,38 @@
  </para>
 </note>
 <example>
-  <title>{mailto}</title>
+  <title><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {mailto} <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></title>
  <programlisting>
 <![CDATA[
-   {mailto address="me@example.com"}
+{mailto address="me@example.com"}
 <a href="mailto:me@example.com" >me@example.com</a>

-   {mailto address="me@example.com" text="send me some mail"}
+{mailto address="me@example.com" text="send me some mail"}
 <a href="mailto:me@example.com" >send me some mail</a>

-   {mailto address="me@example.com" encode="javascript"}
+{mailto address="me@example.com" encode="javascript"}
 <script type="text/javascript" language="javascript">
 eval(unescape('%64%6f% ... snipped ...%61%3e%27%29%3b'))
 </script>

-   {mailto address="me@example.com" encode="hex"}
+{mailto address="me@example.com" encode="hex"}
 <a href="mailto:%6d%65.. snipped..3%6f%6d">&#x6d;&..snipped...#x6f;&#x6d;</a>

-   {mailto address="me@example.com" subject="Hello to you!"}
-   <a href="mailto:me@example.com?subject=Hello%20to%20you%21" >me@example.com</a>
+{mailto address="me@example.com" subject="Hello to you!"}
+<a href="mailto:me@example.com?subject=Hello%20to%20you%21" >me@example.com</a>

 {mailto address="me@example.com" cc="you@example.com,they@example.com"}
-   <a href="mailto:me@example.com?cc=you@example.com%2Cthey@example.com" >me@example.com</a>
+<a href="mailto:me@example.com?cc=you@example.com%2Cthey@example.com" >me@example.com</a>

 {mailto address="me@example.com" extra='class="email"'}
-   <a href="mailto:me@example.com" class="email">me@example.com</a>
+<a href="mailto:me@example.com" class="email">me@example.com</a>

 {mailto address="me@example.com" encode="javascript_charcode"}
-   <script type="text/javascript" language="javascript">
-   <!--
+<script type="text/javascript" language="javascript">
+<!--
 {document.write(String.fromCharCode(60,97, ... snipped ....60,47,97,62))}
-   //-->
-   </script>
+//-->
+</script>
 ]]>
  </programlisting>
 </example>
--- a/docs/ru/designers/language-custom-functions/language-function-popup-init.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-popup-init.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
+<!-- EN-Revision: 1.6 Maintainer: freespace Status: ready -->
 <sect1 id="language.function.popup.init">
 <title>{popup_init}</title>
 <para>
@@ -25,7 +25,7 @@
 <![CDATA[
 <head>
 {* popup_init <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *}
-{popup_init src="javascripts/overlib.js"}
+{popup_init src='javascripts/overlib/overlib.js'}
 </head>
 ]]>
  </programlisting>
--- a/docs/ru/designers/language-custom-functions/language-function-popup.xml
+++ b/docs/ru/designers/language-custom-functions/language-function-popup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1.6 Maintainer: freespace Status: ready -->
+<!-- EN-Revision: 1.9 Maintainer: freespace Status: ready -->
 <sect1 id="language.function.popup">
 <title>{popup}</title>
  <para>
@@ -361,7 +361,7 @@
     <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></entry>
    </row>
    <row>
-     <entry>timeout</entry>
+     <entry>function</entry>
     <entry>string</entry>
     <entry><EFBFBD><EFBFBD><EFBFBD></entry>
     <entry><emphasis>n/a</emphasis></entry>
@@ -401,20 +401,27 @@
  <programlisting>
 <![CDATA[
 {* popup_init <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *}
-{popup_init src="/javascripts/overlib.js"}
+{popup_init src='/javascripts/overlib.js'}

 {* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *}
-<a href="mypage.html" {popup text="This link takes you to my page!"}>mypage</a>
+<a href="mypage.html" {popup text='This link takes you to my page!'}>mypage</a>

 {* <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> HTML, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20>.<2E>. <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *}
-<a href="mypage.html" {popup sticky=true caption="mypage contents"
+<a href="mypage.html" {popup sticky=true caption='mypage contents'
 text="<ul><li>links</li><li>pages</li><li>images</li></ul>"
-snapx=10 snapy=10}>mypage</a>
+snapx=10 snapy=10 trigger='onClick'}>mypage</a>
+
+{* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *}
+<tr><td {popup caption='Part details' text=$part_long_description}>{$part_number}</td></tr>
 ]]>
  </programlisting>
 </example>
 <para>
- <EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD>
+  <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+  <link linkend="language.function.capture">{capture}</link>.
+ </para>
+ <para>
+  <20><>. <20><><EFBFBD><EFBFBD><EFBFBD>
  <link linkend="language.function.popup.init">{popup_init}</link>
  <20>
  <ulink url="&url.overLib;">overLib</ulink>.