diff --git a/appendices/resources.xml b/appendices/resources.xml
index 13590166c..2527b7813 100644
--- a/appendices/resources.xml
+++ b/appendices/resources.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: b7f8c11e56ff1c57a2993e2ed7e5c5ace18637fd Maintainer: shein Status: ready -->
+<!-- EN-Revision: 6fa29283c5861ccb1f9da74fb252f80e01d27668 Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <appendix xml:id="resource" xmlns="http://docbook.org/ns/docbook">
@@ -388,6 +388,46 @@
       </entry>
       <entry>dbx result</entry>
      </row>
+     <row>
+    <entry>enchant_broker</entry>
+    <entry>
+     <function>enchant_broker_init</function>
+    </entry>
+    <entry>
+     <function>enchant_broker_describe</function>,
+     <function>enchant_broker_dict_exists</function>,
+     <function>enchant_broker_get_dict_path</function>,
+     <function>enchant_broker_get_error</function>,
+     <function>enchant_broker_list_dicts</function>,
+     <function>enchant_broker_set_dict_path</function>,
+     <function>enchant_broker_set_ordering</function>
+    </entry>
+    <entry>
+     <function>enchant_broker_free</function>
+    </entry>
+    <entry>Провайдер Enchant (до PHP 8.0.0)</entry>
+   </row>
+   <row>
+    <entry>enchant_dict</entry>
+    <entry>
+     <function>enchant_broker_request_dict</function>
+     <function>enchant_broker_request_pwl_dict</function>
+    </entry>
+    <entry>
+     <function>enchant_dict_add_to_personal</function>,
+     <function>enchant_dict_add_to_session</function>,
+     <function>enchant_dict_check</function>,
+     <function>enchant_dict_describe</function>,
+     <function>enchant_dict_get_error</function>,
+     <function>enchant_dict_is_in_session</function>,
+     <function>enchant_dict_store_replacement</function>,
+     <function>enchant_dict_suggest</function>
+    </entry>
+    <entry>
+     <function>enchant_broker_free_dict</function>
+    </entry>
+    <entry>Словарь Enchant (до PHP 8.0.0)</entry>
+   </row>
      <row>
       <entry>fbsql link</entry>
       <entry>
diff --git a/language-snippets.ent b/language-snippets.ent
index 9975afe97..d9af1bac7 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: b7f8c11e56ff1c57a2993e2ed7e5c5ace18637fd Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 6fa29283c5861ccb1f9da74fb252f80e01d27668 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 
@@ -659,6 +659,43 @@ dbm_identifier</parameter></term><listitem><para>Идентификатор со
 </itemizedlist>
 </para>'>
 
+<!-- enchant entities -->
+
+<!ENTITY enchant.param.broker '<varlistentry xmlns="http://docbook.org/ns/docbook">
+     <term><parameter>broker</parameter></term>
+     <listitem>
+      <para>
+       Провайдер Enchant, возвращаемый <function>enchant_broker_init</function>.
+      </para>
+     </listitem>
+    </varlistentry>'>
+
+<!ENTITY enchant.param.dictionary '<varlistentry xmlns="http://docbook.org/ns/docbook">
+     <term><parameter>dictionary</parameter></term>
+     <listitem>
+      <para>
+       Словарь Enchant, возвращаемый <function>enchant_broker_request_dict</function>
+       или <function>enchant_broker_request_pwl_dict</function>.
+      </para>
+     </listitem>
+    </varlistentry>'>
+
+<!ENTITY enchant.changelog.broker-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.0.0</entry>
+ <entry>
+  <parameter>broker</parameter> ожидает экземпляр <classname>EnchantBroker</classname>;
+  Ранее ожидался ресурс (&resource;).
+ </entry>
+</row>'>
+
+<!ENTITY enchant.changelog.dictionary-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.0.0</entry>
+ <entry>
+  <parameter>dictionary</parameter> ожидает экземпляр <classname>EnchantDictionary</classname>;
+  Ранее ожидался ресурс (&resource;).
+ </entry>
+</row>'>
+
 <!-- IMAP notes -->
 
 <!ENTITY imap.imap-stream.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
diff --git a/language/types.xml b/language/types.xml
index 8925f781c..46e59db8b 100644
--- a/language/types.xml
+++ b/language/types.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: d494ffa4d9f83b60fe66972ec2c0cf0301513b4a Maintainer: shein Status: ready -->
+<!-- EN-Revision: 1ffbadf2906a5c85d2f9437b87da3e204ea41b7a Maintainer: shein Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <chapter xml:id="language.types" xmlns="http://docbook.org/ns/docbook">
@@ -96,27 +96,6 @@
    
   </itemizedlist>
   
