diff --git a/reference/mysqli/functions/mysqli-connect.xml b/reference/mysqli/functions/mysqli-connect.xml
deleted file mode 100644
index b46cf40bd6..0000000000
--- a/reference/mysqli/functions/mysqli-connect.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- EN-Revision: be526864c9777106cd78a517628847b60743e2d4 Maintainer: girgias Status: ready -->
-<!-- Reviewed: no -->
-<refentry xml:id="function.mysqli-connect" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>mysqli_connect</refname>
-  <refpurpose>&Alias; <methodname>mysqli::__construct</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   &info.function.alias; <methodname>mysqli::__construct</methodname>
-  </para>
-  <note>
-   <para>
-    Si le mode d'exception mysqli n'est pas activé et qu'une connexion échoue,
-    alors <function>mysqli_connect</function> retourne &false; au lieu d'un objet.
-    La fonction <function>mysqli_connect_error</function> peut être utilisée pour
-    récupérer l'erreur de connexion.
-   </para>
-  </note>
- </refsect1>
-</refentry>
-<!-- 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:"~/.phpdoc/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/mysqli/functions/mysqli-report.xml b/reference/mysqli/functions/mysqli-report.xml
deleted file mode 100644
index 09997226b6..0000000000
--- a/reference/mysqli/functions/mysqli-report.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- EN-Revision: 2ebf4027bf399628d647bd1030da96a497484711 Maintainer: yannick Status: ready -->
-<!-- Reviewed: yes -->
-
-<refentry xml:id="function.mysqli-report" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>mysqli_report</refname>
-  <refpurpose>&Alias; <link linkend="mysqli-driver.report-mode">mysqli_driver->report_mode</link></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-    &info.function.alias; <link linkend="mysqli-driver.report-mode">mysqli_driver->report_mode</link>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- 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:"~/.phpdoc/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
--->
diff --git a/reference/mysqli/functions/mysqli-escape-string.xml b/reference/mysqli/mysqli/escape-string.xml
similarity index 82%
rename from reference/mysqli/functions/mysqli-escape-string.xml
rename to reference/mysqli/mysqli/escape-string.xml
index 297feb77a6..a7b10ff890 100644
--- a/reference/mysqli/functions/mysqli-escape-string.xml
+++ b/reference/mysqli/mysqli/escape-string.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- EN-Revision: df1072f8d2a3157534cb61d3734864c1f4852808 Maintainer: yannick Status: ready -->
-<!-- Reviewed: yes -->
-
-<refentry xml:id="function.mysqli-escape-string" xmlns="http://docbook.org/ns/docbook">
+<!-- EN-Revision: 17a96b3fa50329bcd71739da7291019edae3c6af Maintainer: yannick Status: ready -->
+<refentry xml:id="mysqli.escape-string" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli::escape_string</refname>
   <refname>mysqli_escape_string</refname>
diff --git a/reference/mysqli/functions/mysqli-set-opt.xml b/reference/mysqli/mysqli/set-opt.xml
similarity index 81%
rename from reference/mysqli/functions/mysqli-set-opt.xml
rename to reference/mysqli/mysqli/set-opt.xml
index d8d4da13ca..4c9b7cb6a7 100644
--- a/reference/mysqli/functions/mysqli-set-opt.xml
+++ b/reference/mysqli/mysqli/set-opt.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- EN-Revision: b5525a14127c550a967a30a981f1af9e12d7474e Maintainer: yannick Status: ready -->
-<!-- Reviewed: yes -->
-
-<refentry xml:id="function.mysqli-set-opt" xmlns="http://docbook.org/ns/docbook">
+<!-- EN-Revision: 17a96b3fa50329bcd71739da7291019edae3c6af Maintainer: yannick Status: ready -->
+<refentry xml:id="mysqli.set-opt" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli::set_opt</refname>
   <refname>mysqli_set_opt</refname>
diff --git a/reference/mysqli/reference.xml b/reference/mysqli/reference.xml
index 38081f02d0..0707ba5f3b 100644
--- a/reference/mysqli/reference.xml
+++ b/reference/mysqli/reference.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- EN-Revision: af4410a7e15898c3dbe83d6ea38246745ed9c6fb Maintainer: yannick Status: ready -->
-<!-- Reviewed: yes -->
-
+<!-- EN-Revision: 17a96b3fa50329bcd71739da7291019edae3c6af Maintainer: yannick Status: ready -->
 <reference xml:id="ref.mysqli">
- <title>&Functions; mysqli obsolètes et alias</title>
+ <title>&Functions; MySQLi</title>
 
  &reference.mysqli.entities.functions;
 </reference>