From 412956f977ef0230764fed65bb57933c5a499f51 Mon Sep 17 00:00:00 2001
From: Yannick Torres <yannick@php.net>
Date: Sun, 31 Oct 2004 16:05:14 +0000
Subject: [PATCH] add more entities #sorry for this big commit...

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@171734 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../mysqli/functions/mysqli-affected-rows.xml | 14 ++++++-------
 .../mysqli/functions/mysqli-autocommit.xml    | 16 +++++++--------
 .../mysqli/functions/mysqli-bind-param.xml    |  6 +++---
 .../mysqli/functions/mysqli-bind-result.xml   |  6 +++---
 .../mysqli/functions/mysqli-change-user.xml   | 16 +++++++--------
 .../functions/mysqli-character-set-name.xml   | 14 ++++++-------
 .../functions/mysqli-client-encoding.xml      |  6 +++---
 reference/mysqli/functions/mysqli-close.xml   |  8 ++++----
 reference/mysqli/functions/mysqli-commit.xml  | 10 +++++-----
 .../mysqli/functions/mysqli-connect-errno.xml | 12 +++++------
 .../mysqli/functions/mysqli-connect-error.xml | 12 +++++------
 reference/mysqli/functions/mysqli-connect.xml | 10 ++++------
 .../mysqli/functions/mysqli-data-seek.xml     | 10 ++++------
 reference/mysqli/functions/mysqli-debug.xml   | 12 +++++------
 .../functions/mysqli-dump-debug-info.xml      |  6 +++---
 reference/mysqli/functions/mysqli-errno.xml   | 16 +++++++--------
 reference/mysqli/functions/mysqli-error.xml   | 16 +++++++--------
 reference/mysqli/functions/mysqli-execute.xml |  6 +++---
 .../mysqli/functions/mysqli-fetch-array.xml   | 10 ++++------
 .../mysqli/functions/mysqli-fetch-assoc.xml   | 10 ++++------
 .../functions/mysqli-fetch-field-direct.xml   | 18 ++++++++---------
 .../mysqli/functions/mysqli-fetch-field.xml   | 20 +++++++++----------
 .../mysqli/functions/mysqli-fetch-fields.xml  | 18 ++++++++---------
 .../mysqli/functions/mysqli-fetch-lengths.xml | 10 ++++------
 .../mysqli/functions/mysqli-fetch-object.xml  | 10 ++++------
 .../mysqli/functions/mysqli-fetch-row.xml     | 10 ++++------
 reference/mysqli/functions/mysqli-fetch.xml   |  6 +++---
 .../mysqli/functions/mysqli-field-count.xml   |  6 +++---
 .../mysqli/functions/mysqli-field-seek.xml    | 14 ++++++-------
 .../mysqli/functions/mysqli-field-tell.xml    | 12 +++++------
 .../mysqli/functions/mysqli-free-result.xml   |  4 ++--
 .../functions/mysqli-get-client-info.xml      | 10 +++++-----
 .../functions/mysqli-get-client-version.xml   | 12 +++++------
 .../mysqli/functions/mysqli-get-host-info.xml | 12 +++++------
 .../mysqli/functions/mysqli-get-metadata.xml  |  6 +++---
 .../functions/mysqli-get-proto-info.xml       | 12 +++++------
 .../functions/mysqli-get-server-info.xml      | 14 ++++++-------
 .../functions/mysqli-get-server-version.xml   | 14 ++++++-------
 reference/mysqli/functions/mysqli-info.xml    | 12 +++++------
 reference/mysqli/functions/mysqli-init.xml    |  6 +++---
 .../mysqli/functions/mysqli-insert-id.xml     |  8 +++-----
 reference/mysqli/functions/mysqli-kill.xml    | 10 ++++------
 .../mysqli/functions/mysqli-more-results.xml  | 12 +++++------
 .../mysqli/functions/mysqli-multi-query.xml   | 16 +++++++--------
 .../mysqli/functions/mysqli-next-result.xml   | 12 +++++------
 .../mysqli/functions/mysqli-num-fields.xml    | 10 ++++------
 .../mysqli/functions/mysqli-num-rows.xml      | 16 +++++++--------
 reference/mysqli/functions/mysqli-options.xml |  8 ++++----
 .../mysqli/functions/mysqli-param-count.xml   |  6 +++---
 reference/mysqli/functions/mysqli-ping.xml    | 10 ++++------
 reference/mysqli/functions/mysqli-prepare.xml | 12 +++++------
 reference/mysqli/functions/mysqli-query.xml   | 16 +++++++--------
 .../mysqli/functions/mysqli-real-connect.xml  | 10 ++++------
 .../functions/mysqli-real-escape-string.xml   | 12 +++++------
 .../mysqli/functions/mysqli-real-query.xml    | 12 +++++------
 reference/mysqli/functions/mysqli-report.xml  | 12 +++++------
 .../mysqli/functions/mysqli-rollback.xml      | 16 +++++++--------
 .../mysqli/functions/mysqli-select-db.xml     | 16 +++++++--------
 .../functions/mysqli-send-long-data.xml       |  6 +++---
 .../mysqli/functions/mysqli-sqlstate.xml      | 16 +++++++--------
 reference/mysqli/functions/mysqli-ssl-set.xml | 10 +++++-----
 reference/mysqli/functions/mysqli-stat.xml    | 14 ++++++-------
 .../functions/mysqli-stmt-affected-rows.xml   | 16 +++++++--------
 .../functions/mysqli-stmt-bind-param.xml      | 16 +++++++--------
 .../functions/mysqli-stmt-bind-result.xml     | 16 +++++++--------
 .../mysqli/functions/mysqli-stmt-close.xml    |  8 ++++----
 .../functions/mysqli-stmt-data-seek.xml       | 14 ++++++-------
 .../mysqli/functions/mysqli-stmt-errno.xml    | 16 +++++++--------
 .../mysqli/functions/mysqli-stmt-error.xml    | 16 +++++++--------
 .../mysqli/functions/mysqli-stmt-execute.xml  | 18 ++++++++---------
 .../mysqli/functions/mysqli-stmt-fetch.xml    | 18 ++++++++---------
 .../functions/mysqli-stmt-free-result.xml     |  4 ++--
 .../mysqli/functions/mysqli-stmt-init.xml     |  4 ++--
 .../mysqli/functions/mysqli-stmt-num-rows.xml | 16 +++++++--------
 .../functions/mysqli-stmt-param-count.xml     | 10 ++++------
 .../mysqli/functions/mysqli-stmt-prepare.xml  | 12 +++++------
 .../mysqli/functions/mysqli-stmt-reset.xml    |  8 ++++----
 .../functions/mysqli-stmt-result-metadata.xml | 10 +++++-----
 .../functions/mysqli-stmt-send-long-data.xml  |  6 +++---
 .../mysqli/functions/mysqli-stmt-sqlstate.xml | 16 +++++++--------
 .../functions/mysqli-stmt-store-result.xml    | 16 +++++++--------
 .../mysqli/functions/mysqli-store-result.xml  | 10 +++++-----
 .../mysqli/functions/mysqli-thread-id.xml     | 14 ++++++-------
 .../mysqli/functions/mysqli-thread-safe.xml   |  4 ++--
 .../mysqli/functions/mysqli-use-result.xml    | 14 ++++++-------
 .../mysqli/functions/mysqli-warning-count.xml | 16 +++++++--------
 86 files changed, 448 insertions(+), 552 deletions(-)

diff --git a/reference/mysqli/functions/mysqli-affected-rows.xml b/reference/mysqli/functions/mysqli-affected-rows.xml
index fa09aaafbe..28a559e033 100644
--- a/reference/mysqli/functions/mysqli-affected-rows.xml
+++ b/reference/mysqli/functions/mysqli-affected-rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
   <refentry id="function.mysqli-affected-rows">
  <refnamediv>
   <refname>mysqli_affected_rows</refname>
@@ -36,7 +36,7 @@
   </para>
  </refsect1>
  <refsect1>
-  <title>Return Values</title>
+  &reftitle.returnvalues;
   <para>
    An integer greater than zero indicates the number of rows affected or retrieved. 
    Zero indicates that no records where updated for an UPDATE statement, no rows matched 
@@ -51,14 +51,14 @@
   </note>
  </refsect1>
  <refsect1>
-  <title>See also</title>
+  &reftitle.seealso;
   <para>
-   <function>mysqli_num_rows</function>,
+   <function>mysqli_num_rows</function>&listendand;
    <function>mysqli_info</function>.
   </para>
  </refsect1>
  <refsect1>
-  <title>Example</title>
+  &reftitle.examples;
   <example>
    <title>Object oriented style</title>
    <programlisting role="php">
@@ -142,9 +142,7 @@ mysqli_close($link);
 ]]>
    </programlisting>
   </example> 
