From ec75fe638b64a5df2f4c4a6bec45a8ca077e7d62 Mon Sep 17 00:00:00 2001
From: Daniel Convissor <danielc@php.net>
Date: Sun, 9 May 2010 02:51:44 +0000
Subject: [PATCH] Clean up properties: use style.oop for descriptions, clean up
 docbook in some descriptions, fix refnames where needed.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@299166 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/maxdb/functions/maxdb-affected-rows.xml     |  2 +-
 reference/maxdb/functions/maxdb-errno.xml             |  2 +-
 reference/maxdb/functions/maxdb-error.xml             |  3 ++-
 reference/maxdb/functions/maxdb-fetch-lengths.xml     |  6 +++---
 reference/maxdb/functions/maxdb-field-tell.xml        | 11 ++++-------
 reference/maxdb/functions/maxdb-get-host-info.xml     |  2 +-
 reference/maxdb/functions/maxdb-get-proto-info.xml    |  2 +-
 reference/maxdb/functions/maxdb-get-server-info.xml   |  2 +-
 .../maxdb/functions/maxdb-get-server-version.xml      |  3 ++-
 reference/maxdb/functions/maxdb-info.xml              |  4 ++--
 reference/maxdb/functions/maxdb-insert-id.xml         |  2 +-
 reference/maxdb/functions/maxdb-num-fields.xml        |  6 +++---
 reference/maxdb/functions/maxdb-num-rows.xml          |  3 ++-
 reference/maxdb/functions/maxdb-sqlstate.xml          |  2 +-
 .../maxdb/functions/maxdb-stmt-affected-rows.xml      |  4 ++--
 reference/maxdb/functions/maxdb-stmt-errno.xml        |  4 ++--
 reference/maxdb/functions/maxdb-stmt-error.xml        |  4 ++--
 reference/maxdb/functions/maxdb-stmt-init.xml         |  2 +-
 reference/maxdb/functions/maxdb-stmt-num-rows.xml     |  6 +++---
 reference/maxdb/functions/maxdb-stmt-param-count.xml  |  6 +++---
 reference/maxdb/functions/maxdb-thread-id.xml         |  2 +-
 reference/maxdb/functions/maxdb-warning-count.xml     |  2 +-
 22 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/reference/maxdb/functions/maxdb-affected-rows.xml b/reference/maxdb/functions/maxdb-affected-rows.xml
index 6ffda957d9..7225974afe 100644
--- a/reference/maxdb/functions/maxdb-affected-rows.xml
+++ b/reference/maxdb/functions/maxdb-affected-rows.xml
@@ -14,7 +14,7 @@
    <type>int</type><methodname>maxdb_affected_rows</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>affected_rows</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-errno.xml b/reference/maxdb/functions/maxdb-errno.xml
index e49552f432..0278af1d55 100644
--- a/reference/maxdb/functions/maxdb-errno.xml
+++ b/reference/maxdb/functions/maxdb-errno.xml
@@ -14,7 +14,7 @@
    <type>int</type><methodname>maxdb_errno</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>errno</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-error.xml b/reference/maxdb/functions/maxdb-error.xml
index 4572515719..0c5ce9d943 100644
--- a/reference/maxdb/functions/maxdb-error.xml
+++ b/reference/maxdb/functions/maxdb-error.xml
@@ -3,6 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.maxdb-error">
  <refnamediv>
   <refname>maxdb_error</refname>
+  <refname>maxdb->error</refname>
   <refpurpose>Returns a string description of the last error</refpurpose>
  </refnamediv>
 
@@ -13,7 +14,7 @@
    <type>string</type><methodname>maxdb_error</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property)</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>string</type><varname>error</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-fetch-lengths.xml b/reference/maxdb/functions/maxdb-fetch-lengths.xml
index ebd283ce41..7f1456d5c3 100644
--- a/reference/maxdb/functions/maxdb-fetch-lengths.xml
+++ b/reference/maxdb/functions/maxdb-fetch-lengths.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.maxdb-fetch-lengths">
  <refnamediv>
   <refname>maxdb_fetch_lengths</refname>
-  <refname>result->lengths</refname>
+  <refname>maxdb_result->lengths</refname>
   <refpurpose>Returns the lengths of the columns of the current row in the result set</refpurpose>
  </refnamediv>
 
