From 55f6c006caf846e2e4ca1d6e63a70319d887f231 Mon Sep 17 00:00:00 2001
From: Anthony Bedford <abedford@php.net>
Date: Mon, 28 Sep 2009 14:14:56 +0000
Subject: [PATCH] Fixed bug #49535. client_version and client_info are
 properties, not methods. Corrected summary table accordingly, as well as main
 entries.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@288902 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mysqli/mysqli/get-client-info.xml   | 18 +++++++--------
 .../mysqli/mysqli/get-client-version.xml      | 14 ++++++-----
 reference/mysqli/summary.xml                  | 23 +++++++++----------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/reference/mysqli/mysqli/get-client-info.xml b/reference/mysqli/mysqli/get-client-info.xml
index 8b23badd0c..db328905ec 100644
--- a/reference/mysqli/mysqli/get-client-info.xml
+++ b/reference/mysqli/mysqli/get-client-info.xml
@@ -2,25 +2,25 @@
 <!-- $Revision$ -->
 <refentry xml:id="mysqli.get-client-info" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
-  <refname>mysqli::get_client_info</refname>
+  <refname>mysqli->get_client_info</refname>
   <refname>mysqli_get_client_info</refname>
   <refpurpose>Returns the MySQL client version as a string</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysqli::get_client_info</methodname>
-   <void />
-  </methodsynopsis>
+  <para>Object oriented style (property):</para>
+  <classsynopsis>
+   <ooclass><classname>mysqli</classname></ooclass>
+   <fieldsynopsis><type>string</type><varname>client_info</varname></fieldsynopsis>
+  </classsynopsis>
+  <para>Procedural style:</para>
   <methodsynopsis>
    <type>string</type><methodname>mysqli_get_client_info</methodname>
-   <void />
+   <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
   <para>
-   The <function>mysqli_get_client_info</function> function is used to
-   return a string representing the client version being used in the
-   MySQLi extension.
+   Returns a string that represents the MySQL client library version.
   </para>
  </refsect1>
 
diff --git a/reference/mysqli/mysqli/get-client-version.xml b/reference/mysqli/mysqli/get-client-version.xml
index 09d3b16cbb..8629e858d5 100644
--- a/reference/mysqli/mysqli/get-client-version.xml
+++ b/reference/mysqli/mysqli/get-client-version.xml
@@ -2,20 +2,22 @@
 <!-- $Revision$ -->
 <refentry xml:id="mysqli.get-client-version" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
-  <refname>mysqli::get_client_version</refname>
+  <refname>mysqli->client_version</refname>
   <refname>mysqli_get_client_version</refname>
   <refpurpose>Get MySQL client info</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mysqli::get_client_version</methodname>
-   <void/>
-  </methodsynopsis>
+  <para>Object oriented style (property):</para>
+  <classsynopsis>
+   <ooclass><classname>mysqli</classname></ooclass>
+   <fieldsynopsis><type>int</type><varname>client_version</varname></fieldsynopsis>
+  </classsynopsis>
+  <para>Procedural style:</para>
   <methodsynopsis>
    <type>int</type><methodname>mysqli_get_client_version</methodname>
-   <void/>
+   <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
   <para>
    Returns client version number as an integer.
diff --git a/reference/mysqli/summary.xml b/reference/mysqli/summary.xml
index c604a5cffa..3650736238 100644
--- a/reference/mysqli/summary.xml
+++ b/reference/mysqli/summary.xml
@@ -27,6 +27,17 @@
      <entry>N/A</entry>
      <entry>Gets the number of affected rows in a previous MySQL operation</entry>
     </row>
+    <row>
+     <entry><link linkend="mysqli.get-client-info">$mysqli->client_info</link></entry>
+     <entry><function>mysqli_get_client_info</function></entry>
+     <entry>N/A</entry>
+     <entry>Returns the MySQL client version as a string</entry>
+    </row>
+    <row>
+     <entry><link linkend="mysqli.get-client-version">$mysqli->client_version</link></entry>
+     <entry><function>mysqli_get_client_version</function></entry>
+     <entry>N/A</entry>
+     <entry>Returns MySQL client version info as an integer</entry>    </row>
     <row>
      <entry><link linkend="mysqli.connect-errno">$mysqli->connect_errno</link></entry>
      <entry><function>mysqli_connect_errno</function></entry>
@@ -164,18 +175,6 @@
      <entry>N/A</entry>
      <entry>Returns a character set object</entry>
     </row>
-    <row>
-     <entry><methodname>mysqli->get_client_info</methodname></entry>
-     <entry><function>mysqli_get_client_info</function></entry>
-     <entry>N/A</entry>
-     <entry>Returns the MySQL client version as a string</entry>
-    </row>
-    <row>
-     <entry><methodname>mysqli->get_client_version</methodname></entry>
-     <entry><function>mysqli_get_client_version</function></entry>
-     <entry>N/A</entry>
-     <entry>Get MySQL client info</entry>
-    </row>
     <row>
      <entry><methodname>mysqli->get_connection_stats</methodname></entry>
      <entry><function>mysqli_get_connection_stats</function></entry>