From 4da17a4475184c43ae1c4d1121712dd424eaa117 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Wed, 2 Jan 2008 14:38:33 +0000
Subject: [PATCH] Rename functions/mysqli-*.xml to mysqli/*.xml

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@249686 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mysqli/mysqli.xml                   | 67 +------------------
 .../affected-rows.xml}                        |  2 +-
 .../autocommit.xml}                           |  2 +-
 .../change-user.xml}                          |  2 +-
 .../character-set-name.xml}                   |  2 +-
 .../mysqli-close.xml => mysqli/close.xml}     |  2 +-
 .../mysqli-commit.xml => mysqli/commit.xml}   |  2 +-
 .../connect-errno.xml}                        |  2 +-
 .../connect-error.xml}                        |  2 +-
 .../mysqli-connect.xml => mysqli/connect.xml} |  2 +-
 .../mysqli-debug.xml => mysqli/debug.xml}     |  2 +-
 .../dump-debug-info.xml}                      |  2 +-
 .../mysqli-errno.xml => mysqli/errno.xml}     |  2 +-
 .../mysqli-error.xml => mysqli/error.xml}     |  2 +-
 .../field-count.xml}                          |  2 +-
 .../get-charset.xml}                          |  2 +-
 .../get-client-info.xml}                      |  2 +-
 .../get-client-version.xml}                   |  2 +-
 .../get-host-info.xml}                        |  2 +-
 .../get-proto-info.xml}                       |  2 +-
 .../get-server-info.xml}                      |  2 +-
 .../get-server-version.xml}                   |  2 +-
 .../get-warnings.xml}                         |  2 +-
 .../mysqli-info.xml => mysqli/info.xml}       |  2 +-
 .../mysqli-init.xml => mysqli/init.xml}       |  2 +-
 .../insert-id.xml}                            |  2 +-
 .../mysqli-kill.xml => mysqli/kill.xml}       |  2 +-
 .../more-results.xml}                         |  2 +-
 .../multi-query.xml}                          |  2 +-
 .../next-result.xml}                          |  2 +-
 .../mysqli-options.xml => mysqli/options.xml} |  2 +-
 .../mysqli-ping.xml => mysqli/ping.xml}       |  2 +-
 .../mysqli-prepare.xml => mysqli/prepare.xml} |  2 +-
 .../mysqli-query.xml => mysqli/query.xml}     |  2 +-
 .../real-connect.xml}                         |  2 +-
 .../real-escape-string.xml}                   |  2 +-
 .../real-query.xml}                           |  2 +-
 .../rollback.xml}                             |  2 +-
 .../select-db.xml}                            |  2 +-
 .../set-charset.xml}                          |  2 +-
 .../set-local-infile-default.xml}             |  2 +-
 .../set-local-infile-handler.xml}             |  2 +-
 .../sqlstate.xml}                             |  2 +-
 .../mysqli-ssl-set.xml => mysqli/ssl-set.xml} |  2 +-
 .../mysqli-stat.xml => mysqli/stat.xml}       |  2 +-
 .../stmt-init.xml}                            |  2 +-
 .../store-result.xml}                         |  2 +-
 .../thread-id.xml}                            |  2 +-
 .../thread-safe.xml}                          |  2 +-
 .../use-result.xml}                           |  2 +-
 .../warning-count.xml}                        |  2 +-
 51 files changed, 52 insertions(+), 115 deletions(-)
 rename reference/mysqli/{functions/mysqli-affected-rows.xml => mysqli/affected-rows.xml} (99%)
 rename reference/mysqli/{functions/mysqli-autocommit.xml => mysqli/autocommit.xml} (99%)
 rename reference/mysqli/{functions/mysqli-change-user.xml => mysqli/change-user.xml} (99%)
 rename reference/mysqli/{functions/mysqli-character-set-name.xml => mysqli/character-set-name.xml} (99%)
 rename reference/mysqli/{functions/mysqli-close.xml => mysqli/close.xml} (98%)
 rename reference/mysqli/{functions/mysqli-commit.xml => mysqli/commit.xml} (99%)
 rename reference/mysqli/{functions/mysqli-connect-errno.xml => mysqli/connect-errno.xml} (98%)
 rename reference/mysqli/{functions/mysqli-connect-error.xml => mysqli/connect-error.xml} (98%)
 rename reference/mysqli/{functions/mysqli-connect.xml => mysqli/connect.xml} (99%)
 rename reference/mysqli/{functions/mysqli-debug.xml => mysqli/debug.xml} (99%)
 rename reference/mysqli/{functions/mysqli-dump-debug-info.xml => mysqli/dump-debug-info.xml} (98%)
 rename reference/mysqli/{functions/mysqli-errno.xml => mysqli/errno.xml} (99%)
 rename reference/mysqli/{functions/mysqli-error.xml => mysqli/error.xml} (99%)
 rename reference/mysqli/{functions/mysqli-field-count.xml => mysqli/field-count.xml} (99%)
 rename reference/mysqli/{functions/mysqli-get-charset.xml => mysqli/get-charset.xml} (97%)
 rename reference/mysqli/{functions/mysqli-get-client-info.xml => mysqli/get-client-info.xml} (98%)
 rename reference/mysqli/{functions/mysqli-get-client-version.xml => mysqli/get-client-version.xml} (98%)
 rename reference/mysqli/{functions/mysqli-get-host-info.xml => mysqli/get-host-info.xml} (99%)
 rename reference/mysqli/{functions/mysqli-get-proto-info.xml => mysqli/get-proto-info.xml} (99%)
 rename reference/mysqli/{functions/mysqli-get-server-info.xml => mysqli/get-server-info.xml} (99%)
 rename reference/mysqli/{functions/mysqli-get-server-version.xml => mysqli/get-server-version.xml} (99%)
 rename reference/mysqli/{functions/mysqli-get-warnings.xml => mysqli/get-warnings.xml} (97%)
 rename reference/mysqli/{functions/mysqli-info.xml => mysqli/info.xml} (99%)
 rename reference/mysqli/{functions/mysqli-init.xml => mysqli/init.xml} (98%)
 rename reference/mysqli/{functions/mysqli-insert-id.xml => mysqli/insert-id.xml} (99%)
 rename reference/mysqli/{functions/mysqli-kill.xml => mysqli/kill.xml} (99%)
 rename reference/mysqli/{functions/mysqli-more-results.xml => mysqli/more-results.xml} (98%)
 rename reference/mysqli/{functions/mysqli-multi-query.xml => mysqli/multi-query.xml} (99%)
 rename reference/mysqli/{functions/mysqli-next-result.xml => mysqli/next-result.xml} (98%)
 rename reference/mysqli/{functions/mysqli-options.xml => mysqli/options.xml} (99%)
 rename reference/mysqli/{functions/mysqli-ping.xml => mysqli/ping.xml} (99%)
 rename reference/mysqli/{functions/mysqli-prepare.xml => mysqli/prepare.xml} (99%)
 rename reference/mysqli/{functions/mysqli-query.xml => mysqli/query.xml} (99%)
 rename reference/mysqli/{functions/mysqli-real-connect.xml => mysqli/real-connect.xml} (99%)
 rename reference/mysqli/{functions/mysqli-real-escape-string.xml => mysqli/real-escape-string.xml} (99%)
 rename reference/mysqli/{functions/mysqli-real-query.xml => mysqli/real-query.xml} (98%)
 rename reference/mysqli/{functions/mysqli-rollback.xml => mysqli/rollback.xml} (99%)
 rename reference/mysqli/{functions/mysqli-select-db.xml => mysqli/select-db.xml} (99%)
 rename reference/mysqli/{functions/mysqli-set-charset.xml => mysqli/set-charset.xml} (99%)
 rename reference/mysqli/{functions/mysqli-set-local-infile-default.xml => mysqli/set-local-infile-default.xml} (97%)
 rename reference/mysqli/{functions/mysqli-set-local-infile-handler.xml => mysqli/set-local-infile-handler.xml} (97%)
 rename reference/mysqli/{functions/mysqli-sqlstate.xml => mysqli/sqlstate.xml} (99%)
 rename reference/mysqli/{functions/mysqli-ssl-set.xml => mysqli/ssl-set.xml} (99%)
 rename reference/mysqli/{functions/mysqli-stat.xml => mysqli/stat.xml} (99%)
 rename reference/mysqli/{functions/mysqli-stmt-init.xml => mysqli/stmt-init.xml} (98%)
 rename reference/mysqli/{functions/mysqli-store-result.xml => mysqli/store-result.xml} (99%)
 rename reference/mysqli/{functions/mysqli-thread-id.xml => mysqli/thread-id.xml} (99%)
 rename reference/mysqli/{functions/mysqli-thread-safe.xml => mysqli/thread-safe.xml} (97%)
 rename reference/mysqli/{functions/mysqli-use-result.xml => mysqli/use-result.xml} (99%)
 rename reference/mysqli/{functions/mysqli-warning-count.xml => mysqli/warning-count.xml} (99%)

diff --git a/reference/mysqli/mysqli.xml b/reference/mysqli/mysqli.xml
index 1a82175017..b0383ab8a7 100644
--- a/reference/mysqli/mysqli.xml
+++ b/reference/mysqli/mysqli.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <reference xml:id="class.mysqli" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>The MySQLi class</title>
  <titleabbrev>MySQLi</titleabbrev>
@@ -42,71 +42,8 @@
  
  </partintro>
  
-<!-- &reference.mysqli.entities.mysqli; -->
-<!-- {{{ FIXME: These entities should be removed and the one above used -->
- &reference.mysqli.functions.mysqli-autocommit;
- &reference.mysqli.functions.mysqli-change-user;
- &reference.mysqli.functions.mysqli-character-set-name;
- &reference.mysqli.functions.mysqli-client-encoding;
- &reference.mysqli.functions.mysqli-close;
- &reference.mysqli.functions.mysqli-commit;
- &reference.mysqli.functions.mysqli-connect;
- &reference.mysqli.functions.mysqli-debug;
- &reference.mysqli.functions.mysqli-disable-reads-from-master;
- &reference.mysqli.functions.mysqli-disable-rpl-parse;
- &reference.mysqli.functions.mysqli-dump-debug-info;
- &reference.mysqli.functions.mysqli-enable-reads-from-master;
- &reference.mysqli.functions.mysqli-enable-rpl-parse;
- &reference.mysqli.functions.mysqli-get-client-info;
- &reference.mysqli.functions.mysqli-get-server-info;
- &reference.mysqli.functions.mysqli-get-warnings;
- &reference.mysqli.functions.mysqli-init;
- &reference.mysqli.functions.mysqli-kill;
- &reference.mysqli.functions.mysqli-set-local-infile-default;
- &reference.mysqli.functions.mysqli-set-local-infile-handler;
- &reference.mysqli.functions.mysqli-master-query;
- &reference.mysqli.functions.mysqli-multi-query;
- &reference.mysqli.functions.mysqli-more-results;
- &reference.mysqli.functions.mysqli-next-result;
- &reference.mysqli.functions.mysqli-options;
- &reference.mysqli.functions.mysqli-ping;
- &reference.mysqli.functions.mysqli-prepare;
- &reference.mysqli.functions.mysqli-query;
- &reference.mysqli.functions.mysqli-real-connect;
- &reference.mysqli.functions.mysqli-real-escape-string;
- &reference.mysqli.functions.mysqli-escape-string;
- &reference.mysqli.functions.mysqli-real-query;
- &reference.mysqli.functions.mysqli-rollback;
- &reference.mysqli.functions.mysqli-rpl-parse-enabled;
- &reference.mysqli.functions.mysqli-rpl-probe;
- &reference.mysqli.functions.mysqli-rpl-query-type;
- &reference.mysqli.functions.mysqli-select-db;
- &reference.mysqli.functions.mysqli-set-charset;
- &reference.mysqli.functions.mysqli-set-opt;
- &reference.mysqli.functions.mysqli-slave-query;
- &reference.mysqli.functions.mysqli-ssl-set;
- &reference.mysqli.functions.mysqli-stat;
- &reference.mysqli.functions.mysqli-stmt-init;
- &reference.mysqli.functions.mysqli-store-result;
- &reference.mysqli.functions.mysqli-thread-safe;
- &reference.mysqli.functions.mysqli-use-result;
+ &reference.mysqli.entities.mysqli;
 
-
- &reference.mysqli.functions.mysqli-get-host-info;
- &reference.mysqli.functions.mysqli-get-server-version;
- &reference.mysqli.functions.mysqli-info;
- &reference.mysqli.functions.mysqli-affected-rows;
- &reference.mysqli.functions.mysqli-get-client-version;
- &reference.mysqli.functions.mysqli-errno;
- &reference.mysqli.functions.mysqli-error;
- &reference.mysqli.functions.mysqli-field-count;
- &reference.mysqli.functions.mysqli-insert-id;
- &reference.mysqli.functions.mysqli-get-proto-info;
- &reference.mysqli.functions.mysqli-sqlstate;
- &reference.mysqli.functions.mysqli-thread-id;
- &reference.mysqli.functions.mysqli-warning-count;
-<!-- }}} -->
- 
 </reference>
  
 <!-- Keep this comment at the end of the file
diff --git a/reference/mysqli/functions/mysqli-affected-rows.xml b/reference/mysqli/mysqli/affected-rows.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-affected-rows.xml
rename to reference/mysqli/mysqli/affected-rows.xml
index fabea50160..c4ccd22804 100644
--- a/reference/mysqli/functions/mysqli-affected-rows.xml
+++ b/reference/mysqli/mysqli/affected-rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.25 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-affected-rows" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_affected_rows</refname>
diff --git a/reference/mysqli/functions/mysqli-autocommit.xml b/reference/mysqli/mysqli/autocommit.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-autocommit.xml
rename to reference/mysqli/mysqli/autocommit.xml
index a4ae4289f3..dc2968dbab 100644
--- a/reference/mysqli/functions/mysqli-autocommit.xml
+++ b/reference/mysqli/mysqli/autocommit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.21 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-autocommit" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_autocommit</refname>
diff --git a/reference/mysqli/functions/mysqli-change-user.xml b/reference/mysqli/mysqli/change-user.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-change-user.xml
rename to reference/mysqli/mysqli/change-user.xml
index a8c675efb1..541018b34e 100644
--- a/reference/mysqli/functions/mysqli-change-user.xml
+++ b/reference/mysqli/mysqli/change-user.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-change-user" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_change_user</refname>
diff --git a/reference/mysqli/functions/mysqli-character-set-name.xml b/reference/mysqli/mysqli/character-set-name.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-character-set-name.xml
rename to reference/mysqli/mysqli/character-set-name.xml
index 163e353f53..266453c68f 100644
--- a/reference/mysqli/functions/mysqli-character-set-name.xml
+++ b/reference/mysqli/mysqli/character-set-name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-character-set-name" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_character_set_name</refname>
diff --git a/reference/mysqli/functions/mysqli-close.xml b/reference/mysqli/mysqli/close.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-close.xml
rename to reference/mysqli/mysqli/close.xml
index cce1b303df..fed42e62d4 100644
--- a/reference/mysqli/functions/mysqli-close.xml
+++ b/reference/mysqli/mysqli/close.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-close" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_close</refname>
diff --git a/reference/mysqli/functions/mysqli-commit.xml b/reference/mysqli/mysqli/commit.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-commit.xml
rename to reference/mysqli/mysqli/commit.xml
index 29f71feffc..17605e70cc 100644
--- a/reference/mysqli/functions/mysqli-commit.xml
+++ b/reference/mysqli/mysqli/commit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-commit" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_commit</refname>
diff --git a/reference/mysqli/functions/mysqli-connect-errno.xml b/reference/mysqli/mysqli/connect-errno.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-connect-errno.xml
rename to reference/mysqli/mysqli/connect-errno.xml
index 70dab80342..9fdbcf2580 100644
--- a/reference/mysqli/functions/mysqli-connect-errno.xml
+++ b/reference/mysqli/mysqli/connect-errno.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-connect-errno" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_connect_errno</refname>
diff --git a/reference/mysqli/functions/mysqli-connect-error.xml b/reference/mysqli/mysqli/connect-error.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-connect-error.xml
rename to reference/mysqli/mysqli/connect-error.xml
index 84be1cd870..dc319b3f8e 100644
--- a/reference/mysqli/functions/mysqli-connect-error.xml
+++ b/reference/mysqli/mysqli/connect-error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-connect-error" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_connect_error</refname>
diff --git a/reference/mysqli/functions/mysqli-connect.xml b/reference/mysqli/mysqli/connect.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-connect.xml
rename to reference/mysqli/mysqli/connect.xml
index 67874e6625..d7cc0171cd 100644
--- a/reference/mysqli/functions/mysqli-connect.xml
+++ b/reference/mysqli/mysqli/connect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.25 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-connect" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_connect</refname>
diff --git a/reference/mysqli/functions/mysqli-debug.xml b/reference/mysqli/mysqli/debug.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-debug.xml
rename to reference/mysqli/mysqli/debug.xml
index ac5407b617..371005edda 100644
--- a/reference/mysqli/functions/mysqli-debug.xml
+++ b/reference/mysqli/mysqli/debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-debug" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_debug</refname>
diff --git a/reference/mysqli/functions/mysqli-dump-debug-info.xml b/reference/mysqli/mysqli/dump-debug-info.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-dump-debug-info.xml
rename to reference/mysqli/mysqli/dump-debug-info.xml
index dc1526dfb1..e38b82b437 100644
--- a/reference/mysqli/functions/mysqli-dump-debug-info.xml
+++ b/reference/mysqli/mysqli/dump-debug-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-dump-debug-info" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_dump_debug_info</refname>
diff --git a/reference/mysqli/functions/mysqli-errno.xml b/reference/mysqli/mysqli/errno.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-errno.xml
rename to reference/mysqli/mysqli/errno.xml
index 1addffe8bc..5a33692ba8 100644
--- a/reference/mysqli/functions/mysqli-errno.xml
+++ b/reference/mysqli/mysqli/errno.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-errno" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_errno</refname>
diff --git a/reference/mysqli/functions/mysqli-error.xml b/reference/mysqli/mysqli/error.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-error.xml
rename to reference/mysqli/mysqli/error.xml
index 377934f8dc..f526793211 100644
--- a/reference/mysqli/functions/mysqli-error.xml
+++ b/reference/mysqli/mysqli/error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-error" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_error</refname>
diff --git a/reference/mysqli/functions/mysqli-field-count.xml b/reference/mysqli/mysqli/field-count.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-field-count.xml
rename to reference/mysqli/mysqli/field-count.xml
index d0ece07029..4ee3a97069 100644
--- a/reference/mysqli/functions/mysqli-field-count.xml
+++ b/reference/mysqli/mysqli/field-count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-field-count" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_field_count</refname>
diff --git a/reference/mysqli/functions/mysqli-get-charset.xml b/reference/mysqli/mysqli/get-charset.xml
similarity index 97%
rename from reference/mysqli/functions/mysqli-get-charset.xml
rename to reference/mysqli/mysqli/get-charset.xml
index 662d9a49c1..a95cc57442 100644
--- a/reference/mysqli/functions/mysqli-get-charset.xml
+++ b/reference/mysqli/mysqli/get-charset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-get-charset" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_get_charset</refname>
diff --git a/reference/mysqli/functions/mysqli-get-client-info.xml b/reference/mysqli/mysqli/get-client-info.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-get-client-info.xml
rename to reference/mysqli/mysqli/get-client-info.xml
index 86f37488dc..685a7e33d5 100644
--- a/reference/mysqli/functions/mysqli-get-client-info.xml
+++ b/reference/mysqli/mysqli/get-client-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-get-client-info" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_get_client_info</refname>
diff --git a/reference/mysqli/functions/mysqli-get-client-version.xml b/reference/mysqli/mysqli/get-client-version.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-get-client-version.xml
rename to reference/mysqli/mysqli/get-client-version.xml
index e3a9050d5b..c246093d19 100644
--- a/reference/mysqli/functions/mysqli-get-client-version.xml
+++ b/reference/mysqli/mysqli/get-client-version.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-get-client-version" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_get_client_version</refname>
diff --git a/reference/mysqli/functions/mysqli-get-host-info.xml b/reference/mysqli/mysqli/get-host-info.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-get-host-info.xml
rename to reference/mysqli/mysqli/get-host-info.xml
index 2e2013deaa..c666047e98 100644
--- a/reference/mysqli/functions/mysqli-get-host-info.xml
+++ b/reference/mysqli/mysqli/get-host-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-get-host-info" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_get_host_info</refname>
diff --git a/reference/mysqli/functions/mysqli-get-proto-info.xml b/reference/mysqli/mysqli/get-proto-info.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-get-proto-info.xml
rename to reference/mysqli/mysqli/get-proto-info.xml
index 9ab2f629e2..16389d921d 100644
--- a/reference/mysqli/functions/mysqli-get-proto-info.xml
+++ b/reference/mysqli/mysqli/get-proto-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-get-proto-info" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_get_proto_info</refname>
diff --git a/reference/mysqli/functions/mysqli-get-server-info.xml b/reference/mysqli/mysqli/get-server-info.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-get-server-info.xml
rename to reference/mysqli/mysqli/get-server-info.xml
index 8ccb92d2fe..437ca3ceba 100644
--- a/reference/mysqli/functions/mysqli-get-server-info.xml
+++ b/reference/mysqli/mysqli/get-server-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-get-server-info" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_get_server_info</refname>
diff --git a/reference/mysqli/functions/mysqli-get-server-version.xml b/reference/mysqli/mysqli/get-server-version.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-get-server-version.xml
rename to reference/mysqli/mysqli/get-server-version.xml
index de7d96fc1a..eab8648326 100644
--- a/reference/mysqli/functions/mysqli-get-server-version.xml
+++ b/reference/mysqli/mysqli/get-server-version.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-get-server-version" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_get_server_version</refname>
diff --git a/reference/mysqli/functions/mysqli-get-warnings.xml b/reference/mysqli/mysqli/get-warnings.xml
similarity index 97%
rename from reference/mysqli/functions/mysqli-get-warnings.xml
rename to reference/mysqli/mysqli/get-warnings.xml
index 1c240e65ec..2c1b502c03 100644
--- a/reference/mysqli/functions/mysqli-get-warnings.xml
+++ b/reference/mysqli/mysqli/get-warnings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-get-warnings" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_get_warnings</refname>
diff --git a/reference/mysqli/functions/mysqli-info.xml b/reference/mysqli/mysqli/info.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-info.xml
rename to reference/mysqli/mysqli/info.xml
index f706555371..b1f55bc785 100644
--- a/reference/mysqli/functions/mysqli-info.xml
+++ b/reference/mysqli/mysqli/info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-info" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_info</refname>
diff --git a/reference/mysqli/functions/mysqli-init.xml b/reference/mysqli/mysqli/init.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-init.xml
rename to reference/mysqli/mysqli/init.xml
index 8d88e6e589..a774767b99 100644
--- a/reference/mysqli/functions/mysqli-init.xml
+++ b/reference/mysqli/mysqli/init.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-init" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_init</refname>
diff --git a/reference/mysqli/functions/mysqli-insert-id.xml b/reference/mysqli/mysqli/insert-id.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-insert-id.xml
rename to reference/mysqli/mysqli/insert-id.xml
index 084512dcc5..d7aa6fa0b4 100644
--- a/reference/mysqli/functions/mysqli-insert-id.xml
+++ b/reference/mysqli/mysqli/insert-id.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-insert-id" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_insert_id</refname>
diff --git a/reference/mysqli/functions/mysqli-kill.xml b/reference/mysqli/mysqli/kill.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-kill.xml
rename to reference/mysqli/mysqli/kill.xml
index f660661ab9..41348ffc29 100644
--- a/reference/mysqli/functions/mysqli-kill.xml
+++ b/reference/mysqli/mysqli/kill.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-kill" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_kill</refname>
diff --git a/reference/mysqli/functions/mysqli-more-results.xml b/reference/mysqli/mysqli/more-results.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-more-results.xml
rename to reference/mysqli/mysqli/more-results.xml
index 08eab63c03..08e2103876 100644
--- a/reference/mysqli/functions/mysqli-more-results.xml
+++ b/reference/mysqli/mysqli/more-results.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-more-results" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_more_results</refname>
diff --git a/reference/mysqli/functions/mysqli-multi-query.xml b/reference/mysqli/mysqli/multi-query.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-multi-query.xml
rename to reference/mysqli/mysqli/multi-query.xml
index 22ae906741..4062111711 100644
--- a/reference/mysqli/functions/mysqli-multi-query.xml
+++ b/reference/mysqli/mysqli/multi-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-multi-query" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_multi_query</refname>
diff --git a/reference/mysqli/functions/mysqli-next-result.xml b/reference/mysqli/mysqli/next-result.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-next-result.xml
rename to reference/mysqli/mysqli/next-result.xml
index 8352d22c8b..0387c1cc08 100644
--- a/reference/mysqli/functions/mysqli-next-result.xml
+++ b/reference/mysqli/mysqli/next-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-next-result" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_next_result</refname>
diff --git a/reference/mysqli/functions/mysqli-options.xml b/reference/mysqli/mysqli/options.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-options.xml
rename to reference/mysqli/mysqli/options.xml
index bb77964ecd..6346c7b0ce 100644
--- a/reference/mysqli/functions/mysqli-options.xml
+++ b/reference/mysqli/mysqli/options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-options" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_options</refname>
diff --git a/reference/mysqli/functions/mysqli-ping.xml b/reference/mysqli/mysqli/ping.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-ping.xml
rename to reference/mysqli/mysqli/ping.xml
index e59538f93b..ae6b735e36 100644
--- a/reference/mysqli/functions/mysqli-ping.xml
+++ b/reference/mysqli/mysqli/ping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-ping" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_ping</refname>
diff --git a/reference/mysqli/functions/mysqli-prepare.xml b/reference/mysqli/mysqli/prepare.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-prepare.xml
rename to reference/mysqli/mysqli/prepare.xml
index 8fbb5c7c0c..f11b1bb41f 100644
--- a/reference/mysqli/functions/mysqli-prepare.xml
+++ b/reference/mysqli/mysqli/prepare.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-prepare" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_prepare</refname>
diff --git a/reference/mysqli/functions/mysqli-query.xml b/reference/mysqli/mysqli/query.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-query.xml
rename to reference/mysqli/mysqli/query.xml
index d4af5bf9d7..eb9160c5d4 100644
--- a/reference/mysqli/functions/mysqli-query.xml
+++ b/reference/mysqli/mysqli/query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-query" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_query</refname>
diff --git a/reference/mysqli/functions/mysqli-real-connect.xml b/reference/mysqli/mysqli/real-connect.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-real-connect.xml
rename to reference/mysqli/mysqli/real-connect.xml
index 777df2ccb6..b6adc08102 100644
--- a/reference/mysqli/functions/mysqli-real-connect.xml
+++ b/reference/mysqli/mysqli/real-connect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-real-connect" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_real_connect</refname>
diff --git a/reference/mysqli/functions/mysqli-real-escape-string.xml b/reference/mysqli/mysqli/real-escape-string.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-real-escape-string.xml
rename to reference/mysqli/mysqli/real-escape-string.xml
index 40d4918b85..a34e100879 100644
--- a/reference/mysqli/functions/mysqli-real-escape-string.xml
+++ b/reference/mysqli/mysqli/real-escape-string.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-real-escape-string" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_real_escape_string</refname>
diff --git a/reference/mysqli/functions/mysqli-real-query.xml b/reference/mysqli/mysqli/real-query.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-real-query.xml
rename to reference/mysqli/mysqli/real-query.xml
index 3b850a7723..a519df01c1 100644
--- a/reference/mysqli/functions/mysqli-real-query.xml
+++ b/reference/mysqli/mysqli/real-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-real-query" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_real_query</refname>
diff --git a/reference/mysqli/functions/mysqli-rollback.xml b/reference/mysqli/mysqli/rollback.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-rollback.xml
rename to reference/mysqli/mysqli/rollback.xml
index 586e2c743f..b4e821933c 100644
--- a/reference/mysqli/functions/mysqli-rollback.xml
+++ b/reference/mysqli/mysqli/rollback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-rollback" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_rollback</refname>
diff --git a/reference/mysqli/functions/mysqli-select-db.xml b/reference/mysqli/mysqli/select-db.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-select-db.xml
rename to reference/mysqli/mysqli/select-db.xml
index 5210241e47..93ba4287c6 100644
--- a/reference/mysqli/functions/mysqli-select-db.xml
+++ b/reference/mysqli/mysqli/select-db.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-select-db" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_select_db</refname>
diff --git a/reference/mysqli/functions/mysqli-set-charset.xml b/reference/mysqli/mysqli/set-charset.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-set-charset.xml
rename to reference/mysqli/mysqli/set-charset.xml
index ed814746f6..a362903ba4 100644
--- a/reference/mysqli/functions/mysqli-set-charset.xml
+++ b/reference/mysqli/mysqli/set-charset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-set-charset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>mysqli_set_charset</refname>
diff --git a/reference/mysqli/functions/mysqli-set-local-infile-default.xml b/reference/mysqli/mysqli/set-local-infile-default.xml
similarity index 97%
rename from reference/mysqli/functions/mysqli-set-local-infile-default.xml
rename to reference/mysqli/mysqli/set-local-infile-default.xml
index 32eb56d2b0..1b876331ce 100644
--- a/reference/mysqli/functions/mysqli-set-local-infile-default.xml
+++ b/reference/mysqli/mysqli/set-local-infile-default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-set-local-infile-default" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_set_local_infile_default</refname>
diff --git a/reference/mysqli/functions/mysqli-set-local-infile-handler.xml b/reference/mysqli/mysqli/set-local-infile-handler.xml
similarity index 97%
rename from reference/mysqli/functions/mysqli-set-local-infile-handler.xml
rename to reference/mysqli/mysqli/set-local-infile-handler.xml
index ea0bf90efd..6dec5d72f0 100644
--- a/reference/mysqli/functions/mysqli-set-local-infile-handler.xml
+++ b/reference/mysqli/mysqli/set-local-infile-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-set-local-infile-handler" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_set_local_infile_handler</refname>
diff --git a/reference/mysqli/functions/mysqli-sqlstate.xml b/reference/mysqli/mysqli/sqlstate.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-sqlstate.xml
rename to reference/mysqli/mysqli/sqlstate.xml
index addc747461..10f99d13ab 100644
--- a/reference/mysqli/functions/mysqli-sqlstate.xml
+++ b/reference/mysqli/mysqli/sqlstate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-sqlstate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>mysqli_sqlstate</refname>
diff --git a/reference/mysqli/functions/mysqli-ssl-set.xml b/reference/mysqli/mysqli/ssl-set.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-ssl-set.xml
rename to reference/mysqli/mysqli/ssl-set.xml
index bd3f9cd273..012759856d 100644
--- a/reference/mysqli/functions/mysqli-ssl-set.xml
+++ b/reference/mysqli/mysqli/ssl-set.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-ssl-set" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_ssl_set</refname>
diff --git a/reference/mysqli/functions/mysqli-stat.xml b/reference/mysqli/mysqli/stat.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-stat.xml
rename to reference/mysqli/mysqli/stat.xml
index 7ffb7a87aa..71d2c29e5c 100644
--- a/reference/mysqli/functions/mysqli-stat.xml
+++ b/reference/mysqli/mysqli/stat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-stat" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_stat</refname>
diff --git a/reference/mysqli/functions/mysqli-stmt-init.xml b/reference/mysqli/mysqli/stmt-init.xml
similarity index 98%
rename from reference/mysqli/functions/mysqli-stmt-init.xml
rename to reference/mysqli/mysqli/stmt-init.xml
index be495b731d..c71419e663 100644
--- a/reference/mysqli/functions/mysqli-stmt-init.xml
+++ b/reference/mysqli/mysqli/stmt-init.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-stmt-init" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_stmt_init</refname>
diff --git a/reference/mysqli/functions/mysqli-store-result.xml b/reference/mysqli/mysqli/store-result.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-store-result.xml
rename to reference/mysqli/mysqli/store-result.xml
index b2bcac4652..2bcb4df570 100644
--- a/reference/mysqli/functions/mysqli-store-result.xml
+++ b/reference/mysqli/mysqli/store-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-store-result" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_store_result</refname>
diff --git a/reference/mysqli/functions/mysqli-thread-id.xml b/reference/mysqli/mysqli/thread-id.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-thread-id.xml
rename to reference/mysqli/mysqli/thread-id.xml
index 7f041a3738..160ff88c96 100644
--- a/reference/mysqli/functions/mysqli-thread-id.xml
+++ b/reference/mysqli/mysqli/thread-id.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-thread-id" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_thread_id</refname>
diff --git a/reference/mysqli/functions/mysqli-thread-safe.xml b/reference/mysqli/mysqli/thread-safe.xml
similarity index 97%
rename from reference/mysqli/functions/mysqli-thread-safe.xml
rename to reference/mysqli/mysqli/thread-safe.xml
index 11f956cf42..32d8ea8a78 100644
--- a/reference/mysqli/functions/mysqli-thread-safe.xml
+++ b/reference/mysqli/mysqli/thread-safe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-thread-safe" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_thread_safe</refname>
diff --git a/reference/mysqli/functions/mysqli-use-result.xml b/reference/mysqli/mysqli/use-result.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-use-result.xml
rename to reference/mysqli/mysqli/use-result.xml
index 6c387f605d..1dbb48e577 100644
--- a/reference/mysqli/functions/mysqli-use-result.xml
+++ b/reference/mysqli/mysqli/use-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-use-result" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_use_result</refname>
diff --git a/reference/mysqli/functions/mysqli-warning-count.xml b/reference/mysqli/mysqli/warning-count.xml
similarity index 99%
rename from reference/mysqli/functions/mysqli-warning-count.xml
rename to reference/mysqli/mysqli/warning-count.xml
index d15cb907c4..a150106901 100644
--- a/reference/mysqli/functions/mysqli-warning-count.xml
+++ b/reference/mysqli/mysqli/warning-count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.1 $ -->
 <refentry xml:id="function.mysqli-warning-count" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_warning_count</refname>