@@ -14,9 +14,9 @@
    <type>array</type><methodname>maxdb_fetch_lengths</methodname>
    <methodparam><type>resource</type><parameter>result</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
-   <ooclass><classname>result</classname></ooclass>
+   <ooclass><classname>maxdb_result</classname></ooclass>
    <fieldsynopsis><type>array</type><varname>lengths</varname></fieldsynopsis>
   </classsynopsis>
   <para>
diff --git a/reference/maxdb/functions/maxdb-field-tell.xml b/reference/maxdb/functions/maxdb-field-tell.xml
index 58c9845154..8c1ea8d403 100644
--- a/reference/maxdb/functions/maxdb-field-tell.xml
+++ b/reference/maxdb/functions/maxdb-field-tell.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.maxdb-field-tell">
  <refnamediv>
   <refname>maxdb_field_tell</refname>
-  <refname>result->current_field</refname>
+  <refname>maxdb_result->current_field</refname>
   <refpurpose>Get current field offset of a result pointer</refpurpose>
  </refnamediv>
 
@@ -14,13 +14,10 @@
    <type>int</type><methodname>maxdb_field_tell</methodname>
    <methodparam><type>resource</type><parameter>result</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
-   <ooclass><classname>result</classname></ooclass>
-   <fieldsynopsis>
-    <type>int</type>
-    <varname>current_field</varname>
-   </fieldsynopsis>
+   <ooclass><classname>maxdb_result</classname></ooclass>
+   <fieldsynopsis><type>int</type><varname>current_field</varname></fieldsynopsis>
   </classsynopsis>
   <para>
    Returns the position of the field cursor used for the last
diff --git a/reference/maxdb/functions/maxdb-get-host-info.xml b/reference/maxdb/functions/maxdb-get-host-info.xml
index bcefc1d6d0..ba05b03a7a 100644
--- a/reference/maxdb/functions/maxdb-get-host-info.xml
+++ b/reference/maxdb/functions/maxdb-get-host-info.xml
@@ -14,7 +14,7 @@
    <type>string</type><methodname>maxdb_get_host_info</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>string</type><varname>host_info</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-get-proto-info.xml b/reference/maxdb/functions/maxdb-get-proto-info.xml
index b559400657..44e4264cc7 100644
--- a/reference/maxdb/functions/maxdb-get-proto-info.xml
+++ b/reference/maxdb/functions/maxdb-get-proto-info.xml
@@ -14,7 +14,7 @@
    <type>int</type><methodname>maxdb_get_proto_info</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>string</type><varname>protocol_version</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-get-server-info.xml b/reference/maxdb/functions/maxdb-get-server-info.xml
index 8066a4e073..0341430921 100644
--- a/reference/maxdb/functions/maxdb-get-server-info.xml
+++ b/reference/maxdb/functions/maxdb-get-server-info.xml
@@ -14,7 +14,7 @@
    <type>string</type><methodname>maxdb_get_server_info</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>string</type><varname>server_info</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-get-server-version.xml b/reference/maxdb/functions/maxdb-get-server-version.xml
index 5f0c7a000c..420283b7a4 100644
--- a/reference/maxdb/functions/maxdb-get-server-version.xml
+++ b/reference/maxdb/functions/maxdb-get-server-version.xml
@@ -3,6 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.maxdb-get-server-version">
  <refnamediv>
   <refname>maxdb_get_server_version</refname>
+  <refname>maxdb->server_version</refname>
   <refpurpose>Returns the version of the MaxDB server as an integer</refpurpose>
  </refnamediv>
 
@@ -13,7 +14,7 @@
    <type>int</type><methodname>maxdb_get_server_version</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>server_version</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-info.xml b/reference/maxdb/functions/maxdb-info.xml
index 57dcd11bc3..2aca8ecd65 100644
--- a/reference/maxdb/functions/maxdb-info.xml
+++ b/reference/maxdb/functions/maxdb-info.xml
@@ -14,10 +14,10 @@
    <type>string</type><methodname>maxdb_info</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property)</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
