cvs: smarty /docs/ru/designers/language-modifiers language-modifier-date-format.xml language-modifier-default.xml language-modifier-escape.xml language-modifier-indent.xml language-modifier-lower.xml language-modifier-nl2br.xml language-modifier-strip.xml language-modifier-truncate.xml language-modifier-upper.xml language-modifier-wordwrap.xml /docs/ru/designers/language-variables language-variables-smarty.xml

http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml?r1=1.7&r2=1.8&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml:1.7 smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml:1.8
--- smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml:1.7	Fri Feb  3 09:20:34 2006
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml	Thu Jul 20 12:42:00 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.7 $ -->
-<!-- EN-Revision: 1.12 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.8 $ -->
+<!-- EN-Revision: 1.13 Maintainer: freespace Status: ready -->
  <sect1 id="language.modifier.date.format">
   <title>date_format</title>
     <para>
@@ -79,6 +79,9 @@
 <![CDATA[
 <?php
 
+$config['date'] = '%I:%M %p';
+$config['time'] = '%H:%M:%S';
+$smarty->assign('config',$config);
 $smarty->assign('yesterday', strtotime('-1 day'));
 
 ?>
@@ -91,10 +94,10 @@
 <![CDATA[
 {$smarty.now|date_format}
 {$smarty.now|date_format:"%D"}
-{$smarty.now|date_format:"%I:%M %p"}
+{$smarty.now|date_format:$config.date}
 {$yesterday|date_format}
 {$yesterday|date_format:"%A, %B %e, %Y"}
-{$yesterday|date_format:"%H:%M:%S"}
+{$yesterday|date_format:$config.time}
 ]]>
    </programlisting>
    <para>
http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml?r1=1.5&r2=1.6&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml:1.5 smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml:1.6
--- smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml:1.5	Thu Jan 19 13:02:38 2006
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml	Thu Jul 20 12:42:00 2006
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.5 $ -->
-<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.6 $ -->
+<!-- EN-Revision: 1.8 Maintainer: freespace Status: ready -->
  <sect1 id="language.modifier.default">
   <title>default</title>
    <para>
      Èñïîëüçóåòñÿ äëÿ óñòàíîâêè çíà÷åíèÿ ïî óìîë÷àíèþ äëÿ ïåðåìåííîé.
-     Åñëè ïåðåìåííàÿ ïóñòà èëè íå óñòàíîâëåíà, óêàçàííîå çíà÷åíèå ïî óìîë÷àíèþ
-     áóäåò ïîäñòàâëåíî âìåñòî íå¸.
+     Åñëè ïåðåìåííàÿ íå óñòàíîâëåíà èëè ÿâëÿåòñÿ ïóñòîé ñòðîêîé, óêàçàííîå
+     çíà÷åíèå ïî óìîë÷àíèþ áóäåò ïîäñòàâëåíî âìåñòî íå¸.
    </para>
   
+  <para>
+   <note>
+    <para>
+     Åñëè äèðåêòèâà error_reporting óñòàíîâëåíà â E_ALL, íåîáúÿâëåííûå ïåðåìåííûå
+     âñåãäà áóäóò îòîáðàæàòü îøèáêó â øàáëîíå. Ýòà ôóíêöèÿ ïîëåçíà äëÿ çàìåíû
+     ïóñòûõ çíà÷åíèé èëè ñòðîê íóëåâîé äëèííû.
+    </para>
+   </note>
+  </para>
+  
   <informaltable frame="all">
    <tgroup cols="5">
     <colspec colname="param" align="center" />
@@ -44,6 +54,7 @@
 <?php
 
 $smarty->assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
+$smarty->assign('email','');
 
 ?>
 ]]>
@@ -53,8 +64,9 @@
    </para>
    <programlisting>
 <![CDATA[
-{$articleTitle|default:"no title"}
-{$myTitle|default:"no title"}
+{$articleTitle|default:'no title'}
+{$myTitle|default:'no title'}
+{$email|default:'No email address available'}
 ]]>
    </programlisting>
    <para>
@@ -64,6 +76,7 @@
 <![CDATA[
 Dealers Will Hear Car Talk at Noon.
 no title
+No email address available
 ]]>
    </screen>
   </example>
http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml?r1=1.6&r2=1.7&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml:1.6 smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml:1.7
--- smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml:1.6	Thu Jan 19 13:02:38 2006
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml	Thu Jul 20 12:42:00 2006
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.6 $ -->
-<!-- EN-Revision: 1.8 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.7 $ -->
+<!-- EN-Revision: 1.15 Maintainer: freespace Status: ready -->
  <sect1 id="language.modifier.escape">
   <title>escape</title>
   <para>
-    Èñïîëüçóåòñÿ äëÿ ýêðàíèðîâàíèÿ ñïåöñèìâîëîâ html, url, îäèíàðíûõ êàâû÷åê
-    íà ïåðåìåííîé, åñëè îíè åù¸ íå ýêðàíèðîâàíû; øåñòíàäöàòèðè÷íîå êîäèðîâàíèå,
-    øåñòíàäöàòèðè÷íîå êîäèðîâàíèå â HTML-entities è javascript-ýêðàíèðîâàíèå.
+    Èñïîëüçóåòñÿ äëÿ êîäèðîâàíèÿ / ýêðàíèðîâàíèÿ ñïåöñèìâîëîâ ïî àëãîðèòìàì
+    ýêðàíèðîâàíèÿ HTML, URL'îâ, îäèíî÷íûõ êàâû÷åê, hex-ýêðàíèðîâàíèÿ,
+    hex-ñóùíîñòåé, javascript è ýêðàíèðîâàíèÿ ïî÷òîâûõ àäðåñîâ.
     Ïî óìîë÷àíèþ àêòèâèðîâàí ðåæèì ýêðàíèðîâàíèÿ HTML.
   </para>
   
@@ -33,7 +33,7 @@
       <entry>1</entry>
       <entry>string</entry>
       <entry>Íåò</entry>
-      <entry><literal>html</literal>,<literal>htmlall</literal>,<literal>url</literal>,<literal>urlpathinfo</literal>,<literal>quotes</literal>,<literal>hex</literal>,<literal>hexentity</literal>,<literal>javascript</literal></entry>
+      <entry><literal>html</literal>,<literal>htmlall</literal>,<literal>url</literal>,<literal>urlpathinfo</literal>,<literal>quotes</literal>,<literal>hex</literal>,<literal>hexentity</literal>,<literal>javascript</literal>,<literal>mail</literal></entry>
       <entry><literal>html</literal></entry>
       <entry>ôîðìàò ýêðàíèðîâàíèÿ</entry>
      </row>
@@ -59,7 +59,7 @@
 $smarty->assign('articleTitle',
                 "'Stiff Opposition Expected to Casketless Funeral Plan'"
                 );
-    
+$smarty->assign('EmailAddress','[email protected]');
 ?>
 ]]>
    </programlisting>
@@ -70,11 +70,13 @@
 <![CDATA[
 {$articleTitle}
 {$articleTitle|escape}
-{$articleTitle|escape:"html"}    {* ýêðàíèðóåò  & " ' < > *}
-{$articleTitle|escape:"htmlall"} {* ýêðàíèðóåò âñå html entities *}
-{$articleTitle|escape:"url"}
-{$articleTitle|escape:"quotes"}
+{$articleTitle|escape:'html'}    {* ýêðàíèðóåò  & " ' < > *}
+{$articleTitle|escape:'htmlall'} {* ýêðàíèðóåò ÂÑÅ HTML-ñóùíîñòè *}
+{$articleTitle|escape:'url'}
+{$articleTitle|escape:'quotes'}
 <a href="mailto:{$EmailAddress|escape:"hex"}">{$EmailAddress|escape:"hexentity"}</a>
+{$EmailAddress|escape:'mail'}    {* êîíâåðòèðóåò e-mail â òåêñò *}
+{'[email protected]'|escape:'mail'}
 ]]>
    </programlisting>
    <para>
@@ -89,12 +91,36 @@
 %27Stiff+Opposition+Expected+to+Casketless+Funeral+Plan%27
 \'Stiff Opposition Expected to Casketless Funeral Plan\'
 <a href="mailto:%62%6f%..snip..%65%74">&#x62;&#x6f;&#x62..snip..&#x65;&#x74;</a>
+smarty [AT] example [DOT] com
+mail [AT] example [DOT] com
 ]]>
    </screen>
