com doc/ru: Обновлен ие до англи йской редак ции: language-snippets.ent reference/ima p/functions/imap-headers.xml reference/imap/functions/imap- last-error.xml reference/imap/functions/imap-list.xml r eference/imap/functions/imap-listscan.xml reference/imap/fu nctions/imap-lsub.xml reference/imap/functions/imap-mail-co mpose.xml reference/imap/functions/imap-mail-copy.xml r eference/imap/functions/imap-mail-move.xml reference/imap/f unctions/imap-mail.xml

diff --git a/language-snippets.ent b/language-snippets.ent
index d09265220..e96d7e933 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: c47cd3156640f6fddbb20ed1c8b5c86a706f9b0e Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 
diff --git a/reference/imap/functions/imap-headers.xml b/reference/imap/functions/imap-headers.xml
index 58f72d870..8c14fc484 100644
--- a/reference/imap/functions/imap-headers.xml
+++ b/reference/imap/functions/imap-headers.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-headers" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_headers</refname>
@@ -11,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>imap_headers</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>imap_headers</methodname>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
   </methodsynopsis>
   <para>
    Возвращает заголовки всех сообщений в почтовом ящике.
@@ -31,10 +30,10 @@
   <para>
    Возвращает массив со строками, содержащими заголовки сообщений.
    Один элемент - одно сообщение.
+   Возвращает &false; в случае возникновения ошибки.
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-last-error.xml b/reference/imap/functions/imap-last-error.xml
index 1aedf4154..6488f4688 100644
--- a/reference/imap/functions/imap-last-error.xml
+++ b/reference/imap/functions/imap-last-error.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-last-error" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_last_error</refname>
@@ -11,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>imap_last_error</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>imap_last_error</methodname>
    <void/>
   </methodsynopsis>
   <para>
@@ -37,7 +36,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-list.xml b/reference/imap/functions/imap-list.xml
index 350940e45..3a016b6b5 100644
--- a/reference/imap/functions/imap-list.xml
+++ b/reference/imap/functions/imap-list.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ca35bb0ee60fdbf44956427c44c4eee7b1ea0fdb Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-list" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_list</refname>
@@ -11,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>imap_list</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>ref</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>imap_list</methodname>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
+   <methodparam><type>string</type><parameter>reference</parameter></methodparam>
    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -26,10 +25,10 @@
    <variablelist>
     &imap.imap-stream.description;
     <varlistentry>
-     <term><parameter>ref</parameter></term>
+     <term><parameter>reference</parameter></term>
      <listitem>
       <para>
-       В <parameter>ref</parameter>, как правило, должна быть
+       В <parameter>reference</parameter>, как правило, должна быть
        указана только спецификация сервера, как описано в
        <function>imap_open</function>.
       </para>
@@ -88,7 +87,6 @@ imap_close($mbox);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-listscan.xml b/reference/imap/functions/imap-listscan.xml
index e8176e50e..866c973a0 100644
--- a/reference/imap/functions/imap-listscan.xml
+++ b/reference/imap/functions/imap-listscan.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ca35bb0ee60fdbf44956427c44c4eee7b1ea0fdb Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-listscan" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_listscan</refname>
@@ -11,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>imap_listscan</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>ref</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>imap_listscan</methodname>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
+   <methodparam><type>string</type><parameter>reference</parameter></methodparam>
    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
    <methodparam><type>string</type><parameter>content</parameter></methodparam>
   </methodsynopsis>
@@ -33,10 +32,10 @@
    <variablelist>
     &imap.imap-stream.description;
     <varlistentry>
-     <term><parameter>ref</parameter></term>
+     <term><parameter>reference</parameter></term>
      <listitem>
       <para>
-       В <parameter>ref</parameter>, как правило, должна быть
+       В <parameter>reference</parameter>, как правило, должна быть
        указана только спецификация сервера, как описано в
        <function>imap_open</function>
       </para>
@@ -64,7 +63,7 @@
   &reftitle.returnvalues;
   <para>
    Возвращает массив, содержащий имена почтовых ящиков содержащих
-   <parameter>content</parameter> в тексте.
+   <parameter>content</parameter> в тексте, &return.falseforfailure;.
   </para>
  </refsect1>
  <refsect1 role="seealso">
