diff --git a/appendices/ini.xml b/appendices/ini.xml
index 84aa3a38c2..57ce1229d4 100644
--- a/appendices/ini.xml
+++ b/appendices/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.77 $ -->
+<!-- $Revision: 1.78 $ -->
 
 <appendix xml:id="ini" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>&php.ini; directives</title>
@@ -3414,13 +3414,13 @@
        <entry>Available since Xdebug 2.0.0.</entry>
       </row>
       <row>
-       <entry>xmlrpc_errors</entry>
+       <entry><link linkend="ini.xmlrpc-errors">xmlrpc_errors</link></entry>
        <entry>"0"</entry>
        <entry>PHP_INI_SYSTEM</entry>
        <entry>Available since PHP 4.1.0.</entry>
       </row>
       <row>
-       <entry>xmlrpc_error_number</entry>
+       <entry><link linkend="ini.xmlrpc-error-number">xmlrpc_error_number</link></entry>
        <entry>"0"</entry>
        <entry>PHP_INI_ALL</entry>
        <entry>Available since PHP 4.1.0.</entry>
diff --git a/reference/errorfunc/functions/error-get-last.xml b/reference/errorfunc/functions/error-get-last.xml
index ad12bd479f..a0a62f48cf 100644
--- a/reference/errorfunc/functions/error-get-last.xml
+++ b/reference/errorfunc/functions/error-get-last.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <refentry xml:id="function.error-get-last" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>error_get_last</refname>
@@ -61,6 +61,8 @@ Array
     <member><link linkend="errorfunc.constants">Error constants</link></member>
     <member>Variable <varname>$php_errormsg</varname></member>
     <member><link linkend="ini.display-errors">Directive <parameter>display_errors</parameter></link></member>
+    <member><link linkend="ini.html-errors">Directive <parameter>html_errors</parameter></link></member>
+    <member><link linkend="ini.xmlrpc-errors">Directive <parameter>xmlrpc_errors</parameter></link></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/errorfunc/functions/error-reporting.xml b/reference/errorfunc/functions/error-reporting.xml
index 2acc67289a..ca29fdc88a 100644
--- a/reference/errorfunc/functions/error-reporting.xml
+++ b/reference/errorfunc/functions/error-reporting.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.error-reporting">
  <refnamediv>
   <refname>error_reporting</refname>
@@ -250,6 +250,8 @@ ini_set('error_reporting', E_ALL);
   <para>
    <simplelist>
     <member>The <link linkend="ini.display-errors">display_errors</link> directive</member>
+    <member>The <link linkend="ini.html-errors">html_errors</link> directive</member>
+    <member>The <link linkend="ini.xmlrpc-errors">xmlrpc_errors</link> directive</member>
     <member><function>ini_set</function></member>
    </simplelist>
   </para>
diff --git a/reference/errorfunc/ini.xml b/reference/errorfunc/ini.xml
index cbc22e439c..df4cccf803 100644
--- a/reference/errorfunc/ini.xml
+++ b/reference/errorfunc/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.37 $ -->
+<!-- $Revision: 1.38 $ -->
 <section xml:id="errorfunc.configuration" xmlns="http://docbook.org/ns/docbook">
  &reftitle.runtime;
  &extension.runtime;
@@ -76,6 +76,18 @@
      <entry>PHP_INI_ALL</entry>
      <entry>PHP_INI_SYSTEM in PHP &lt;= 4.2.3.</entry>
     </row>
+    <row>
+     <entry>xmlrpc_errors</entry>
+     <entry>"0"</entry>
+     <entry>PHP_INI_SYSTEM</entry>
+     <entry>Available since PHP 4.1.0.</entry>
+    </row>
+    <row>
+     <entry>xmlrpc_error_number</entry>
+     <entry>"0"</entry>
+     <entry>PHP_INI_ALL</entry>
+     <entry>Available since PHP 4.1.0.</entry>
+    </row>
     <row>
      <entry>docref_root</entry>
      <entry>""</entry>
@@ -332,6 +344,30 @@
     </listitem>
    </varlistentry>
 
+   <varlistentry xml:id="ini.xmlrpc-errors">
+    <term>
+     <parameter>xmlrpc_errors</parameter>
+     <type>boolean</type>
+    </term>
+    <listitem>
+     <para>
+      Turns off normal error reporting and formats errors as XML-RPC error message.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry xml:id="ini.xmlrpc-error-number">
+    <term>
+     <parameter>xmlrpc_error_number</parameter>
+     <type>integer</type>
+    </term>
+    <listitem>
+     <para>
+      User as the value of the XML-RPC faultCode element.
+     </para>
+    </listitem>
+   </varlistentry>
+
    <varlistentry xml:id="ini.docref-root">
     <term>
      <parameter>docref_root</parameter>
diff --git a/reference/xmlrpc/ini.xml b/reference/xmlrpc/ini.xml
deleted file mode 100644
index fadc8ccba4..0000000000
--- a/reference/xmlrpc/ini.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<section xml:id="xmlrpc.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
- <table>
-  <title>XML-RPC configuration options</title>
-  <tgroup cols="4">
-   <thead>
-    <row>
-     <entry>Name</entry>
-     <entry>Default</entry>
-     <entry>Changeable</entry>
-     <entry>Changelog</entry>
-    </row>
-   </thead>
-   <tbody>
-    <row>
-     <entry>xmlrpc_errors</entry>
-     <entry>"0"</entry>
-     <entry>PHP_INI_SYSTEM</entry>
-     <entry>Available since PHP 4.1.0.</entry>
-    </row>
-    <row>
-     <entry>xmlrpc_error_number</entry>
-     <entry>"0"</entry>
-     <entry>PHP_INI_ALL</entry>
-     <entry>Available since PHP 4.1.0.</entry>
-    </row>
-   </tbody>
-  </tgroup>
- </table>
- &ini.php.constants;
- </para>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"../../../manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
-
diff --git a/reference/xmlrpc/setup.xml b/reference/xmlrpc/setup.xml
index 612e20a781..770ac1d27b 100644
--- a/reference/xmlrpc/setup.xml
+++ b/reference/xmlrpc/setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
 <chapter xml:id="xmlrpc.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.setup;
@@ -16,7 +16,10 @@
  <!-- }}} -->
 
  <!-- {{{ Configuration -->
- &reference.xmlrpc.ini;
+ <section xml:id="xmlrpc.configuration">
+  &reftitle.runtime;
+  &no.config;
+ </section>
  <!-- }}} -->
 
  <!-- {{{ Resources -->