-    <fieldsynopsis><type>string</type><varname>info</varname></fieldsynopsis>
+   <fieldsynopsis><type>string</type><varname>info</varname></fieldsynopsis>
   </classsynopsis>
   <para>
    The <function>maxdb_info</function> function returns a string providing
diff --git a/reference/maxdb/functions/maxdb-insert-id.xml b/reference/maxdb/functions/maxdb-insert-id.xml
index cd87e65285..3d1206c40b 100644
--- a/reference/maxdb/functions/maxdb-insert-id.xml
+++ b/reference/maxdb/functions/maxdb-insert-id.xml
@@ -14,7 +14,7 @@
    <type>mixed</type><methodname>maxdb_insert_id</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>mixed</type><varname>insert_id</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-num-fields.xml b/reference/maxdb/functions/maxdb-num-fields.xml
index cb2ace1267..918cb55d99 100644
--- a/reference/maxdb/functions/maxdb-num-fields.xml
+++ b/reference/maxdb/functions/maxdb-num-fields.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.maxdb-num-fields">
  <refnamediv>
   <refname>maxdb_num_fields</refname>
-  <refname>result->field_count</refname>
+  <refname>maxdb_result->field_count</refname>
   <refpurpose>Get the number of fields in a result</refpurpose>
  </refnamediv>
 
@@ -14,9 +14,9 @@
    <type>int</type><methodname>maxdb_num_fields</methodname>
    <methodparam><type>resource</type><parameter>result</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
-   <ooclass><classname>result</classname></ooclass>
+   <ooclass><classname>maxdb_result</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>field_count</varname></fieldsynopsis>
   </classsynopsis>
   <para>
diff --git a/reference/maxdb/functions/maxdb-num-rows.xml b/reference/maxdb/functions/maxdb-num-rows.xml
index 86e7ab0fed..f1034198e3 100644
--- a/reference/maxdb/functions/maxdb-num-rows.xml
+++ b/reference/maxdb/functions/maxdb-num-rows.xml
@@ -3,6 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.maxdb-num-rows">
  <refnamediv>
   <refname>maxdb_num_rows</refname>
+  <refname>maxdb->num_rows</refname>
   <refpurpose>Gets the number of rows in a result</refpurpose>
  </refnamediv>
 
@@ -13,7 +14,7 @@
    <type>int</type><methodname>maxdb_num_rows</methodname>
    <methodparam><type>resource</type><parameter>result</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>num_rows</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-sqlstate.xml b/reference/maxdb/functions/maxdb-sqlstate.xml
index 8db94ef60c..e0da6c24d4 100644
--- a/reference/maxdb/functions/maxdb-sqlstate.xml
+++ b/reference/maxdb/functions/maxdb-sqlstate.xml
@@ -14,7 +14,7 @@
    <type>string</type><methodname>maxdb_sqlstate</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>string</type><varname>sqlstate</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-stmt-affected-rows.xml b/reference/maxdb/functions/maxdb-stmt-affected-rows.xml
index 0599b67ef3..a79e6c9917 100644
--- a/reference/maxdb/functions/maxdb-stmt-affected-rows.xml
+++ b/reference/maxdb/functions/maxdb-stmt-affected-rows.xml
@@ -16,9 +16,9 @@
    <type>int</type><methodname>maxdb_stmt_affected_rows</methodname>
    <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
-   <ooclass><classname>stmt</classname></ooclass>
+   <ooclass><classname>maxdb_stmt</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>affected_rows</varname></fieldsynopsis>
   </classsynopsis>
   <para>
diff --git a/reference/maxdb/functions/maxdb-stmt-errno.xml b/reference/maxdb/functions/maxdb-stmt-errno.xml
index 5f9189f731..8b64ffc774 100644
--- a/reference/maxdb/functions/maxdb-stmt-errno.xml
+++ b/reference/maxdb/functions/maxdb-stmt-errno.xml
@@ -14,9 +14,9 @@
    <type>int</type><methodname>maxdb_stmt_errno</methodname>
    <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
-   <ooclass><classname>stmt</classname></ooclass>
+   <ooclass><classname>maxdb_stmt</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>errno</varname></fieldsynopsis>
   </classsynopsis>
   <para>