@@ -77,7 +76,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-lsub.xml b/reference/imap/functions/imap-lsub.xml
index 94afa07ba..2229f7ee3 100644
--- a/reference/imap/functions/imap-lsub.xml
+++ b/reference/imap/functions/imap-lsub.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ca35bb0ee60fdbf44956427c44c4eee7b1ea0fdb Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-lsub" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_lsub</refname>
@@ -11,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>imap_lsub</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>ref</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>imap_lsub</methodname>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
+   <methodparam><type>string</type><parameter>reference</parameter></methodparam>
    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -26,10 +25,10 @@
    <variablelist>
     &imap.imap-stream.description;
     <varlistentry>
-     <term><parameter>ref</parameter></term>
+     <term><parameter>reference</parameter></term>
      <listitem>
       <para>
-       В <parameter>ref</parameter>, как правило, должна быть
+       В <parameter>reference</parameter>, как правило, должна быть
        указана только спецификация сервера, как описано в
        <function>imap_open</function>.
       </para>
@@ -48,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Возвращает массив всех подписанных почтовых ящиков.
+   Возвращает массив всех подписанных почтовых ящиков, &return.falseforfailure;.
   </para>
  </refsect1>
  <refsect1 role="seealso">
@@ -61,7 +60,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-mail-compose.xml b/reference/imap/functions/imap-mail-compose.xml
index a7be1b3c9..052cbad38 100644
--- a/reference/imap/functions/imap-mail-compose.xml
+++ b/reference/imap/functions/imap-mail-compose.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-mail-compose" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_mail_compose</refname>
@@ -13,11 +12,11 @@
   <methodsynopsis>
    <type class="union"><type>string</type><type>false</type></type><methodname>imap_mail_compose</methodname>
    <methodparam><type>array</type><parameter>envelope</parameter></methodparam>
-   <methodparam><type>array</type><parameter>body</parameter></methodparam>
+   <methodparam><type>array</type><parameter>bodies</parameter></methodparam>
   </methodsynopsis>
   <para>
    Создаёт MIME-сообщение на основе обёртки <parameter>envelope</parameter>
-   и тела <parameter>body</parameter>.
+   и тела <parameter>bodies</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -37,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>body</parameter></term>
+     <term><parameter>bodies</parameter></term>
      <listitem>
       <para>
        Индексированный массив тел. Первое тело - это основная часть сообщения;
@@ -192,7 +191,6 @@ echo nl2br(imap_mail_compose($envelope, $body));
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-mail-copy.xml b/reference/imap/functions/imap-mail-copy.xml
index b4b096e06..06bc26388 100644
--- a/reference/imap/functions/imap-mail-copy.xml
+++ b/reference/imap/functions/imap-mail-copy.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ca35bb0ee60fdbf44956427c44c4eee7b1ea0fdb Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-mail-copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imap_mail_copy</refname>
@@ -12,13 +11,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imap_mail_copy</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>msglist</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
+   <methodparam><type>string</type><parameter>message_nums</parameter></methodparam>
    <methodparam><type>string</type><parameter>mailbox</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Копирует заданные в <parameter>msglist</parameter> письма в указанный почтовый
+   Копирует заданные в <parameter>message_nums</parameter> письма в указанный почтовый
    ящик.
   </para>
  </refsect1>
@@ -28,10 +27,10 @@
    <variablelist>
     &imap.imap-stream.description;
     <varlistentry>
-     <term><parameter>msglist</parameter></term>
+     <term><parameter>message_nums</parameter></term>
      <listitem>
       <para>
-       <parameter>msglist</parameter> - это диапазон, а не просто номера сообщений
+       <parameter>message_nums</parameter> - это диапазон, а не просто номера сообщений
        (как определено в <link xlink:href="&url.rfc;2060">RFC2060</link>).
       </para>
      </listitem>
@@ -47,10 +46,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       <parameter>options</parameter> - битовая маска одной или нескольких констант:
+       <parameter>flags</parameter> - битовая маска одной или нескольких констант:
        <itemizedlist>
         <listitem>
          <simpara>