-  <para>
-    The above examples would produce the following output:
-  </para>
+  &example.outputs;
   <screen>
 <![CDATA[
 Affected rows (INSERT): 984
diff --git a/reference/mysqli/functions/mysqli-autocommit.xml b/reference/mysqli/functions/mysqli-autocommit.xml
index a4b193713d..f0d985e23d 100644
--- a/reference/mysqli/functions/mysqli-autocommit.xml
+++ b/reference/mysqli/functions/mysqli-autocommit.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
   <refentry id="function.mysqli-autocommit">
    <refnamediv>
     <refname>mysqli_autocommit</refname>
-    <refname> mysqli->auto_commit</refname>
+    <refname>mysqli->auto_commit</refname>
     <refpurpose>Turns on or off auto-commiting database modifications</refpurpose>
    </refnamediv>
    <refsect1>
@@ -40,20 +40,20 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_commit</function>,
+     <function>mysqli_commit</function>&listendand;
      <function>mysqli_rollback</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -108,9 +108,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example> 
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Autocommit is 1
diff --git a/reference/mysqli/functions/mysqli-bind-param.xml b/reference/mysqli/functions/mysqli-bind-param.xml
index 5c19e5d888..cf48712003 100644
--- a/reference/mysqli/functions/mysqli-bind-param.xml
+++ b/reference/mysqli/functions/mysqli-bind-param.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
   <refentry id="function.mysqli-bind-param">
    <refnamediv>
     <refname>mysqli_bind_param</refname>
@@ -19,9 +19,9 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_bind_param</function>
+     <function>mysqli_stmt_bind_param</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-bind-result.xml b/reference/mysqli/functions/mysqli-bind-result.xml
index dff413df31..29223cce68 100644
--- a/reference/mysqli/functions/mysqli-bind-result.xml
+++ b/reference/mysqli/functions/mysqli-bind-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <refentry id="function.mysqli-bind-result">
    <refnamediv>
     <refname>mysqli_bind_result</refname>
@@ -19,9 +19,9 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_bind_result</function>
+     <function>mysqli_stmt_bind_result</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-change-user.xml b/reference/mysqli/functions/mysqli-change-user.xml
index 9bbaabd1eb..463c639392 100644
--- a/reference/mysqli/functions/mysqli-change-user.xml
+++ b/reference/mysqli/functions/mysqli-change-user.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
   <refentry id="function.mysqli-change-user">
    <refnamediv>
     <refname>mysqli_change_user</refname>
@@ -53,20 +53,20 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return Values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-    <title>See also:</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_connect</function>
-     <function>mysqli_select_db</function>
+     <function>mysqli_connect</function>&listendand;
+     <function>mysqli_select_db</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
      <example>
       <title>Object oriented style</title>
       <programlisting role="php">
@@ -148,9 +148,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Default database: world
diff --git a/reference/mysqli/functions/mysqli-character-set-name.xml b/reference/mysqli/functions/mysqli-character-set-name.xml
index 763c6f33da..d5b5544643 100644
--- a/reference/mysqli/functions/mysqli-character-set-name.xml
+++ b/reference/mysqli/functions/mysqli-character-set-name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
   <refentry id="function.mysqli-character-set-name">
    <refnamediv>
     <refname>mysqli_character_set_name</refname>
@@ -28,18 +28,18 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>The default character set for the current connection</para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_client_encoding</function>.
+     <function>mysqli_client_encoding</function>&listendand;
      <function>mysqli_real_escape_string</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -87,9 +87,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would be produce the following output: 
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Current character set is latin1_swedish_ci
diff --git a/reference/mysqli/functions/mysqli-client-encoding.xml b/reference/mysqli/functions/mysqli-client-encoding.xml
index 2143cebfb5..3cdbd6e83a 100644
--- a/reference/mysqli/functions/mysqli-client-encoding.xml
+++ b/reference/mysqli/functions/mysqli-client-encoding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-client-encoding">
    <refnamediv>
     <refname>mysqli_client_encoding</refname>
@@ -14,9 +14,9 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_client_encoding</function>.
+     <function>mysqli_client_encoding</function>&listendand;
      <function>mysqli_real_escape_string</function>.
     </para>
    </refsect1>
diff --git a/reference/mysqli/functions/mysqli-close.xml b/reference/mysqli/functions/mysqli-close.xml
index 12e108e4af..39be9d6973 100644
--- a/reference/mysqli/functions/mysqli-close.xml
+++ b/reference/mysqli/functions/mysqli-close.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
   <refentry id="function.mysqli-close">
    <refnamediv>
     <refname>mysqli_close</refname>
@@ -28,16 +28,16 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_connect</function>, 
-     <function>mysqli_init</function>, 
+     <function>mysqli_init</function>&listendand;
      <function>mysqli_real_connect</function>.
     </para>
    </refsect1>
diff --git a/reference/mysqli/functions/mysqli-commit.xml b/reference/mysqli/functions/mysqli-commit.xml
index c5ad6d553b..e5560a79bc 100644
--- a/reference/mysqli/functions/mysqli-commit.xml
+++ b/reference/mysqli/functions/mysqli-commit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
   <refentry id="function.mysqli-commit">
    <refnamediv>
     <refname>mysqli_commit</refname>
@@ -28,20 +28,20 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_autocommit</function>,
+     <function>mysqli_autocommit</function>&listendand;
      <function>mysqli_rollback</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Examples</title>
+    &reftitle.examples;
     <para>
      <example>
       <title>Object oriented style</title>
diff --git a/reference/mysqli/functions/mysqli-connect-errno.xml b/reference/mysqli/functions/mysqli-connect-errno.xml
index 5ee57635fb..1e55339cab 100644
--- a/reference/mysqli/functions/mysqli-connect-errno.xml
+++ b/reference/mysqli/functions/mysqli-connect-errno.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-connect-errno">
    <refnamediv>
     <refname>mysqli_connect_errno</refname>
@@ -26,24 +26,24 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      An error code value for the last call to <function>mysqli_connect</function>, if it failed. 
      zero means no error occurred.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_connect</function>,
      <function>mysqli_connect_error</function>,
      <function>mysqli_errno</function>,
-     <function>mysqli_error</function>,
-     <function>mysqli_sqlstate</function>
+     <function>mysqli_error</function>&listendand;
+     <function>mysqli_sqlstate</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>
      <example>
       <title>mysqli_connect_errno sample</title>
diff --git a/reference/mysqli/functions/mysqli-connect-error.xml b/reference/mysqli/functions/mysqli-connect-error.xml
index 7a227b0e01..18aca1d964 100644
--- a/reference/mysqli/functions/mysqli-connect-error.xml
+++ b/reference/mysqli/functions/mysqli-connect-error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-connect-error">
    <refnamediv>
     <refname>mysqli_connect_error</refname>
@@ -21,23 +21,23 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
       A string that describes the error. An empty string if no error occurred. 
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_connect</function>,
      <function>mysqli_connect_errno</function>,
      <function>mysqli_errno</function>,
-     <function>mysqli_error</function>,
-     <function>mysqli_sqlstate</function>
+     <function>mysqli_error</function>&listendand;
+     <function>mysqli_sqlstate</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>
      <example>
       <title>mysqli_connect_error sample</title>
diff --git a/reference/mysqli/functions/mysqli-connect.xml b/reference/mysqli/functions/mysqli-connect.xml
index ef6cecb586..cbfd27d7ce 100644
--- a/reference/mysqli/functions/mysqli-connect.xml
+++ b/reference/mysqli/functions/mysqli-connect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
   <refentry id="function.mysqli-connect">
    <refnamediv>
     <refname>mysqli_connect</refname>
@@ -65,14 +65,14 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      Returns a object which represents the connection to a MySQL Server or
      &false; if the connection failed.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -115,9 +115,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Host information: Localhost via UNIX socket
diff --git a/reference/mysqli/functions/mysqli-data-seek.xml b/reference/mysqli/functions/mysqli-data-seek.xml
index 3d73d11549..6372e48bde 100644
--- a/reference/mysqli/functions/mysqli-data-seek.xml
+++ b/reference/mysqli/functions/mysqli-data-seek.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
   <refentry id="function.mysqli-data-seek">
    <refnamediv>
     <refname>mysqli_data_seek</refname>
@@ -50,12 +50,12 @@
      <function>mysqli_fetch_array</function>,
      <function>mysqli_fetch_assoc</function>,
      <function>mysqli_fetch_object</function>,
-     <function>mysqli_query</function>,
+     <function>mysqli_query</function>&listendand;
      <function>mysqli_num_rows</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -127,9 +127,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 City: Benin City  Countrycode: NGA
diff --git a/reference/mysqli/functions/mysqli-debug.xml b/reference/mysqli/functions/mysqli-debug.xml
index 2e8e857174..8033328877 100644
--- a/reference/mysqli/functions/mysqli-debug.xml
+++ b/reference/mysqli/functions/mysqli-debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
   <refentry id="function.mysqli-debug">
    <refnamediv>
     <refname>mysqli_debug</refname>
@@ -24,18 +24,18 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para><function>mysqli_debug</function> doesn't return any value.</para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_dump_debug_info</function>,
-     <function>mysqli_report</function>
+     <function>mysqli_dump_debug_info</function>&listendand;
+     <function>mysqli_report</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>
      <example>
       <title>Generating a Trace File</title>
diff --git a/reference/mysqli/functions/mysqli-dump-debug-info.xml b/reference/mysqli/functions/mysqli-dump-debug-info.xml
index cb09e669a7..f275537342 100644
--- a/reference/mysqli/functions/mysqli-dump-debug-info.xml
+++ b/reference/mysqli/functions/mysqli-dump-debug-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
   <refentry id="function.mysqli-dump-debug-info">
    <refnamediv>
     <refname>mysqli_dump_debug_info</refname>
@@ -19,13 +19,13 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_debug</function>.
     </para>
diff --git a/reference/mysqli/functions/mysqli-errno.xml b/reference/mysqli/functions/mysqli-errno.xml
index 4ccdd4cf25..ed72a803f2 100644
--- a/reference/mysqli/functions/mysqli-errno.xml
+++ b/reference/mysqli/functions/mysqli-errno.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
   <refentry id="function.mysqli-errno">
    <refnamediv>
     <refname>mysqli_errno</refname>
@@ -34,22 +34,22 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      An error code value for the last call, if it failed. zero means no error occurred.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_connect_errno</function>,
      <function>mysqli_connect_error</function>,
-     <function>mysqli_error</function>,
-     <function>mysqli_sqlstate</function>
+     <function>mysqli_error</function>&listendand;
+     <function>mysqli_sqlstate</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -96,9 +96,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Errorcode: 1193
diff --git a/reference/mysqli/functions/mysqli-error.xml b/reference/mysqli/functions/mysqli-error.xml
index 037c57fec1..02e11ff492 100644
--- a/reference/mysqli/functions/mysqli-error.xml
+++ b/reference/mysqli/functions/mysqli-error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
   <refentry id="function.mysqli-error">
    <refnamediv>
     <refname>mysqli_error</refname>
@@ -27,22 +27,22 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
       A string that describes the error. An empty string if no error occurred. 
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_connect_errno</function>,
      <function>mysqli_connect_error</function>,
-     <function>mysqli_errno</function>,
-     <function>mysqli_sqlstate</function>
+     <function>mysqli_errno</function>&listendand;
+     <function>mysqli_sqlstate</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -89,9 +89,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Errormessage: Unknown system variable 'a'
diff --git a/reference/mysqli/functions/mysqli-execute.xml b/reference/mysqli/functions/mysqli-execute.xml
index 20ceff5c90..6816927332 100644
--- a/reference/mysqli/functions/mysqli-execute.xml
+++ b/reference/mysqli/functions/mysqli-execute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
   <refentry id="function.mysqli-execute">
    <refnamediv>
     <refname>mysqli_execute</refname>
@@ -19,9 +19,9 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_execute</function>
+     <function>mysqli_stmt_execute</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-fetch-array.xml b/reference/mysqli/functions/mysqli-fetch-array.xml
index 2d7fa78aa6..90815e5b02 100644
--- a/reference/mysqli/functions/mysqli-fetch-array.xml
+++ b/reference/mysqli/functions/mysqli-fetch-array.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.19 $ -->
   <refentry id="function.mysqli-fetch-array">
    <refnamediv>
     <refname>mysqli_fetch_array</refname>
@@ -65,12 +65,12 @@
      <function>mysqli_fetch_assoc</function>,
      <function>mysqli_fetch_row</function>,
      <function>mysqli_fetch_object</function>,
-     <function>mysqli_query</function>,
+     <function>mysqli_query</function>&listendand;
      <function>mysqli_data_seek</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -145,9 +145,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Kabul (AFG)
diff --git a/reference/mysqli/functions/mysqli-fetch-assoc.xml b/reference/mysqli/functions/mysqli-fetch-assoc.xml
index 0b3c2a05da..118c0cf490 100644
--- a/reference/mysqli/functions/mysqli-fetch-assoc.xml
+++ b/reference/mysqli/functions/mysqli-fetch-assoc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
   <refentry id="function.mysqli-fetch-assoc">
    <refnamediv>
     <refname>mysqli_fetch_assoc</refname>
@@ -54,12 +54,12 @@
      <function>mysqli_fetch_array</function>,
      <function>mysqli_fetch_row</function>,
      <function>mysqli_fetch_object</function>,
-     <function>mysqli_query</function>,
+     <function>mysqli_query</function>&listendand;
      <function>mysqli_data_seek</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -124,9 +124,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Pueblo (USA)
diff --git a/reference/mysqli/functions/mysqli-fetch-field-direct.xml b/reference/mysqli/functions/mysqli-fetch-field-direct.xml
index 81fcdf25de..f491c4200d 100644
--- a/reference/mysqli/functions/mysqli-fetch-field-direct.xml
+++ b/reference/mysqli/functions/mysqli-fetch-field-direct.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
   <refentry id="function.mysqli-fetch-field-direct">
    <refnamediv>
     <refname>mysqli_fetch_field_direct</refname>
@@ -32,7 +32,7 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      Returns an object which contains field definition informations or &false; if no field information
      for specified <literal>fieldnr</literal> is available.
@@ -90,15 +90,15 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_num_fields</function>
-     <function>mysqli_fetch_field</function>
-     <function>mysqli_fetch_fields</function>
+     <function>mysqli_num_fields</function>,
+     <function>mysqli_fetch_field</function>&listendand;
+     <function>mysqli_fetch_fields</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -169,9 +169,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Name:     SurfaceArea
diff --git a/reference/mysqli/functions/mysqli-fetch-field.xml b/reference/mysqli/functions/mysqli-fetch-field.xml
index e72c464ab7..2efb8aa4c6 100644
--- a/reference/mysqli/functions/mysqli-fetch-field.xml
+++ b/reference/mysqli/functions/mysqli-fetch-field.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
   <refentry id="function.mysqli-fetch-field">
    <refnamediv>
     <refname>mysqli_fetch_field</refname>
@@ -30,7 +30,7 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      Returns an object which contains field definition informations or &false; if no field information
      is available.
@@ -88,16 +88,16 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_num_fields</function>
-     <function>mysqli_fetch_field_direct</function>
-     <function>mysqli_fetch_fields</function>
-     <function>mysqli_field_seek</function>
+     <function>mysqli_num_fields</function>,
+     <function>mysqli_fetch_field_direct</function>,
+     <function>mysqli_fetch_fields</function>&listendand;
+     <function>mysqli_field_seek</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -168,9 +168,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Name:     Name
diff --git a/reference/mysqli/functions/mysqli-fetch-fields.xml b/reference/mysqli/functions/mysqli-fetch-fields.xml
index d5d43d7f67..1905c88a95 100644
--- a/reference/mysqli/functions/mysqli-fetch-fields.xml
+++ b/reference/mysqli/functions/mysqli-fetch-fields.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
   <refentry id="function.mysqli-fetch-fields">
    <refnamediv>
     <refname>mysqli_fetch_fields</refname>
@@ -29,7 +29,7 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      Returns an array of objects which contains field definition informations or &false; if no field information
      is available.
@@ -87,15 +87,15 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_num_fields</function>
-     <function>mysqli_fetch_field</function>
-     <function>mysqli_fetch_field_direct</function>
+     <function>mysqli_num_fields</function>,
+     <function>mysqli_fetch_field</function>&listendand;
+     <function>mysqli_fetch_field_direct</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -168,9 +168,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Name:     Name
diff --git a/reference/mysqli/functions/mysqli-fetch-lengths.xml b/reference/mysqli/functions/mysqli-fetch-lengths.xml
index 38c6fc2a43..d5c269e5a0 100644
--- a/reference/mysqli/functions/mysqli-fetch-lengths.xml
+++ b/reference/mysqli/functions/mysqli-fetch-lengths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
   <refentry id="function.mysqli-fetch-lengths">
    <refnamediv>
     <refname>mysqli_fetch_lengths</refname>
@@ -26,7 +26,7 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      An array of integers representing the size of each column (not including
      any terminating null characters). &false; if an error occurred. 
@@ -38,7 +38,7 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -104,9 +104,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Field  1 has Length  3
diff --git a/reference/mysqli/functions/mysqli-fetch-object.xml b/reference/mysqli/functions/mysqli-fetch-object.xml
index 22fe9e8e65..98e39346cd 100644
--- a/reference/mysqli/functions/mysqli-fetch-object.xml
+++ b/reference/mysqli/functions/mysqli-fetch-object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
   <refentry id="function.mysqli-fetch-object">
    <refnamediv>
     <refname>mysqli_fetch_object</refname>
@@ -42,12 +42,12 @@
      <function>mysqli_fetch_array</function>,
      <function>mysqli_fetch_assoc</function>,
      <function>mysqli_fetch_row</function>,
-     <function>mysqli_query</function>,
+     <function>mysqli_query</function>&listendand;
      <function>mysqli_data_seek</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -112,9 +112,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Pueblo (USA)
diff --git a/reference/mysqli/functions/mysqli-fetch-row.xml b/reference/mysqli/functions/mysqli-fetch-row.xml
index 09536e6301..b077db00eb 100644
--- a/reference/mysqli/functions/mysqli-fetch-row.xml
+++ b/reference/mysqli/functions/mysqli-fetch-row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
   <refentry id="function.mysqli-fetch-row">
    <refnamediv>
     <refname>mysqli_fetch_row</refname>
@@ -47,12 +47,12 @@
      <function>mysqli_fetch_array</function>,
      <function>mysqli_fetch_assoc</function>,
      <function>mysqli_fetch_object</function>,
-     <function>mysqli_query</function>,
+     <function>mysqli_query</function>&listendand;
      <function>mysqli_data_seek</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -117,9 +117,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Pueblo (USA)
diff --git a/reference/mysqli/functions/mysqli-fetch.xml b/reference/mysqli/functions/mysqli-fetch.xml
index 9218f54ba8..09577a6915 100644
--- a/reference/mysqli/functions/mysqli-fetch.xml
+++ b/reference/mysqli/functions/mysqli-fetch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
   <refentry id="function.mysqli-fetch">
    <refnamediv>
     <refname>mysqli_fetch</refname>
@@ -19,9 +19,9 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_fetch</function>
+     <function>mysqli_stmt_fetch</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-field-count.xml b/reference/mysqli/functions/mysqli-field-count.xml
index 48da53b9a0..6e97f64940 100644
--- a/reference/mysqli/functions/mysqli-field-count.xml
+++ b/reference/mysqli/functions/mysqli-field-count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
   <refentry id="function.mysqli-field-count">
    <refnamediv>
     <refname>mysqli_field_count</refname>
@@ -31,11 +31,11 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>An integer representing the number of fields in a result set</para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>
      <example>
       <title>Object oriented style</title>
diff --git a/reference/mysqli/functions/mysqli-field-seek.xml b/reference/mysqli/functions/mysqli-field-seek.xml
index 3add993c27..6b1d778705 100644
--- a/reference/mysqli/functions/mysqli-field-seek.xml
+++ b/reference/mysqli/functions/mysqli-field-seek.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-field-seek">
    <refnamediv>
     <refname>mysqli_field_seek</refname>
@@ -34,19 +34,19 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      <function>mysqli_field_seek</function> returns previuos value of field cursor.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_fetch_field</function>
+     <function>mysqli_fetch_field</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -119,9 +119,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Name:     SurfaceArea
diff --git a/reference/mysqli/functions/mysqli-field-tell.xml b/reference/mysqli/functions/mysqli-field-tell.xml
index 225c8a811e..4eee344831 100644
--- a/reference/mysqli/functions/mysqli-field-tell.xml
+++ b/reference/mysqli/functions/mysqli-field-tell.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-field-tell">
    <refnamediv>
     <refname>mysqli_field_tell</refname>
@@ -38,12 +38,12 @@
    <refsect1>
     &reftitle.seealso;
     <para>
-     <function>mysqli_fetch_field</function>,
-     <function>mysqli_field_seek</function>
+     <function>mysqli_fetch_field</function>&listendand;
+     <function>mysqli_field_seek</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -122,9 +122,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Column 1:
diff --git a/reference/mysqli/functions/mysqli-free-result.xml b/reference/mysqli/functions/mysqli-free-result.xml
index e81fdfc8d9..a257a8aee0 100644
--- a/reference/mysqli/functions/mysqli-free-result.xml
+++ b/reference/mysqli/functions/mysqli-free-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-free-result">
    <refnamediv>
     <refname>mysqli_free_result</refname>
@@ -47,7 +47,7 @@
     <para>
      <function>mysqli_query</function>, 
      <function>mysqli_stmt_store_result</function>,
-     <function>mysqli_store_result</function>,
+     <function>mysqli_store_result</function>&listendand;
      <function>mysqli_use_result</function>.
     </para>
    </refsect1>
diff --git a/reference/mysqli/functions/mysqli-get-client-info.xml b/reference/mysqli/functions/mysqli-get-client-info.xml
index eb5ae496ad..a958801273 100644
--- a/reference/mysqli/functions/mysqli-get-client-info.xml
+++ b/reference/mysqli/functions/mysqli-get-client-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-get-client-info">
    <refnamediv>
     <refname>mysqli_get_client_info</refname>
@@ -24,15 +24,15 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_get_client_version</function>,
-     <function>mysqli_get_server_info</function>,
-     <function>mysqli_get_server_version</function>
+     <function>mysqli_get_server_info</function>&listendand;
+     <function>mysqli_get_server_version</function>.
     </para> 
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>
      <example>
       <title>mysqli_get_client_info</title>
diff --git a/reference/mysqli/functions/mysqli-get-client-version.xml b/reference/mysqli/functions/mysqli-get-client-version.xml
index 47929e367c..10e86f69bb 100644
--- a/reference/mysqli/functions/mysqli-get-client-version.xml
+++ b/reference/mysqli/functions/mysqli-get-client-version.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-get-client-version">
    <refnamediv>
     <refname>mysqli_get_client_version</refname>
@@ -16,7 +16,7 @@
      </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      A number that represents the MySQL client library version in format:
      <literal>main_version*10000 + minor_version *100 + sub_version</literal>.
@@ -28,15 +28,15 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_get_client_info</function>,
-     <function>mysqli_get_server_info</function>,
-     <function>mysqli_get_server_version</function>
+     <function>mysqli_get_server_info</function>&listendand;
+     <function>mysqli_get_server_version</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>
      <example>
       <title>mysqli_get_client_version</title>
diff --git a/reference/mysqli/functions/mysqli-get-host-info.xml b/reference/mysqli/functions/mysqli-get-host-info.xml
index c98fba8043..367b16c934 100644
--- a/reference/mysqli/functions/mysqli-get-host-info.xml
+++ b/reference/mysqli/functions/mysqli-get-host-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-get-host-info">
    <refnamediv>
     <refname>mysqli_get_host_info</refname>
@@ -31,13 +31,13 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title> 
+    &reftitle.seealso;
     <para>
-     <function>mysqli_get_proto_info</function>
+     <function>mysqli_get_proto_info</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -82,9 +82,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Host info: Localhost via UNIX socket
diff --git a/reference/mysqli/functions/mysqli-get-metadata.xml b/reference/mysqli/functions/mysqli-get-metadata.xml
index 92bcbc5b72..59c8ee8d94 100644
--- a/reference/mysqli/functions/mysqli-get-metadata.xml
+++ b/reference/mysqli/functions/mysqli-get-metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-get-metadata">
    <refnamediv>
     <refname>mysqli_get_metadata</refname>
@@ -19,9 +19,9 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_result_metadata</function>
+     <function>mysqli_stmt_result_metadata</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-get-proto-info.xml b/reference/mysqli/functions/mysqli-get-proto-info.xml
index 01149a39a0..47f5ea8279 100644
--- a/reference/mysqli/functions/mysqli-get-proto-info.xml
+++ b/reference/mysqli/functions/mysqli-get-proto-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <refentry id="function.mysqli-get-proto-info">
    <refnamediv>
     <refname>mysqli_get_proto_info</refname>
@@ -30,13 +30,13 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_get_host_info</function>
+     <function>mysqli_get_host_info</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -81,9 +81,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Protocol version: 10
diff --git a/reference/mysqli/functions/mysqli-get-server-info.xml b/reference/mysqli/functions/mysqli-get-server-info.xml
index 816f424eaf..d7a7f62ce2 100644
--- a/reference/mysqli/functions/mysqli-get-server-info.xml
+++ b/reference/mysqli/functions/mysqli-get-server-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-get-server-info">
    <refnamediv>
     <refname>mysqli_get_server_info</refname>
@@ -31,15 +31,15 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_get_client_info</function>,
-     <function>mysqli_get_client_version</function>,
-     <function>mysqli_get_server_version</function>
+     <function>mysqli_get_client_version</function>&listendand;
+     <function>mysqli_get_server_version</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -84,9 +84,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Server version: 4.1.2-alpha-debug
diff --git a/reference/mysqli/functions/mysqli-get-server-version.xml b/reference/mysqli/functions/mysqli-get-server-version.xml
index f178cf2504..8bc4741eb1 100644
--- a/reference/mysqli/functions/mysqli-get-server-version.xml
+++ b/reference/mysqli/functions/mysqli-get-server-version.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-get-server-version">
    <refnamediv>
     <refname>mysqli_get_server_version</refname>
@@ -35,15 +35,15 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_get_client_info</function>,
-     <function>mysqli_get_client_version</function>,
-     <function>mysqli_get_server_info</function>
+     <function>mysqli_get_client_version</function>&listendand;
+     <function>mysqli_get_server_info</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -88,9 +88,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Server version: 40102
diff --git a/reference/mysqli/functions/mysqli-info.xml b/reference/mysqli/functions/mysqli-info.xml
index 716c0a9e94..c2257f593e 100644
--- a/reference/mysqli/functions/mysqli-info.xml
+++ b/reference/mysqli/functions/mysqli-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-info">
    <refnamediv>
     <refname>mysqli_info</refname>
@@ -75,12 +75,12 @@
     &reftitle.seealso;
     <para>
      <function>mysqli_affected_rows</function>,
-     <function>mysqli_warning_count</function>,
-     <function>mysqli_num_rows</function>
+     <function>mysqli_warning_count</function>&listendand;
+     <function>mysqli_num_rows</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -131,9 +131,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Records: 150  Duplicates: 0  Warnings: 0
diff --git a/reference/mysqli/functions/mysqli-init.xml b/reference/mysqli/functions/mysqli-init.xml
index a7f5b882ff..5929694f7b 100644
--- a/reference/mysqli/functions/mysqli-init.xml
+++ b/reference/mysqli/functions/mysqli-init.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.mysqli-init">
    <refnamediv>
     <refname>mysqli_init</refname>
@@ -35,8 +35,8 @@
     <para>
      <function>mysqli_options</function>,
      <function>mysqli_close</function>,
-     <function>mysqli_real_connect</function>,
-     <function>mysqli_connect</function>
+     <function>mysqli_real_connect</function>&listendand;
+     <function>mysqli_connect</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-insert-id.xml b/reference/mysqli/functions/mysqli-insert-id.xml
index d08763abc6..dd0f05bf02 100644
--- a/reference/mysqli/functions/mysqli-insert-id.xml
+++ b/reference/mysqli/functions/mysqli-insert-id.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-insert-id">
    <refnamediv>
     <refname>mysqli_insert_id</refname>
@@ -49,7 +49,7 @@
   </note>
  </refsect1>
  <refsect1>
-  <title>Example</title>
+  &reftitle.examples;
   <example>
    <title>Object oriented style</title>
    <programlisting role="php">
@@ -108,9 +108,7 @@ mysqli_close($link);
 ]]>
    </programlisting>
   </example>
-  <para>
-   The above examples would produce the following output:
-  </para>
+  &example.outputs;
   <screen>
 <![CDATA[
 New Record has id 1.
diff --git a/reference/mysqli/functions/mysqli-kill.xml b/reference/mysqli/functions/mysqli-kill.xml
index 078a74d896..8e46289894 100644
--- a/reference/mysqli/functions/mysqli-kill.xml
+++ b/reference/mysqli/functions/mysqli-kill.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-kill">
    <refnamediv>
     <refname>mysqli_kill</refname>
@@ -42,11 +42,11 @@
    <refsect1>
     &reftitle.seealso;
     <para>
-     <function>mysqli_thread_id</function>
+     <function>mysqli_thread_id</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -109,9 +109,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Error: MySQL server has gone away
diff --git a/reference/mysqli/functions/mysqli-more-results.xml b/reference/mysqli/functions/mysqli-more-results.xml
index 456969af28..e64b060a4e 100644
--- a/reference/mysqli/functions/mysqli-more-results.xml
+++ b/reference/mysqli/functions/mysqli-more-results.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.mysqli-more-results">
    <refnamediv>
     <refname>mysqli_more_results</refname>
@@ -18,20 +18,20 @@
      </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>&return.success;</para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_multi_query</function>,
      <function>mysqli_next_result</function>,
-     <function>mysqli_store_result</function>,
-     <function>mysqli_use_result</function>
+     <function>mysqli_store_result</function>&listendand;
+     <function>mysqli_use_result</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>See <function>mysqli_multi_query</function>.</para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-multi-query.xml b/reference/mysqli/functions/mysqli-multi-query.xml
index 63229403a4..5917726f65 100644
--- a/reference/mysqli/functions/mysqli-multi-query.xml
+++ b/reference/mysqli/functions/mysqli-multi-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.mysqli-multi-query">
    <refnamediv>
     <refname>mysqli_multi_query</refname>
@@ -35,22 +35,22 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success; 
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_use_result</function>,
      <function>mysqli_store_result</function>,
-     <function>mysqli_next_result</function>,
-     <function>mysqli_more_results</function>
+     <function>mysqli_next_result</function>&listendand;
+     <function>mysqli_more_results</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -129,9 +129,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 my_user@localhost
diff --git a/reference/mysqli/functions/mysqli-next-result.xml b/reference/mysqli/functions/mysqli-next-result.xml
index a8c2ddfef1..107b746f5f 100644
--- a/reference/mysqli/functions/mysqli-next-result.xml
+++ b/reference/mysqli/functions/mysqli-next-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-next-result">
    <refnamediv>
     <refname>mysqli_next_result</refname>
@@ -20,20 +20,20 @@
      </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>&return.success;</para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_multi_query</function>,
      <function>mysqli_more_results</function>,
-     <function>mysqli_store_result</function>,
-     <function>mysqli_use_result</function>
+     <function>mysqli_store_result</function>&listendand;
+     <function>mysqli_use_result</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>
      See <function>mysqli_multi_query</function>.
     </para>
diff --git a/reference/mysqli/functions/mysqli-num-fields.xml b/reference/mysqli/functions/mysqli-num-fields.xml
index e4405cb135..4eb9b1c941 100644
--- a/reference/mysqli/functions/mysqli-num-fields.xml
+++ b/reference/mysqli/functions/mysqli-num-fields.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-num-fields">
    <refnamediv>
     <refname>mysqli_num_fields</refname>
@@ -31,11 +31,11 @@
    <refsect1>
     &reftitle.seealso;
     <para>
-     <function>mysqli_fetch_field</function>
+     <function>mysqli_fetch_field</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -96,9 +96,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Result set has 5 fields.
diff --git a/reference/mysqli/functions/mysqli-num-rows.xml b/reference/mysqli/functions/mysqli-num-rows.xml
index 09260fa19f..4bd464b3c3 100644
--- a/reference/mysqli/functions/mysqli-num-rows.xml
+++ b/reference/mysqli/functions/mysqli-num-rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-num-rows">
    <refnamediv>
     <refname>mysqli_num_rows</refname>
@@ -45,14 +45,14 @@
     <refsect1>
      &reftitle.seealso;
      <para>
-      <function>mysqli_affected_rows</function>
-      <function>mysqli_store_result</function>
-      <function>mysqli_use_result</function>
-      <function>mysqli_query</function>
+      <function>mysqli_affected_rows</function>,
+      <function>mysqli_store_result</function>,
+      <function>mysqli_use_result</function>&listendand;
+      <function>mysqli_query</function>.
      </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -113,9 +113,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Result set has 239 rows.
diff --git a/reference/mysqli/functions/mysqli-options.xml b/reference/mysqli/functions/mysqli-options.xml
index afece949bb..d573a8159b 100644
--- a/reference/mysqli/functions/mysqli-options.xml
+++ b/reference/mysqli/functions/mysqli-options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-options">
    <refnamediv>
     <refname>mysqli_options</refname>
@@ -87,12 +87,12 @@
    <refsect1>
     &reftitle.seealso;
     <para>
-     <function>mysqli_init</function>,
-     <function>mysqli_real_connect</function>
+     <function>mysqli_init</function>&listendand;
+     <function>mysqli_real_connect</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>See <function>mysqli_real_connect</function>.</para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-param-count.xml b/reference/mysqli/functions/mysqli-param-count.xml
index 204f85ea80..a7b8ca5ae3 100644
--- a/reference/mysqli/functions/mysqli-param-count.xml
+++ b/reference/mysqli/functions/mysqli-param-count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <refentry id="function.mysqli-param-count">
    <refnamediv>
     <refname>mysqli_param_count</refname>
@@ -19,9 +19,9 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_param_count</function>
+     <function>mysqli_stmt_param_count</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-ping.xml b/reference/mysqli/functions/mysqli-ping.xml
index 9cc48fe3af..fe521a4fff 100644
--- a/reference/mysqli/functions/mysqli-ping.xml
+++ b/reference/mysqli/functions/mysqli-ping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-ping">
    <refnamediv>
     <refname>mysqli_ping</refname>
@@ -35,11 +35,11 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>&return.success;</para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -92,9 +92,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Our connection is ok!
diff --git a/reference/mysqli/functions/mysqli-prepare.xml b/reference/mysqli/functions/mysqli-prepare.xml
index f81dbf76f4..0f4bea64d1 100644
--- a/reference/mysqli/functions/mysqli-prepare.xml
+++ b/reference/mysqli/functions/mysqli-prepare.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-prepare">
    <refnamediv>
     <refname>mysqli_prepare</refname>
@@ -76,12 +76,12 @@
      <function>mysqli_stmt_execute</function>,
      <function>mysqli_stmt_fetch</function>,
      <function>mysqli_stmt_bind_param</function>,
-     <function>mysqli_stmt_bind_result</function>,
-     <function>mysqli_stmt_close</function>
+     <function>mysqli_stmt_bind_result</function>&listendand;
+     <function>mysqli_stmt_close</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -166,9 +166,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Amersfoort is in district Utrecht
diff --git a/reference/mysqli/functions/mysqli-query.xml b/reference/mysqli/functions/mysqli-query.xml
index b982b06603..9c923d94f9 100644
--- a/reference/mysqli/functions/mysqli-query.xml
+++ b/reference/mysqli/functions/mysqli-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-query">
    <refnamediv>
     <refname>mysqli_query</refname>
@@ -48,7 +48,7 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success; For <literal>SELECT, SHOW, DESCRIBE</literal> or
      <literal>EXPLAIN</literal> <function>mysqli_query</function> will return
@@ -56,15 +56,15 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_real_query</function>,
-     <function>mysqli_multi_query</function>,
-     <function>mysqli_free_result</function>
+     <function>mysqli_multi_query</function>&listendand;
+     <function>mysqli_free_result</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -151,9 +151,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Table myCity successfully created.
diff --git a/reference/mysqli/functions/mysqli-real-connect.xml b/reference/mysqli/functions/mysqli-real-connect.xml
index 49fa0b81dc..49d6b053f3 100644
--- a/reference/mysqli/functions/mysqli-real-connect.xml
+++ b/reference/mysqli/functions/mysqli-real-connect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
   <refentry id="function.mysqli-real-connect">
    <refnamediv>
     <refname>mysqli_real_connect</refname>
@@ -115,12 +115,12 @@
      <function>mysqli_connect</function>,
      <function>mysqli_init</function>,
      <function>mysqli_options</function>,
-     <function>mysqli_ssl_set</function>,
+     <function>mysqli_ssl_set</function>&listendand;
      <function>mysqli_close</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -179,9 +179,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Connection: Localhost via UNIX socket
diff --git a/reference/mysqli/functions/mysqli-real-escape-string.xml b/reference/mysqli/functions/mysqli-real-escape-string.xml
index 65a6ca0d12..68f14574b2 100644
--- a/reference/mysqli/functions/mysqli-real-escape-string.xml
+++ b/reference/mysqli/functions/mysqli-real-escape-string.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <refentry id="function.mysqli-real-escape-string">
    <refnamediv>
     <refname>mysqli_real_escape_string</refname>
@@ -36,19 +36,19 @@
      </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      Returns an escaped string.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_character_set_name</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -117,9 +117,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Error: 42000
diff --git a/reference/mysqli/functions/mysqli-real-query.xml b/reference/mysqli/functions/mysqli-real-query.xml
index 5fb1a2d964..ae582f0256 100644
--- a/reference/mysqli/functions/mysqli-real-query.xml
+++ b/reference/mysqli/functions/mysqli-real-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-real-query">
    <refnamediv>
     <refname>mysqli_real_query</refname>
@@ -38,17 +38,17 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_query</function>
-     <function>mysqli_store_result</function>
-     <function>mysqli_use_result</function>
+     <function>mysqli_query</function>,
+     <function>mysqli_store_result</function>&listendand;
+     <function>mysqli_use_result</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-report.xml b/reference/mysqli/functions/mysqli-report.xml
index 420d4f677d..fddf905e00 100644
--- a/reference/mysqli/functions/mysqli-report.xml
+++ b/reference/mysqli/functions/mysqli-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-report">
    <refnamediv>
     <refname>mysqli_report</refname>
@@ -48,18 +48,18 @@
     </table>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>&return.success;</para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_debug</function>,
-     <function>mysqli_dump_debug_info</function>
+     <function>mysqli_debug</function>&listendand;
+     <function>mysqli_dump_debug_info</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>
      <example>
       <title>Object oriented style</title>
diff --git a/reference/mysqli/functions/mysqli-rollback.xml b/reference/mysqli/functions/mysqli-rollback.xml
index 369b18967c..386d9b07df 100644
--- a/reference/mysqli/functions/mysqli-rollback.xml
+++ b/reference/mysqli/functions/mysqli-rollback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-rollback">
    <refnamediv>
     <refname>mysqli_rollback</refname>
@@ -26,20 +26,20 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_commit</function>
-     <function>mysqli_autocommit</function>
+     <function>mysqli_commit</function>&listendand;
+     <function>mysqli_autocommit</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -142,9 +142,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 0 rows in table myCity.
diff --git a/reference/mysqli/functions/mysqli-select-db.xml b/reference/mysqli/functions/mysqli-select-db.xml
index d54129a3d3..9eb2aa5b99 100644
--- a/reference/mysqli/functions/mysqli-select-db.xml
+++ b/reference/mysqli/functions/mysqli-select-db.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <refentry id="function.mysqli-select-db">
    <refnamediv>
     <refname>mysqli_select_db</refname>
@@ -27,20 +27,20 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_connect</function>
-     <function>mysqli_real_connect</function>
+     <function>mysqli_connect</function>&listendand;
+     <function>mysqli_real_connect</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -111,9 +111,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Default database is test.
diff --git a/reference/mysqli/functions/mysqli-send-long-data.xml b/reference/mysqli/functions/mysqli-send-long-data.xml
index b7e799bb64..bf346841c5 100644
--- a/reference/mysqli/functions/mysqli-send-long-data.xml
+++ b/reference/mysqli/functions/mysqli-send-long-data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-send-long-data">
    <refnamediv>
     <refname>mysqli_send_long_data</refname>
@@ -19,9 +19,9 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_send_long_data</function>
+     <function>mysqli_stmt_send_long_data</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-sqlstate.xml b/reference/mysqli/functions/mysqli-sqlstate.xml
index 8aad8e178c..ae45fd7987 100644
--- a/reference/mysqli/functions/mysqli-sqlstate.xml
+++ b/reference/mysqli/functions/mysqli-sqlstate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-sqlstate">
    <refnamediv>
     <refname>mysqli_sqlstate</refname>
@@ -32,21 +32,21 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      Returns a string containing the SQLSTATE error code for the last error. 
      The error code consists of five characters. <literal>'00000'</literal> means no error.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_errno</function>,
-     <function>mysqli_error</function>
+     <function>mysqli_errno</function>&listendand;
+     <function>mysqli_error</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -93,9 +93,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Error - SQLSTATE 42S01.
diff --git a/reference/mysqli/functions/mysqli-ssl-set.xml b/reference/mysqli/functions/mysqli-ssl-set.xml
index 14c30e60db..05c9bbbb3a 100644
--- a/reference/mysqli/functions/mysqli-ssl-set.xml
+++ b/reference/mysqli/functions/mysqli-ssl-set.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-ssl-set">
    <refnamediv>
     <refname>mysqli_ssl_set</refname>
@@ -48,7 +48,7 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
       This function always returns &true; value. If SSL setup is
       incorrect <function>mysqli_real_connect</function> will return an error
@@ -56,10 +56,10 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_options</function>,
-     <function>mysqli_real_connect</function>
+     <function>mysqli_options</function>&listendand;
+     <function>mysqli_real_connect</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-stat.xml b/reference/mysqli/functions/mysqli-stat.xml
index e1160af5d0..53504b8348 100644
--- a/reference/mysqli/functions/mysqli-stat.xml
+++ b/reference/mysqli/functions/mysqli-stat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-stat">
    <refnamediv>
     <refname>mysqli_stat</refname>
@@ -29,19 +29,19 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      A string describing the server status. &false; if an error occurred.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_get_server_info</function>
+     <function>mysqli_get_server_info</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -82,9 +82,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-      The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 System status: Uptime: 272  Threads: 1  Questions: 5340  Slow queries: 0
diff --git a/reference/mysqli/functions/mysqli-stmt-affected-rows.xml b/reference/mysqli/functions/mysqli-stmt-affected-rows.xml
index 1227258be4..4a951617ca 100644
--- a/reference/mysqli/functions/mysqli-stmt-affected-rows.xml
+++ b/reference/mysqli/functions/mysqli-stmt-affected-rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-stmt-affected-rows">
    <refnamediv>
     <refname>mysqli_stmt_affected_rows</refname>
@@ -31,7 +31,7 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return Values</title>
+    &reftitle.returnvalues;
     <para>
       An integer greater than zero indicates the number of rows affected or retrieved. 
       Zero indicates that no records where updated for an UPDATE/DELETE statement, no
@@ -46,14 +46,14 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_num_rows</function>,
-     <function>mysqli_prepare</function>
+     <function>mysqli_stmt_num_rows</function>&listendand;
+     <function>mysqli_prepare</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+   &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -134,9 +134,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 rows inserted: 17
diff --git a/reference/mysqli/functions/mysqli-stmt-bind-param.xml b/reference/mysqli/functions/mysqli-stmt-bind-param.xml
index d2800a2af8..0b91bf0ee6 100644
--- a/reference/mysqli/functions/mysqli-stmt-bind-param.xml
+++ b/reference/mysqli/functions/mysqli-stmt-bind-param.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-stmt-bind-param">
    <refnamediv>
     <refname>mysqli_stmt_bind_param</refname>
@@ -77,25 +77,25 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-   <title>See also</title>
+   &reftitle.seealso;
     <para>
      <function>mysqli_stmt_bind_result</function>,
      <function>mysqli_stmt_execute</function>,
      <function>mysqli_stmt_fetch</function>,
      <function>mysqli_prepare</function>,
      <function>mysqli_stmt_send_long_data</function>,
-     <function>mysqli_stmt_errno</function>,
-     <function>mysqli_stmt_error</function>
+     <function>mysqli_stmt_errno</function>&listendand;
+     <function>mysqli_stmt_error</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -174,9 +174,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 1 Row inserted.
diff --git a/reference/mysqli/functions/mysqli-stmt-bind-result.xml b/reference/mysqli/functions/mysqli-stmt-bind-result.xml
index 82dba47a7d..4aeb655351 100644
--- a/reference/mysqli/functions/mysqli-stmt-bind-result.xml
+++ b/reference/mysqli/functions/mysqli-stmt-bind-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.mysqli-stmt-bind-result">
    <refnamediv>
     <refname>mysqli_stmt_bind_result</refname>
@@ -43,13 +43,13 @@
      </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_stmt_bind_param</function>,
      <function>mysqli_stmt_execute</function>,
@@ -57,12 +57,12 @@
      <function>mysqli_prepare</function>,
      <function>mysqli_stmt_prepare</function>,
      <function>mysqli_stmt_init</function>,
-     <function>mysqli_stmt_errno</function>,
-     <function>mysqli_stmt_error</function>
+     <function>mysqli_stmt_errno</function>&listendand;
+     <function>mysqli_stmt_error</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -132,9 +132,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 AFG Afghanistan
diff --git a/reference/mysqli/functions/mysqli-stmt-close.xml b/reference/mysqli/functions/mysqli-stmt-close.xml
index 2046ff8442..fb2eece87b 100644
--- a/reference/mysqli/functions/mysqli-stmt-close.xml
+++ b/reference/mysqli/functions/mysqli-stmt-close.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-stmt-close">
    <refnamediv>
     <refname>mysqli_stmt_close</refname>
@@ -29,13 +29,13 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>&return.success;</para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_prepare</function>,
+     <function>mysqli_prepare</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-stmt-data-seek.xml b/reference/mysqli/functions/mysqli-stmt-data-seek.xml
index 075fce1b2a..d861466f52 100644
--- a/reference/mysqli/functions/mysqli-stmt-data-seek.xml
+++ b/reference/mysqli/functions/mysqli-stmt-data-seek.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-stmt-data-seek">
    <refnamediv>
     <refname>mysqli_stmt_data_seek</refname>
@@ -31,19 +31,19 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &return.success;
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_prepare</function>
+     <function>mysqli_prepare</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -132,9 +132,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 City: Benin City  Countrycode: NGA
diff --git a/reference/mysqli/functions/mysqli-stmt-errno.xml b/reference/mysqli/functions/mysqli-stmt-errno.xml
index d72317c0d2..92e481e164 100644
--- a/reference/mysqli/functions/mysqli-stmt-errno.xml
+++ b/reference/mysqli/functions/mysqli-stmt-errno.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-stmt-errno">
    <refnamediv>
     <refname>mysqli_stmt_errno</refname>
@@ -32,20 +32,20 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      An error code value. Zero means no error occurred.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_error</function>,
-     <function>mysqli_stmt_sqlstate</function>
+     <function>mysqli_stmt_error</function>&listendand;
+     <function>mysqli_stmt_sqlstate</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -124,9 +124,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Error: 1146.
diff --git a/reference/mysqli/functions/mysqli-stmt-error.xml b/reference/mysqli/functions/mysqli-stmt-error.xml
index 5860b966be..59f74a1dd1 100644
--- a/reference/mysqli/functions/mysqli-stmt-error.xml
+++ b/reference/mysqli/functions/mysqli-stmt-error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-stmt-error">
    <refnamediv>
     <refname>mysqli_stmt_error</refname>
@@ -25,20 +25,20 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      A string that describes the error. An empty string if no error occurred. 
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_errno</function>,
-     <function>mysqli_stmt_sqlstate</function>
+     <function>mysqli_stmt_errno</function>&listendand;
+     <function>mysqli_stmt_sqlstate</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -117,9 +117,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Error: Table 'world.myCountry' doesn't exist.
diff --git a/reference/mysqli/functions/mysqli-stmt-execute.xml b/reference/mysqli/functions/mysqli-stmt-execute.xml
index e58b4208c4..b45546ca20 100644
--- a/reference/mysqli/functions/mysqli-stmt-execute.xml
+++ b/reference/mysqli/functions/mysqli-stmt-execute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.mysqli-stmt-execute">
    <refnamediv>
     <refname>mysqli_stmt_execute</refname>
@@ -41,18 +41,20 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
-    <para>&return.success;</para>
+    &reftitle.returnvalues;
+    <para>
+     &return.success;
+    </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_prepare</function>
+     <function>mysqli_prepare</function>&listendand;
      <function>mysqli_stmt_bind_param</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -167,9 +169,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Stuttgart (DEU,Baden-Wuerttemberg)
diff --git a/reference/mysqli/functions/mysqli-stmt-fetch.xml b/reference/mysqli/functions/mysqli-stmt-fetch.xml
index cd35b25a2c..10732f609e 100644
--- a/reference/mysqli/functions/mysqli-stmt-fetch.xml
+++ b/reference/mysqli/functions/mysqli-stmt-fetch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.mysqli-stmt-fetch">
    <refnamediv>
     <refname>mysqli_stmt_fetch</refname>
@@ -34,9 +34,9 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <table>
-     <title>Return values</title>
+     &reftitle.returnvalues;
      <tgroup cols='2'>
       <thead>
        <row>
@@ -62,16 +62,16 @@
     </table>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_prepare</function>,
      <function>mysqli_stmt_errno</function>,
-     <function>mysqli_stmt_error</function>,
-     <function>mysqli_stmt_bind_result</function>
+     <function>mysqli_stmt_error</function>&listendand;
+     <function>mysqli_stmt_bind_result</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -148,9 +148,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Rockford (USA)
diff --git a/reference/mysqli/functions/mysqli-stmt-free-result.xml b/reference/mysqli/functions/mysqli-stmt-free-result.xml
index 6c35f0e17b..0e47081caf 100644
--- a/reference/mysqli/functions/mysqli-stmt-free-result.xml
+++ b/reference/mysqli/functions/mysqli-stmt-free-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.mysqli-stmt-free-result">
    <refnamediv>
     <refname>mysqli_stmt_free_result</refname>
@@ -38,7 +38,7 @@
    <refsect1>
     &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_store_result</function>
+     <function>mysqli_stmt_store_result</function>.
     </para>
    </refsect1>
   
diff --git a/reference/mysqli/functions/mysqli-stmt-init.xml b/reference/mysqli/functions/mysqli-stmt-init.xml
index 9db96c05cd..8a4662b864 100644
--- a/reference/mysqli/functions/mysqli-stmt-init.xml
+++ b/reference/mysqli/functions/mysqli-stmt-init.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-stmt-init">
    <refnamediv>
     <refname>mysqli_stmt_init</refname>
@@ -44,7 +44,7 @@
    <refsect1>
     &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_prepare</function>
+     <function>mysqli_stmt_prepare</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-stmt-num-rows.xml b/reference/mysqli/functions/mysqli-stmt-num-rows.xml
index b77d6a0f8a..bc0c3c348f 100644
--- a/reference/mysqli/functions/mysqli-stmt-num-rows.xml
+++ b/reference/mysqli/functions/mysqli-stmt-num-rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-stmt-num-rows">
    <refnamediv>
     <refname>mysqli_stmt_num_rows</refname>
@@ -31,21 +31,21 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      An integer representing the number of rows in result set.
     </para> 
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_stmt_affected_rows</function>,
-     <function>mysqli_prepare</function>,
-     <function>mysqli_stmt_store_result</function>
+     <function>mysqli_prepare</function>&listendand;
+     <function>mysqli_stmt_store_result</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -116,9 +116,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Number of rows: 20.
diff --git a/reference/mysqli/functions/mysqli-stmt-param-count.xml b/reference/mysqli/functions/mysqli-stmt-param-count.xml
index bfb5f7a22e..97e75d16b6 100644
--- a/reference/mysqli/functions/mysqli-stmt-param-count.xml
+++ b/reference/mysqli/functions/mysqli-stmt-param-count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.mysqli-stmt-param-count">
    <refnamediv>
     <refname>mysqli_stmt_param_count</refname>
@@ -32,11 +32,11 @@
    <refsect1>
     &reftitle.seealso;
     <para>
-     <function>mysqli_prepare</function>
+     <function>mysqli_prepare</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -93,9 +93,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Statement has 2 markers.
diff --git a/reference/mysqli/functions/mysqli-stmt-prepare.xml b/reference/mysqli/functions/mysqli-stmt-prepare.xml
index 5f6101bc03..a2e246753e 100644
--- a/reference/mysqli/functions/mysqli-stmt-prepare.xml
+++ b/reference/mysqli/functions/mysqli-stmt-prepare.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.mysqli-stmt-prepare">
    <refnamediv>
     <refname>mysqli_stmt_prepare</refname>
@@ -78,12 +78,12 @@
      <function>mysqli_stmt_execute</function>,
      <function>mysqli_stmt_fetch</function>,
      <function>mysqli_stmt_bind_param</function>,
-     <function>mysqli_stmt_bind_result</function>,
-     <function>mysqli_stmt_close</function>
+     <function>mysqli_stmt_bind_result</function>&listendand;
+     <function>mysqli_stmt_close</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -170,9 +170,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Amersfoort is in district Utrecht
diff --git a/reference/mysqli/functions/mysqli-stmt-reset.xml b/reference/mysqli/functions/mysqli-stmt-reset.xml
index c726604530..4433a36f87 100644
--- a/reference/mysqli/functions/mysqli-stmt-reset.xml
+++ b/reference/mysqli/functions/mysqli-stmt-reset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.mysqli-stmt-reset">
    <refnamediv>
     <refname>mysqli_stmt_reset</refname>
@@ -34,13 +34,13 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>&return.success;</para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_prepare</function>
+     <function>mysqli_prepare</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-stmt-result-metadata.xml b/reference/mysqli/functions/mysqli-stmt-result-metadata.xml
index a56b7d9695..548719c7a3 100644
--- a/reference/mysqli/functions/mysqli-stmt-result-metadata.xml
+++ b/reference/mysqli/functions/mysqli-stmt-result-metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-stmt-result-metadata">
    <refnamediv>
     <refname>mysqli_stmt_result_metadata</refname>
@@ -62,14 +62,14 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>See also:</title> 
+    &reftitle.seealso;
     <para>
-     <function>mysqli_prepare</function>,
-     <function>mysqli_free_result</function>
+     <function>mysqli_prepare</function>&listendand;
+     <function>mysqli_free_result</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>
      <example>
       <title>Object oriented style</title>
diff --git a/reference/mysqli/functions/mysqli-stmt-send-long-data.xml b/reference/mysqli/functions/mysqli-stmt-send-long-data.xml
index e37dc58c5a..974e5413ab 100644
--- a/reference/mysqli/functions/mysqli-stmt-send-long-data.xml
+++ b/reference/mysqli/functions/mysqli-stmt-send-long-data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.mysqli-stmt-send-long-data">
    <refnamediv>
     <refname>mysqli_stmt_send_long_data</refname>
@@ -43,8 +43,8 @@
    <refsect1>
     &reftitle.seealso;
     <para>
-     <function>mysqli_prepare</function>,
-     <function>mysqli_stmt_bind_param</function>
+     <function>mysqli_prepare</function>&listendand;
+     <function>mysqli_stmt_bind_param</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysqli/functions/mysqli-stmt-sqlstate.xml b/reference/mysqli/functions/mysqli-stmt-sqlstate.xml
index 7151839c32..d8cdb58bf5 100644
--- a/reference/mysqli/functions/mysqli-stmt-sqlstate.xml
+++ b/reference/mysqli/functions/mysqli-stmt-sqlstate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-stmt-sqlstate">
    <refnamediv>
     <refname>mysqli_stmt_sqlstate</refname>
@@ -26,21 +26,21 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      Returns a string containing the SQLSTATE error code for the last error. 
      The error code consists of five characters. <literal>'00000'</literal> means no error.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_stmt_errno</function>,
-     <function>mysqli_stmt_error</function>
+     <function>mysqli_stmt_errno</function>&listendand;
+     <function>mysqli_stmt_error</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -119,9 +119,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Error: 42S02.
diff --git a/reference/mysqli/functions/mysqli-stmt-store-result.xml b/reference/mysqli/functions/mysqli-stmt-store-result.xml
index 8af09e6ea0..e654f83e17 100644
--- a/reference/mysqli/functions/mysqli-stmt-store-result.xml
+++ b/reference/mysqli/functions/mysqli-stmt-store-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <refentry id="function.mysqli-stmt-store-result">
    <refnamediv>
     <refname>mysqli_stmt_store_result</refname>
@@ -37,19 +37,19 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>&return.success;</para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_prepare</function>,
-     <function>mysqli_stmt_result_metadata</function>,
-     <function>mysqli_fetch</function>
+     <function>mysqli_stmt_result_metadata</function>&listendand;
+     <function>mysqli_fetch</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -126,9 +126,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Number of rows: 20.
diff --git a/reference/mysqli/functions/mysqli-store-result.xml b/reference/mysqli/functions/mysqli-store-result.xml
index d896457700..329feae762 100644
--- a/reference/mysqli/functions/mysqli-store-result.xml
+++ b/reference/mysqli/functions/mysqli-store-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
   <refentry id="function.mysqli-store-result">
    <refnamediv>
     <refname>mysqli_store_result</refname>
@@ -53,20 +53,20 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      Returns a buffered result object or &false; if an error occurred.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_real_query</function>,
+     <function>mysqli_real_query</function>&listendand;
      <function>mysqli_use_result</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <para>
      See <function>mysqli_multi_query</function>.
     </para>
diff --git a/reference/mysqli/functions/mysqli-thread-id.xml b/reference/mysqli/functions/mysqli-thread-id.xml
index 7e9343f4a1..77eae801e3 100644
--- a/reference/mysqli/functions/mysqli-thread-id.xml
+++ b/reference/mysqli/functions/mysqli-thread-id.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.mysqli-thread-id">
    <refnamediv>
     <refname>mysqli_thread_id</refname>
@@ -37,19 +37,19 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      <function>mysqli_thread_id</function> returns the Thread ID for the current connection.
     </para> 
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_kill</function>
+     <function>mysqli_kill</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -112,9 +112,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Error: MySQL server has gone away
diff --git a/reference/mysqli/functions/mysqli-thread-safe.xml b/reference/mysqli/functions/mysqli-thread-safe.xml
index 4765ff25ce..eb90ee65f4 100644
--- a/reference/mysqli/functions/mysqli-thread-safe.xml
+++ b/reference/mysqli/functions/mysqli-thread-safe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <refentry id="function.mysqli-thread-safe">
    <refnamediv>
     <refname>mysqli_thread_safe</refname>
@@ -18,7 +18,7 @@
     </para>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      &true; if the client library is thread-safe, otherwise &false;.
     </para>
diff --git a/reference/mysqli/functions/mysqli-use-result.xml b/reference/mysqli/functions/mysqli-use-result.xml
index b2ebbee4ac..57e48473b7 100644
--- a/reference/mysqli/functions/mysqli-use-result.xml
+++ b/reference/mysqli/functions/mysqli-use-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
   <refentry id="function.mysqli-use-result">
    <refnamediv>
     <refname>mysqli_use_result</refname>
@@ -46,20 +46,20 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      Returns an unbuffered result object or &false; if an error occurred.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
-     <function>mysqli_real_query</function>,
+     <function>mysqli_real_query</function>&listendand;
      <function>mysqli_store_result</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -138,9 +138,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 my_user@localhost
diff --git a/reference/mysqli/functions/mysqli-warning-count.xml b/reference/mysqli/functions/mysqli-warning-count.xml
index 31daa8bf28..985cb2c51d 100644
--- a/reference/mysqli/functions/mysqli-warning-count.xml
+++ b/reference/mysqli/functions/mysqli-warning-count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.mysqli-warning-count">
    <refnamediv>
     <refname>mysqli_warning_count</refname>
@@ -31,21 +31,21 @@
     </note>
    </refsect1>
    <refsect1>
-    <title>Return values</title>
+    &reftitle.returnvalues;
     <para>
      Number of warnings or zero if there are no warnings.
     </para>
    </refsect1>
    <refsect1>
-    <title>See also</title>
+    &reftitle.seealso;
     <para>
      <function>mysqli_errno</function>,
-     <function>mysqli_error</function>,
-     <function>mysqli_sqlstate</function>
+     <function>mysqli_error</function>&listendand;
+     <function>mysqli_sqlstate</function>.
     </para>
    </refsect1>
    <refsect1>
-    <title>Example</title>
+    &reftitle.examples;
     <example>
      <title>Object oriented style</title>
      <programlisting role="php">
@@ -116,9 +116,7 @@ mysqli_close($link);
 ]]>
      </programlisting>
     </example>
-    <para>
-     The above examples would produce the following output:
-    </para>
+    &example.outputs;
     <screen>
 <![CDATA[
 Warning (1264): Data truncated for column 'Name' at row 1