diff --git a/reference/maxdb/functions/maxdb-stmt-error.xml b/reference/maxdb/functions/maxdb-stmt-error.xml
index 4ef43720c5..6ad560aa91 100644
--- a/reference/maxdb/functions/maxdb-stmt-error.xml
+++ b/reference/maxdb/functions/maxdb-stmt-error.xml
@@ -14,9 +14,9 @@
    <type>string</type><methodname>maxdb_stmt_error</methodname>
    <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
-   <ooclass><classname>stmt</classname></ooclass>
+   <ooclass><classname>maxdb_stmt</classname></ooclass>
    <fieldsynopsis><type>string</type><varname>error</varname></fieldsynopsis>
   </classsynopsis>
   <para>
diff --git a/reference/maxdb/functions/maxdb-stmt-init.xml b/reference/maxdb/functions/maxdb-stmt-init.xml
index dc88ee889e..257cee52e6 100644
--- a/reference/maxdb/functions/maxdb-stmt-init.xml
+++ b/reference/maxdb/functions/maxdb-stmt-init.xml
@@ -14,7 +14,7 @@
    <type>resource</type><methodname>maxdb_stmt_init</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <methodsynopsis>
diff --git a/reference/maxdb/functions/maxdb-stmt-num-rows.xml b/reference/maxdb/functions/maxdb-stmt-num-rows.xml
index 244128434b..3f8325db7a 100644
--- a/reference/maxdb/functions/maxdb-stmt-num-rows.xml
+++ b/reference/maxdb/functions/maxdb-stmt-num-rows.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.maxdb-stmt-num-rows">
  <refnamediv>
   <refname>maxdb_stmt_num_rows</refname>
-  <refname>stmt->num_rows</refname>
+  <refname>maxdb_stmt->num_rows</refname>
   <refpurpose>Return the number of rows in statements result set</refpurpose>
  </refnamediv>
 
@@ -14,9 +14,9 @@
    <type>int</type><methodname>maxdb_stmt_num_rows</methodname>
    <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
-   <ooclass><classname>stmt</classname></ooclass>
+   <ooclass><classname>maxdb_stmt</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>num_rows</varname></fieldsynopsis>
   </classsynopsis>
   <para>
diff --git a/reference/maxdb/functions/maxdb-stmt-param-count.xml b/reference/maxdb/functions/maxdb-stmt-param-count.xml
index 70047ab476..6d63b68c9e 100644
--- a/reference/maxdb/functions/maxdb-stmt-param-count.xml
+++ b/reference/maxdb/functions/maxdb-stmt-param-count.xml
@@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.maxdb-stmt-param-count">
  <refnamediv>
   <refname>maxdb_stmt_param_count</refname>
-  <refname>stmt->param_count</refname>
+  <refname>maxdb_stmt->param_count</refname>
   <refpurpose>Returns the number of parameter for the given statement</refpurpose>
  </refnamediv>
 
@@ -14,9 +14,9 @@
    <type>int</type><methodname>maxdb_stmt_param_count</methodname>
    <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
-   <ooclass><classname>stmt</classname></ooclass>
+   <ooclass><classname>maxdb_stmt</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>param_count</varname></fieldsynopsis>
   </classsynopsis>
   <para>
diff --git a/reference/maxdb/functions/maxdb-thread-id.xml b/reference/maxdb/functions/maxdb-thread-id.xml
index 8a2ed7be68..f37d9288f9 100644
--- a/reference/maxdb/functions/maxdb-thread-id.xml
+++ b/reference/maxdb/functions/maxdb-thread-id.xml
@@ -14,7 +14,7 @@
    <type>int</type><methodname>maxdb_thread_id</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>thread_id</varname></fieldsynopsis>
diff --git a/reference/maxdb/functions/maxdb-warning-count.xml b/reference/maxdb/functions/maxdb-warning-count.xml
index 75fc9b3eca..06f92fa96d 100644
--- a/reference/maxdb/functions/maxdb-warning-count.xml
+++ b/reference/maxdb/functions/maxdb-warning-count.xml
@@ -14,7 +14,7 @@
    <type>int</type><methodname>maxdb_warning_count</methodname>
    <methodparam><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
-  <para>Object oriented style (property):</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>maxdb</classname></ooclass>
    <fieldsynopsis><type>int</type><varname>warning_count</varname></fieldsynopsis>