-  <para>
-   Для удобства понимания в этом руководстве используется также несколько
-   <link linkend="language.pseudo-types">псевдотипов</link>:
-  </para>
-  
-  <itemizedlist>
-   
-   <listitem>
-    <simpara>
-     <type>mixed</type>
-    </simpara>
-   </listitem>
-   
-   <listitem>
-    <simpara>
-     <type>void</type>
-    </simpara>
-   </listitem>
-   
-  </itemizedlist>
-  
   <simpara>
    Вы также можете найти несколько упоминаний типа двойной точности (double).
    Рассматривайте его как число с плавающей точкой, два имени существуют только
@@ -201,7 +180,6 @@ if (is_string($a_bool)) {
  &language.types.null;
  &language.types.callable;
  &language.types.declarations;
- &language.types.pseudo-types;
  &language.types.type-juggling;
  
 </chapter>
diff --git a/language/types/declarations.xml b/language/types/declarations.xml
index c5bece4f6..3e37100be 100644
--- a/language/types/declarations.xml
+++ b/language/types/declarations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: f99285b50417abb9a6a11d5667ad1cb4e80b8766 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 1ffbadf2906a5c85d2f9437b87da3e204ea41b7a Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: no -->
 
 <sect1 xml:id="language.types.declarations">
@@ -153,6 +153,19 @@ Stack trace:
    </para>
   </warning>
   
+  <sect3 xml:id="language.types.declarations.mixed">
+  <title>mixed</title>
+
+  <para>
+   <type>mixed</type> эквивалентен <link linkend="language.types.declarations.union">типу union</link>
+   <type class="union">
+    <type>array</type><type>bool</type><type>callable</type><type>int</type><type>float</type>
+    <type>object</type><type>resource</type><type>string</type><type>null</type>
+   </type>.
+   Доступно с PHP 8.0.0.
+  </para>
+ </sect3>
+  
   <sect3 xml:id="language.types.declarations.examples">
    &reftitle.examples;
    <example>
@@ -273,6 +286,8 @@ object(C)#1 (0) {
   </sect3>
  </sect2>
  
+ 
+ 
  <sect2 xml:id="language.types.declarations.nullable">
   <title>Обнуляемые типы</title>
   
diff --git a/reference/enchant/setup.xml b/reference/enchant/setup.xml
index 5980034fd..cf25d1711 100644
--- a/reference/enchant/setup.xml
+++ b/reference/enchant/setup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e281abc42a950b34be745ad357827c86af973f08 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 6fa29283c5861ccb1f9da74fb252f80e01d27668 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: sergey -->
 
 <chapter xml:id="enchant.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -39,7 +39,7 @@
  <section xml:id="enchant.resources">
   &reftitle.resources;
   <para>
-   В этом модуле используются два типа ресурсов.
+   До PHP 8.0.0, в этом модуле используются два типа ресурсов.
    Первый для брокера (менеджер бекэндов).
    Второй для словаря.
   </para>
diff --git a/reference/xml/functions/xml-get-current-byte-index.xml b/reference/xml/functions/xml-get-current-byte-index.xml
index 32508af5c..84c85bd6f 100644
--- a/reference/xml/functions/xml-get-current-byte-index.xml
+++ b/reference/xml/functions/xml-get-current-byte-index.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-get-current-byte-index" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_get_current_byte_index</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>
   <para>
    Получает текущий для заданного XML-анализатора байтовый индекс.
diff --git a/reference/xml/functions/xml-get-current-column-number.xml b/reference/xml/functions/xml-get-current-column-number.xml
index e11bb7cd4..893b40796 100644
--- a/reference/xml/functions/xml-get-current-column-number.xml
+++ b/reference/xml/functions/xml-get-current-column-number.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: mch Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: mch Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-get-current-column-number" xmlns="http://docbook.org/ns/docbook">
@@ -14,7 +14,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_get_current_column_number</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>
   <para>
    Получает текущий номер столбца заданного XML-анализатора.
diff --git a/reference/xml/functions/xml-get-current-line-number.xml b/reference/xml/functions/xml-get-current-line-number.xml
index ad0bfd26d..929aadc6a 100644
--- a/reference/xml/functions/xml-get-current-line-number.xml
+++ b/reference/xml/functions/xml-get-current-line-number.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: mch Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: mch Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-get-current-line-number" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_get_current_line_number</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>
   <para>
    Получает номер текущей строки для заданного XML-анализатора.
diff --git a/reference/xml/functions/xml-get-error-code.xml b/reference/xml/functions/xml-get-error-code.xml
index 8f9483a56..0be20dd0b 100644
--- a/reference/xml/functions/xml-get-error-code.xml
+++ b/reference/xml/functions/xml-get-error-code.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: mch Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: mch Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-get-error-code" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_get_error_code</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>
   <para>
    Получает код ошибки XML-анализатора.
diff --git a/reference/xml/functions/xml-parse-into-struct.xml b/reference/xml/functions/xml-parse-into-struct.xml
index 0138dd659..14263adbc 100644
--- a/reference/xml/functions/xml-parse-into-struct.xml
+++ b/reference/xml/functions/xml-parse-into-struct.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-parse-into-struct" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_parse_into_struct</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
    <methodparam><type>array</type><parameter role="reference">values</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter role="reference">index</parameter><initializer>&null;</initializer></methodparam>
diff --git a/reference/xml/functions/xml-parse.xml b/reference/xml/functions/xml-parse.xml
index df7e44825..b51a4225b 100644
--- a/reference/xml/functions/xml-parse.xml
+++ b/reference/xml/functions/xml-parse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-parse" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_parse</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>is_final</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
diff --git a/reference/xml/functions/xml-parser-create-ns.xml b/reference/xml/functions/xml-parser-create-ns.xml
index 6e1ac722a..cc174f545 100644
--- a/reference/xml/functions/xml-parser-create-ns.xml
+++ b/reference/xml/functions/xml-parser-create-ns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-parser-create-ns" xmlns="http://docbook.org/ns/docbook">
@@ -11,7 +11,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>XmlParser</type><methodname>xml_parser_create_ns</methodname>
+   <type>XMLParser</type><methodname>xml_parser_create_ns</methodname>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>separator</parameter><initializer>":"</initializer></methodparam>
   </methodsynopsis>
diff --git a/reference/xml/functions/xml-parser-create.xml b/reference/xml/functions/xml-parser-create.xml
index 483061f62..3e32b66c6 100644
--- a/reference/xml/functions/xml-parser-create.xml
+++ b/reference/xml/functions/xml-parser-create.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-parser-create" xmlns="http://docbook.org/ns/docbook">
@@ -11,7 +11,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>XmlParser</type><methodname>xml_parser_create</methodname>
+   <type>XMLParser</type><methodname>xml_parser_create</methodname>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/xml/functions/xml-parser-free.xml b/reference/xml/functions/xml-parser-free.xml
index 3cf68ef59..e9ad94bb1 100644
--- a/reference/xml/functions/xml-parser-free.xml
+++ b/reference/xml/functions/xml-parser-free.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-parser-free" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_parser_free</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>
   <para>
    Освобождает память, занятую XML-анализатором <parameter>parser</parameter>.
diff --git a/reference/xml/functions/xml-parser-get-option.xml b/reference/xml/functions/xml-parser-get-option.xml
index e35f522fb..aa7eff764 100644
--- a/reference/xml/functions/xml-parser-get-option.xml
+++ b/reference/xml/functions/xml-parser-get-option.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-parser-get-option" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>string</type><type>int</type></type><methodname>xml_parser_get_option</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>int</type><parameter>option</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/xml/functions/xml-parser-set-option.xml b/reference/xml/functions/xml-parser-set-option.xml
index 79ed1cffb..d52987547 100644
--- a/reference/xml/functions/xml-parser-set-option.xml
+++ b/reference/xml/functions/xml-parser-set-option.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-parser-set-option" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_parser_set_option</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>int</type><parameter>option</parameter></methodparam>
    <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>value</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/xml/functions/xml-set-character-data-handler.xml b/reference/xml/functions/xml-set-character-data-handler.xml
index 95f7ad395..e8c7ba649 100644
--- a/reference/xml/functions/xml-set-character-data-handler.xml
+++ b/reference/xml/functions/xml-set-character-data-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-set-character-data-handler" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_character_data_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/xml/functions/xml-set-default-handler.xml b/reference/xml/functions/xml-set-default-handler.xml
index 22240cb6b..878888153 100644
--- a/reference/xml/functions/xml-set-default-handler.xml
+++ b/reference/xml/functions/xml-set-default-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-set-default-handler" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_default_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/xml/functions/xml-set-element-handler.xml b/reference/xml/functions/xml-set-element-handler.xml
index 624fd6578..6bfb44435 100644
--- a/reference/xml/functions/xml-set-element-handler.xml
+++ b/reference/xml/functions/xml-set-element-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-set-element-handler" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_element_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>start_handler</parameter></methodparam>
    <methodparam><type>callable</type><parameter>end_handler</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/xml/functions/xml-set-end-namespace-decl-handler.xml b/reference/xml/functions/xml-set-end-namespace-decl-handler.xml
index b12183abc..bee4c16c4 100644
--- a/reference/xml/functions/xml-set-end-namespace-decl-handler.xml
+++ b/reference/xml/functions/xml-set-end-namespace-decl-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-set-end-namespace-decl-handler" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_end_namespace_decl_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -58,7 +58,7 @@
        <constant>XML_ERROR_EXTERNAL_ENTITY_HANDLING</constant>.
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>prefix</parameter></methodparam>
        </methodsynopsis>
        <variablelist>
diff --git a/reference/xml/functions/xml-set-external-entity-ref-handler.xml b/reference/xml/functions/xml-set-external-entity-ref-handler.xml
index eb6674f93..5f46ff18f 100644
--- a/reference/xml/functions/xml-set-external-entity-ref-handler.xml
+++ b/reference/xml/functions/xml-set-external-entity-ref-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-set-external-entity-ref-handler" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_external_entity_ref_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -49,9 +49,9 @@
        работу, а функция <function>xml_get_error_code</function> будет 
        возвращать константу
        <constant>XML_ERROR_EXTERNAL_ENTITY_HANDLING</constant>. 
-      <methodsynopsis>
+       <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>open_entity_names</parameter></methodparam>
         <methodparam><type>string</type><parameter>base</parameter></methodparam>
         <methodparam><type>string</type><parameter>system_id</parameter></methodparam>
diff --git a/reference/xml/functions/xml-set-notation-decl-handler.xml b/reference/xml/functions/xml-set-notation-decl-handler.xml
index dbd7d0c94..13521b1e0 100644
--- a/reference/xml/functions/xml-set-notation-decl-handler.xml
+++ b/reference/xml/functions/xml-set-notation-decl-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-set-notation-decl-handler" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_notation_decl_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -59,7 +59,7 @@
        аргументов:
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>notation_name</parameter></methodparam>
         <methodparam><type>string</type><parameter>base</parameter></methodparam>
         <methodparam><type>string</type><parameter>system_id</parameter></methodparam>
diff --git a/reference/xml/functions/xml-set-object.xml b/reference/xml/functions/xml-set-object.xml
index 088c45194..56584a0e2 100644
--- a/reference/xml/functions/xml-set-object.xml
+++ b/reference/xml/functions/xml-set-object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-set-object" xmlns="http://docbook.org/ns/docbook">
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_object</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>object</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/xml/functions/xml-set-processing-instruction-handler.xml b/reference/xml/functions/xml-set-processing-instruction-handler.xml
index f52c1824d..b70443ed3 100644
--- a/reference/xml/functions/xml-set-processing-instruction-handler.xml
+++ b/reference/xml/functions/xml-set-processing-instruction-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-set-processing-instruction-handler" xmlns="http://docbook.org/ns/docbook">
@@ -14,7 +14,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_processing_instruction_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -62,7 +62,7 @@
        аргумента:
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>target</parameter></methodparam>
         <methodparam><type>string</type><parameter>data</parameter></methodparam>
        </methodsynopsis>
diff --git a/reference/xml/functions/xml-set-start-namespace-decl-handler.xml b/reference/xml/functions/xml-set-start-namespace-decl-handler.xml
index a6dfffef3..8116b3a90 100644
--- a/reference/xml/functions/xml-set-start-namespace-decl-handler.xml
+++ b/reference/xml/functions/xml-set-start-namespace-decl-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-set-start-namespace-decl-handler" xmlns="http://docbook.org/ns/docbook">
@@ -14,7 +14,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_start_namespace_decl_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -53,9 +53,9 @@
        работу, а функция <function>xml_get_error_code</function> будет 
        возвращать константу
        <constant>XML_ERROR_EXTERNAL_ENTITY_HANDLING</constant>.
-      <methodsynopsis>
+       <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>prefix</parameter></methodparam>
         <methodparam><type>string</type><parameter>uri</parameter></methodparam>
        </methodsynopsis>
diff --git a/reference/xml/functions/xml-set-unparsed-entity-decl-handler.xml b/reference/xml/functions/xml-set-unparsed-entity-decl-handler.xml
index 43d409909..9e8f6ce5d 100644
--- a/reference/xml/functions/xml-set-unparsed-entity-decl-handler.xml
+++ b/reference/xml/functions/xml-set-unparsed-entity-decl-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 5ce1caaf995f892fe3c2193c1991d278f1bb6f7b Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 3db49ee0a331a657dd97b539a749f53d3965b593 Maintainer: tmn Status: ready -->
 <!-- Reviewed: yes -->
 <!-- $Revision$ -->
 <refentry xml:id="function.xml-set-unparsed-entity-decl-handler" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -14,7 +14,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_unparsed_entity_decl_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -63,7 +63,7 @@
        аргументов:
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>entity_name</parameter></methodparam>
         <methodparam><type>string</type><parameter>base</parameter></methodparam>
         <methodparam><type>string</type><parameter>system_id</parameter></methodparam>