@@ -86,7 +85,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-mail-move.xml b/reference/imap/functions/imap-mail-move.xml
index c7169ffa9..ec200b915 100644
--- a/reference/imap/functions/imap-mail-move.xml
+++ b/reference/imap/functions/imap-mail-move.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ca35bb0ee60fdbf44956427c44c4eee7b1ea0fdb Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-mail-move" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imap_mail_move</refname>
@@ -12,13 +11,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imap_mail_move</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>msglist</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
+   <methodparam><type>string</type><parameter>message_nums</parameter></methodparam>
    <methodparam><type>string</type><parameter>mailbox</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Перемещает письма, заданные в <parameter>msglist</parameter> в указанный
+   Перемещает письма, заданные в <parameter>message_nums</parameter> в указанный
    почтовый ящик <parameter>mailbox</parameter>.
   </para>
  </refsect1>
@@ -28,10 +27,10 @@
    <variablelist>
     &imap.imap-stream.description;
     <varlistentry>
-     <term><parameter>msglist</parameter></term>
+     <term><parameter>message_nums</parameter></term>
      <listitem>
       <para>
-       <parameter>msglist</parameter> - это диапазон, а не просто номера сообщений
+       <parameter>message_nums</parameter> - это диапазон, а не просто номера сообщений
        (как определено в <link xlink:href="&url.rfc;2060">RFC2060</link>).
       </para>
      </listitem>
@@ -47,10 +46,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       <parameter>options</parameter> - битовая маска, которая может принимать всего одно
+       <parameter>flags</parameter> - битовая маска, которая может принимать всего одно
        значение:
        <itemizedlist>
         <listitem>
@@ -94,7 +93,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-mail.xml b/reference/imap/functions/imap-mail.xml
index f1848e200..a74cc3953 100644
--- a/reference/imap/functions/imap-mail.xml
+++ b/reference/imap/functions/imap-mail.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 44bb6dafd6909b7d9569bc4c1958c4e00d96ee14 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-mail" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imap_mail</refname>
@@ -15,10 +14,10 @@
    <methodparam><type>string</type><parameter>to</parameter></methodparam>
    <methodparam><type>string</type><parameter>subject</parameter></methodparam>
    <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>additional_headers</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>cc</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>bcc</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>rpath</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>additional_headers</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>cc</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>bcc</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>return_path</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Эта функция позволяет отправлять сообщения с корректной
@@ -83,7 +82,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>rpath</parameter></term>
+     <term><parameter>return_path</parameter></term>
      <listitem>
       <para>
        Используйте этот параметр для указания обратного адреса для
@@ -102,6 +101,30 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>additional_headers</parameter>, <parameter>cc</parameter>,
+       <parameter>bcc</parameter> и <parameter>return_path</parameter> теперь допускают значение null.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
@@ -112,7 +135,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-mailboxmsginfo.xml b/reference/imap/functions/imap-mailboxmsginfo.xml
index 083011e47..318781b98 100644
--- a/reference/imap/functions/imap-mailboxmsginfo.xml
+++ b/reference/imap/functions/imap-mailboxmsginfo.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-mailboxmsginfo" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_mailboxmsginfo</refname>
@@ -11,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>object</type><methodname>imap_mailboxmsginfo</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
+   <type>stdClass</type><methodname>imap_mailboxmsginfo</methodname>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
   </methodsynopsis>
   <para>
    Проверяет статус текущего почтового ящика на сервере. Аналогично
@@ -112,7 +111,6 @@ imap_close($mbox);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-mime-header-decode.xml b/reference/imap/functions/imap-mime-header-decode.xml
index 20971710d..0000f1b89 100644
--- a/reference/imap/functions/imap-mime-header-decode.xml
+++ b/reference/imap/functions/imap-mime-header-decode.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 14af302c9c0e561fa6f9cdd956268758ba9a89c5 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-mime-header-decode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imap_mime_header_decode</refname>
@@ -11,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>imap_mime_header_decode</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>imap_mime_header_decode</methodname>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
   </methodsynopsis>
   <para>
    Декодирует MIME-расширения заголовка, не являющиеся текстом ASCII
@@ -24,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>text</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        MIME-текст
@@ -45,6 +44,9 @@
    текстом US-ASCII, свойство <literal>charset</literal> будет установлено в
    значение <literal>default</literal>.
   </para>