+   <para>
+    Îáðàòèòå âíèìàíèå, ÷òî ðîäíûå ôóíêöèè PHP ìîãóò èñïîëüçîâàòüñÿ â êà÷åñòâå
+    ìîäèôèêàòîðîâ, òàê ÷òî ñëåäóþùèå ïðè¸ìû ñðàáîòàþò
+   </para>
+   <screen>
+<![CDATA[
+{* GET-ïåðåìåííàÿ rewind ïåðåäàåò òåêóùèé àäðåñ *}
+<a href="{$SCRIPT_NAME}?page=foo&rewind={$smarty.server.REQUEST_URI|urlencode}">click here</a>
+ ]]>
+   </screen>
+   <para>
+    Ýòî î÷åíü ïîëåçíî äëÿ e-mail'îâ, íî ñì. òàêæå
+    <link linkend="language.function.mailto">{mailto}</link>
+   </para>
+   <screen>
+<![CDATA[
+{* email address mangled *}
+<a href="mailto:{$EmailAddress|escape:'hex'}">{$EmailAddress|escape:'mail'}</a>
+]]>
+   </screen>  
   </example>
+  
   <para>
    Ñì. òàêæå
-   <link linkend="language.escaping">Ïðåäîòâðàùåíèå îáðàáîòêè Smarty</link>
+   <link linkend="language.escaping">Ïðåäîòâðàùåíèå îáðàáîòêè Smarty</link>,
+   <link linkend="language.function.mailto">{mailto}</link>
    è
    <link linkend="tips.obfuscating.email">Ñîêðûòèå E-mail àäðåñà</link>.
   </para>
http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml?r1=1.6&r2=1.7&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml:1.6 smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml:1.7
--- smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml:1.6	Thu Jan 19 13:02:38 2006
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml	Thu Jul 20 12:42:00 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.6 $ -->
-<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.7 $ -->
+<!-- EN-Revision: 1.6 Maintainer: freespace Status: ready -->
  <sect1 id="language.modifier.indent">
   <title>indent</title>
   <para>
@@ -100,7 +100,8 @@
   </example>
   <para>
    Ñì. òàêæå
-   <link linkend="language.modifier.strip">strip</link>
+   <link linkend="language.modifier.strip">strip</link>,
+   <link linkend="language.modifier.wordwrap">wordwrap</link>
    è
    <link linkend="language.modifier.spacify">spacify</link>.
   </para>
http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml?r1=1.4&r2=1.5&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml:1.4 smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml:1.5
--- smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml:1.4	Thu Jan 19 13:02:38 2006
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml	Thu Jul 20 12:42:00 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.3 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
  <sect1 id="language.modifier.lower">
   <title>lower</title>
   <para>
-   Ïåðåâîäèò ñòðîêó â íèæíèé ðåãèñòð.
+   Ïåðåâîäèò ñòðîêó â íèæíèé ðåãèñòð. ßâëÿåòñÿ ýêâèâàëåíòîì ôóíêöèè PHP
+   <ulink url="&url.php-manual;strtolower">strtolower()</ulink>.
   </para>
   <example>
    <title>lower</title>
http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml?r1=1.4&r2=1.5&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml:1.4 smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml:1.5
--- smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml:1.4	Thu Jan 19 13:02:39 2006
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml	Thu Jul 20 12:42:00 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
  <sect1 id="language.modifier.nl2br">
   <title>nl2br</title>
   <para>
http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml:1.3	Thu Jan 19 13:02:39 2006
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml	Thu Jul 20 12:42:00 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.2 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
  <sect1 id="language.modifier.strip">
   <title>strip</title>
   <para>
@@ -33,7 +33,7 @@
 <![CDATA[
 {$articleTitle}
 {$articleTitle|strip}
-{$articleTitle|strip:"&nbsp;"}
+{$articleTitle|strip:'&nbsp;'}
 ]]>
    </programlisting>
    <para>
@@ -48,6 +48,12 @@
 ]]>
    </screen>
   </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.function.strip">{strip}</link>
+   è
+   <link linkend="language.modifier.truncate">truncate</link>.
+  </para>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml?r1=1.5&r2=1.6&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml:1.5 smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml:1.6
--- smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml:1.5	Thu Jan 19 13:02:39 2006
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml	Thu Jul 20 12:42:00 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.5 $ -->
-<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.6 $ -->
+<!-- EN-Revision: 1.6 Maintainer: freespace Status: ready -->
  <sect1 id="language.modifier.truncate">
   <title>truncate</title>
   <para>
@@ -89,6 +89,7 @@
 {$articleTitle|truncate:30:"---"}
 {$articleTitle|truncate:30:"":true}
 {$articleTitle|truncate:30:"...":true}
+{$articleTitle|truncate:30:'..':true:true}
 ]]>
    </programlisting>
    <para>
@@ -103,6 +104,7 @@
 Two Sisters Reunite after---
 Two Sisters Reunite after Eigh
 Two Sisters Reunite after E...
+Two Sisters Re..ckout Counter.
 ]]>
    </screen>
   </example>
http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml?r1=1.4&r2=1.5&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml:1.4 smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml:1.5
--- smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml:1.4	Thu Jan 19 13:02:39 2006
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml	Thu Jul 20 12:42:00 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.3 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
  <sect1 id="language.modifier.upper">
   <title>upper</title>
   <para>
-   Ïåðåâîäèò ñòðîêó â âåðõíèé ðåãèñòð.
+   Ïåðåâîäèò ñòðîêó â âåðõíèé ðåãèñòð. ßâëÿåòñÿ ýêâèâàëåíòîì ôóíêöèè PHP
+   <ulink url="&url.php-manual;strtoupper">strtoupper()</ulink>.
   </para>
   <example>
    <title>upper</title>
http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml?r1=1.6&r2=1.7&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml:1.6 smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml:1.7
--- smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml:1.6	Thu Jan 19 13:02:39 2006
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml	Thu Jul 20 12:42:00 2006
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
  <sect1 id="language.modifier.wordwrap">
   <title>wordwrap</title>
   <para>
http://cvs.php.net/viewvc.cgi/smarty/docs/ru/designers/language-variables/language-variables-smarty.xml?r1=1.10&r2=1.11&diff_format=u
Index: smarty/docs/ru/designers/language-variables/language-variables-smarty.xml
diff -u smarty/docs/ru/designers/language-variables/language-variables-smarty.xml:1.10 smarty/docs/ru/designers/language-variables/language-variables-smarty.xml:1.11
--- smarty/docs/ru/designers/language-variables/language-variables-smarty.xml:1.10	Tue Jan 31 14:27:44 2006
+++ smarty/docs/ru/designers/language-variables/language-variables-smarty.xml	Thu Jul 20 12:42:00 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.10 $ -->
-<!-- EN-Revision: 1.12 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.11 $ -->
+<!-- EN-Revision: 1.15 Maintainer: freespace Status: ready -->
 <sect1 id="language.variables.smarty">
  <title>Çàðåçåðâèðîâàííàÿ ïåðåìåííàÿ {$smarty}</title>
  <para>
   Çàðåçåðâèðîâàííàÿ ïåðåìåííàÿ {$smarty} ìîæåò áûòü èñïîëüçîâàíà äëÿ ïîëó÷åíèÿ
-  äîñòóïà ê íåñêîëüêèì ñïåöèàëüíûì ïåðåìåííûì øàáëîíà. Äàëåå ñëåäóåò èõ ïîëíûé
+  äîñòóïà ê íåñêîëüêèì ïåðåìåííûì îêðóæåíèÿ è çàïðîñà. Äàëåå ñëåäóåò èõ ïîëíûé
   ñïèñîê.
  </para>
  <sect2 id="language.variables.smarty.request">
@@ -51,17 +51,26 @@
     ïîëó÷èòü íåïîñðåäñòâåííî, õîòÿ ïðåäïî÷òèòåëüíûì ñïîñîáîì ÿâëÿåòñÿ îáðàùåíèå
     {$smarty.server.SCRIPT_NAME}.
    </para>
+   <programlisting>
+<![CDATA[
+<a href="{$SCRIPT_NAME}?page=smarty">click me</a>
+<a href="{$smarty.server.SCRIPT_NAME}?page=smarty">click me</a>
+]]>
+   </programlisting>
   </note>
  </sect2>
  <sect2 id="language.variables.smarty.now">
   <title>{$smarty.now}</title>
   <para>
    Òåêóùàÿ <ulink url="&url.php-manual;function.time">âðåìåííàÿ ìåòêà</ulink>
-   ñîäåðæèòñÿ â ïåðåìåííîé {$smarty.now}. Ýòî ÷èñëî îòîáðàæàåò êîëè÷åñòâî
+   ñîäåðæèòñÿ â ïåðåìåííîé {$smarty.now}. Ýòî çíà÷åíèå îòðàæàåò êîëè÷åñòâî
    ñåêóíä, êîòîðûå ïðîøëè ñ ìîìåíòà íàñòóïëåíèÿ òàê íàçûâàåìîé Ýïîõè
    (1 ÿíâàðÿ 1970 ãîäà). Ÿ ìîæíî ïðÿìî ïåðåäàâàòü ìîäèôèêàòîðó
    <link linkend="language.modifier.date.format">date_format</link>
-   äëÿ îòîáðàæåíèÿ òåêóùåé äàòû/âðåìåíè.
+   äëÿ îòîáðàæåíèÿ òåêóùåé äàòû/âðåìåíè. Îáðàòèòå âíèìàíèå,
+   ÷òî time() âûçûâàåòñÿ ïðè êàäæîì îáðàùåíèè; ê ïðèìåðó, ñêðèïò, ðàáîòàþùèé
+   òðè ñåêóíäû è âûçûâàþùèé $smarty.now â íà÷àëå è â êîíöå ðàáîòû, ïîêàæåò
+   ðàçíèöó â òðè ñåêóíäû.
   </para>
   <example>
    <title>Èñïîëüçîâàíèå {$smarty.now}</title>
@@ -80,9 +89,16 @@
    linkend="smarty.constants">Êîíñòàíòû Smarty</link>
   </para>
   <example>
-   <title>Èñïîëüçîâàíèå {$smarty.const}</title>
-   <programlisting>
+   <title>Èñïîëüçîâàíèå {$smarty.const} äëÿ äîñòóïà ê êîíñòàíòàì</title>
+   <programlisting role="php">
+<![CDATA[
+// êîíñòàíòà îïðåäåëåíà â PHP
+define('_MY_CONST_VAL','CHERRIES');
+]]>
+</programlisting>
+<programlisting>
 <![CDATA[
+{* âûâîä êîíñòàíòû PHP â øàáëîíå *}
 {$smarty.const._MY_CONST_VAL}
 ]]>
    </programlisting>
@@ -92,9 +108,9 @@
  <sect2 id="language.variables.smarty.capture">
   <title>{$smarty.capture}</title>
   <para>
-   Ðåçóëüòàò çàõâàòà êîíñòðóêöèè <link
-   linkend="language.function.capture">{capture}..{/capture}</link>
-   äîñòóïåí ïðè ïîìîùè ïåðåìåííîé {$smarty}. Ñì. ðàçäåë î
+   Ðåçóëüòàò îáðàáîòêè øàáëîíà, ñîõðàíåííûé êîíñòðóêöèåé <link
+   linkend="language.function.capture">{capture}..{/capture}</link>,
+   äîñòóïåí ïðè ïîìîùè ïåðåìåííîé {$smarty.capture}. Ñì. ðàçäåë î
    <link linkend="language.function.capture">{capture}</link>
    äëÿ ïîëó÷åíèÿ ïðèìåðà.
   </para>
@@ -117,26 +133,49 @@
    Ïåðåìåííóþ {$smarty} ìîæíî èñïîëüçîâàòü äëÿ îáðàùåíèÿ ê ñâîéñòâàì öèêëîâ
    <link linkend="language.function.section">{section}</link> è
    <link linkend="language.function.foreach">{foreach}</link>.
+   Ýòî î÷åíü ïîëåçíûå çíà÷åíèÿ âðîäå .first, .index è ò.ä.
   </para>
  </sect2>
 
  <sect2 id="language.variables.smarty.template">
   <title>{$smarty.template}</title>
   <para>
-   Ýòà ïåðåìåííàÿ ñîäåðæèò èìÿ òåêóùåãî îáðàáàòûâàåìîãî øàáëîíà.
+   Âîçâðàùàåò èìÿ òåêóùåãî îáðàáàòûâàåìîãî øàáëîíà. Ýòîò ïðèìåð ïîêàçûâàåò
+   container.tpl è âêëþ÷åííûå â íåãî banner.tpl, îáà èìåþò âûçîâ
+   {$smarty.template}
   </para>
+  <programlisting>
+<![CDATA[
+<b>Main container is {$smarty.template}</b>
+{include file='banner.tpl}
+]]>
+  </programlisting>
+  <para>
+   ðåçóëüòàò îáðàáîòêè øàáëîíà:
+  </para>
+<programlisting>
+<![CDATA[
+<b>Main page if container.tpl</b>
+banner.tpl
+]]>
+  </programlisting>
  </sect2>
  <sect2 id="language.variables.smarty.version">
   <title>{$smarty.version}</title>
   <para>
-   Ýòà ïåðåìåííàÿ ñîäåðæèò âåðñèþ Smarty, ñ êîòîðîé áûë ñêîìïèëèðîâàí øàáëîí.
+   Âîçâðàùàåò âåðñèþ Smarty, ñ êîòîðîé áûë ñêîìïèëèðîâàí øàáëîí.
   </para>
+  <programlisting>
+<![CDATA[
+<div id="footer">Powered by Smarty {$smarty.version}</div>
+]]>
+  </programlisting>  
  </sect2>
  <sect2 id="language.variables.smarty.ldelim">
   <title>{$smarty.ldelim}, {$smarty.rdelim}</title>
   <para>
-   Ýòè ïåðåìåííûå èñïîëüçóþòñÿ äëÿ îòîáðàæåíèÿ ëåâîãî è ïðàâîãî îãðàíè÷èòåëåé.
-   Ñì. <link linkend="language.function.ldelim">{ldelim},{rdelim}</link>.
+   Ýòè ïåðåìåííûå èñïîëüçóþòñÿ äëÿ îòîáðàæåíèÿ ëåâîãî è ïðàâîãî îãðàíè÷èòåëåé -
+   òàê æå, êàê è <link linkend="language.function.ldelim">{ldelim},{rdelim}</link>.
   </para>
   <para>
    Ñì. òàêæå