+  <para>
+   Функция возвращает &false; в случае возникновения ошибки.
+  </para>
  </refsect1>
  <refsect1 role="examples">
   &reftitle.examples;
@@ -90,7 +92,6 @@ Text:  <[email protected]>
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-msgno.xml b/reference/imap/functions/imap-msgno.xml
index 0223d18a0..cbac1d4cb 100644
--- a/reference/imap/functions/imap-msgno.xml
+++ b/reference/imap/functions/imap-msgno.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-msgno" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_msgno</refname>
@@ -12,11 +11,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imap_msgno</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
-   <methodparam><type>int</type><parameter>uid</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
+   <methodparam><type>int</type><parameter>message_uid</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Возвращает номер сообщения для указанного <parameter>uid</parameter>.
+   Возвращает номер сообщения для указанного <parameter>message_uid</parameter>.
   </para>
   <para>
    Эта функция обратная к <function>imap_uid</function>.
@@ -28,7 +27,7 @@
    <variablelist>
     &imap.imap-stream.description;
     <varlistentry>
-     <term><parameter>uid</parameter></term>
+     <term><parameter>message_uid</parameter></term>
      <listitem>
       <para>
        UID сообщения
@@ -41,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Возвращает номер сообщения для указанного <parameter>uid</parameter>.
+   Возвращает номер сообщения для указанного <parameter>message_uid</parameter>.
   </para>
  </refsect1>
  <refsect1 role="seealso">
@@ -53,7 +52,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-mutf7-to-utf8.xml b/reference/imap/functions/imap-mutf7-to-utf8.xml
index 457e266f3..201eecd85 100644
--- a/reference/imap/functions/imap-mutf7-to-utf8.xml
+++ b/reference/imap/functions/imap-mutf7-to-utf8.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: lex Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: lex Status: ready -->
 <!-- Reviewed: yes Maintainer: sergey -->
-
 <refentry xml:id="function.imap-mutf7-to-utf8" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imap_mutf7_to_utf8</refname>
@@ -13,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis role="procedural">
    <type class="union"><type>string</type><type>false</type></type><methodname>imap_mutf7_to_utf8</methodname>
-   <methodparam><type>string</type><parameter>in</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
   </methodsynopsis>
   <para>
    Декодировать изменённую строку UTF-7 (в соответствии с RFC 2060, раздел 5.1.3) в UTF-8.
@@ -29,7 +28,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>in</parameter></term>
+    <term><parameter>string</parameter></term>
     <listitem>
      <para>
       Изменённая строка, закодированная в UTF-7.
@@ -42,7 +41,7 @@
  <refsect1 role="returnvalues"><!-- {{{ -->
   &reftitle.returnvalues;
   <para>
-   Возвращает <parameter>in</parameter>, конвертированную в UTF-8,
+   Возвращает <parameter>string</parameter>, конвертированную в UTF-8,
    &return.falseforfailure;.
   </para>
  </refsect1><!-- }}} -->
@@ -55,7 +54,6 @@
  </refsect1><!-- }}} -->
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-num-msg.xml b/reference/imap/functions/imap-num-msg.xml
index 487b2530e..9da24c3a5 100644
--- a/reference/imap/functions/imap-num-msg.xml
+++ b/reference/imap/functions/imap-num-msg.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- $Revision$ -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-num-msg" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_num_msg</refname>
@@ -11,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>imap_num_msg</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
+   <type class="union"><type>int</type><type>false</type></type><methodname>imap_num_msg</methodname>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
   </methodsynopsis>
   <para>
    Возвращает количество сообщений в текущем почтовом ящике.
@@ -42,7 +41,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-num-recent.xml b/reference/imap/functions/imap-num-recent.xml
index 8842285b9..ab1d73109 100644
--- a/reference/imap/functions/imap-num-recent.xml
+++ b/reference/imap/functions/imap-num-recent.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-num-recent" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_num_recent</refname>
@@ -12,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>imap_num_recent</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
   </methodsynopsis>
   <para>
    Возвращает количество новых сообщений в текущем почтовом ящике.
@@ -43,7 +42,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-open.xml b/reference/imap/functions/imap-open.xml
index 93d3ed769..03dd8812f 100644
--- a/reference/imap/functions/imap-open.xml
+++ b/reference/imap/functions/imap-open.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-open" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_open</refname>
@@ -11,13 +10,13 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>imap_open</methodname>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>imap_open</methodname>
    <methodparam><type>string</type><parameter>mailbox</parameter></methodparam>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
+   <methodparam><type>string</type><parameter>user</parameter></methodparam>
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>n_retries</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>params</parameter><initializer>array()</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>retries</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
   <para>
    Открывает поток <acronym>IMAP</acronym> к <parameter>mailbox</parameter>.
@@ -169,7 +168,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>username</parameter></term>
+     <term><parameter>user</parameter></term>
      <listitem>
       <para>
        Имя пользователя
@@ -180,15 +179,15 @@
      <term><parameter>password</parameter></term>
      <listitem>
       <para>
-       Пароль пользователя <parameter>username</parameter>
+       Пароль пользователя <parameter>user</parameter>
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       <parameter>options</parameter> - битовая маска из одной или нескольких
+       <parameter>flags</parameter> - битовая маска из одной или нескольких
        констант:
        <itemizedlist>
         <listitem>
@@ -248,7 +247,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>n_retries</parameter></term>
+     <term><parameter>retries</parameter></term>
      <listitem>
       <para>
        Максимальное количество попыток соединения
@@ -256,7 +255,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>params</parameter></term>
+     <term><parameter>options</parameter></term>
      <listitem>
       <para>
        Параметры для соединения. Для установки одного или нескольких
@@ -356,7 +355,6 @@ imap_close($mbox);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-ping.xml b/reference/imap/functions/imap-ping.xml
index 06cd19c67..195d1f7dd 100644
--- a/reference/imap/functions/imap-ping.xml
+++ b/reference/imap/functions/imap-ping.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-ping" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_ping</refname>
@@ -12,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imap_ping</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>imap_ping</function> проверяет, активен ли ещё открытый поток.
@@ -58,7 +57,6 @@ if (!imap_ping($imap)) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-qprint.xml b/reference/imap/functions/imap-qprint.xml
index 773ae5c5c..df5804af5 100644
--- a/reference/imap/functions/imap-qprint.xml
+++ b/reference/imap/functions/imap-qprint.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-qprint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imap_qprint</refname>
@@ -11,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>imap_qprint</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>imap_qprint</methodname>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -37,7 +36,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Возвращает 8-битную строку.
+   Возвращает 8-битную строку, &return.falseforfailure;.
   </para>
  </refsect1>
  <refsect1 role="seealso">
@@ -49,7 +48,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/imap/functions/imap-renamemailbox.xml b/reference/imap/functions/imap-renamemailbox.xml
index f90af660e..0e48bdbad 100644
--- a/reference/imap/functions/imap-renamemailbox.xml
+++ b/reference/imap/functions/imap-renamemailbox.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ca35bb0ee60fdbf44956427c44c4eee7b1ea0fdb Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: e2f50c240bebc502a3d990d73633a6141f3bd9fd Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->
-
 <refentry xml:id="function.imap-renamemailbox" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imap_renamemailbox</refname>
@@ -12,9 +11,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>imap_renamemailbox</methodname>
-   <methodparam><type>resource</type><parameter>imap_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>old_mbox</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_mbox</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>imap</parameter></methodparam>
+   <methodparam><type>string</type><parameter>from</parameter></methodparam>
+   <methodparam><type>string</type><parameter>to</parameter></methodparam>
   </methodsynopsis>
   <para>
    Эта функция переименовывает old_mbox в new_mbox (формат имени
@@ -27,7 +26,7 @@
    <variablelist>
     &imap.imap-stream.description;
     <varlistentry>
-     <term><parameter>old_mbox</parameter></term>
+     <term><parameter>from</parameter></term>
      <listitem>
       <para>
        Старое имя. Более подробно читайте в описании <function>imap_open</function>
@@ -36,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>new_mbox</parameter></term>
+     <term><parameter>to</parameter></term>
      <listitem>
       <para>
        Новое имя. Более подробно читайте в описании <function>imap_open</function>
@@ -63,7 +62,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml