[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-doc-cvs
Subject:    [DOC-CVS] [doc-en] master: Replace <function> with <methodname> in PDO (#816)
From:       Kamil Tekiela via GitHub <noreply () php ! net>
Date:       2022-06-27 20:47:21
Message-ID: 74Cft6ZzES8R1S9grBrPSVBBpbBNsLyQqQKGICjWY () main ! php ! net
[Download RAW message or body]

Author: Kamil Tekiela (kamil-tekiela)
Committer: GitHub (web-flow)
Pusher: Crell
Date: 2022-06-27T15:41:23-05:00

Commit: https://github.com/php/doc-en/commit/eae19eb5fe0f5bebcbce382ea7a505cedeb5a883
Raw diff: https://github.com/php/doc-en/commit/eae19eb5fe0f5bebcbce382ea7a505cedeb5a883.diff


Replace <function> with <methodname> in PDO (#816)

* Convert all <function> to <methodname> in PDO

* Convert all <function> to <methodname> in PDOStatement

* Convert all <function> to <methodname> in PDO general

Changed paths:
  M  reference/pdo/connections.xml
  M  reference/pdo/constants.xml
  M  reference/pdo/error-handling.xml
  M  reference/pdo/ini.xml
  M  reference/pdo/lobs.xml
  M  reference/pdo/pdo/begintransaction.xml
  M  reference/pdo/pdo/commit.xml
  M  reference/pdo/pdo/construct.xml
  M  reference/pdo/pdo/errorcode.xml
  M  reference/pdo/pdo/errorinfo.xml
  M  reference/pdo/pdo/exec.xml
  M  reference/pdo/pdo/getattribute.xml
  M  reference/pdo/pdo/getavailabledrivers.xml
  M  reference/pdo/pdo/lastinsertid.xml
  M  reference/pdo/pdo/prepare.xml
  M  reference/pdo/pdo/query.xml
  M  reference/pdo/pdo/quote.xml
  M  reference/pdo/pdo/rollback.xml
  M  reference/pdo/pdoexception.xml
  M  reference/pdo/pdostatement/bindcolumn.xml
  M  reference/pdo/pdostatement/bindparam.xml
  M  reference/pdo/pdostatement/bindvalue.xml
  M  reference/pdo/pdostatement/closecursor.xml
  M  reference/pdo/pdostatement/columncount.xml
  M  reference/pdo/pdostatement/debugdumpparams.xml
  M  reference/pdo/pdostatement/errorcode.xml
  M  reference/pdo/pdostatement/errorinfo.xml
  M  reference/pdo/pdostatement/execute.xml
  M  reference/pdo/pdostatement/fetch.xml
  M  reference/pdo/pdostatement/fetchall.xml
  M  reference/pdo/pdostatement/fetchcolumn.xml
  M  reference/pdo/pdostatement/fetchobject.xml
  M  reference/pdo/pdostatement/getattribute.xml
  M  reference/pdo/pdostatement/getcolumnmeta.xml
  M  reference/pdo/pdostatement/nextrowset.xml
  M  reference/pdo/pdostatement/rowcount.xml
  M  reference/pdo/pdostatement/setattribute.xml
  M  reference/pdo/pdostatement/setfetchmode.xml
  M  reference/pdo/transactions.xml


Diff:

diff --git a/reference/pdo/connections.xml b/reference/pdo/connections.xml
index 97cbdfafce2..019115c310a 100644
--- a/reference/pdo/connections.xml
+++ b/reference/pdo/connections.xml
@@ -130,7 +130,7 @@ $dbh = new PDO('mysql:host=localhost;dbname=test', $user, $pass, \
array(  If you wish to use persistent connections, you must set
    <constant>PDO::ATTR_PERSISTENT</constant> in the array of driver options
    passed to the PDO constructor. If setting this attribute with
-   <function>PDO::setAttribute</function> after instantiation of the
+   <methodname>PDO::setAttribute</methodname> after instantiation of the
    object, the driver will not use persistent connections.
   </para>
  </note>
diff --git a/reference/pdo/constants.xml b/reference/pdo/constants.xml
index c702d02c0cd..b811234b0cb 100644
--- a/reference/pdo/constants.xml
+++ b/reference/pdo/constants.xml
@@ -133,7 +133,7 @@
      Specifies that the fetch method shall return each row as an object with
      variable names that correspond to the column names returned in the result
      set. <constant>PDO::FETCH_LAZY</constant> creates the object variable names as \
                they are accessed.
-     Not valid inside <function>PDOStatement::fetchAll</function>.
+     Not valid inside <methodname>PDOStatement::fetchAll</methodname>.
     </simpara>
    </listitem>
   </varlistentry>
@@ -215,8 +215,8 @@
     <simpara>
      Specifies that the fetch method shall return TRUE and assign the values of
      the columns in the result set to the PHP variables to which they were
-     bound with the <function>PDOStatement::bindParam</function> or
-     <function>PDOStatement::bindColumn</function> methods.
+     bound with the <methodname>PDOStatement::bindParam</methodname> or
+     <methodname>PDOStatement::bindColumn</methodname> methods.
     </simpara>
    </listitem>
   </varlistentry>
@@ -271,7 +271,7 @@
    <listitem>
     <simpara>
      Allows completely customize the way data is treated on the fly (only 
-     valid inside <function>PDOStatement::fetchAll</function>).
+     valid inside <methodname>PDOStatement::fetchAll</methodname>).
     </simpara>
    </listitem>
   </varlistentry>
@@ -839,8 +839,8 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
     <simpara> 
      Corresponds to SQLSTATE '00000', meaning that the SQL statement was
      successfully issued with no errors or warnings.  This constant is for
-     your convenience when checking <function>PDO::errorCode</function> or
-     <function>PDOStatement::errorCode</function> to determine if an error
+     your convenience when checking <methodname>PDO::errorCode</methodname> or
+     <methodname>PDOStatement::errorCode</methodname> to determine if an error
      occurred.  You will usually know if this is the case by examining the
      return code from the method that raised the error condition anyway.
     </simpara>
@@ -931,7 +931,7 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
    </term>
    <listitem>
     <simpara>
-      Specifies that a function created with \
<function>PDO::sqliteCreateFunction</function> +      Specifies that a function \
                created with <methodname>PDO::sqliteCreateFunction</methodname>
       is deterministic, i.e. it always returns the same result given the same inputs \
within  a single SQL statement. (Available as of PHP 7.1.4.)
     </simpara>
diff --git a/reference/pdo/error-handling.xml b/reference/pdo/error-handling.xml
index 18c938d75e8..5f08d167285 100644
--- a/reference/pdo/error-handling.xml
+++ b/reference/pdo/error-handling.xml
@@ -14,12 +14,12 @@
    </para>
    <para>
      Prior to PHP 8.0.0, this was the default mode. PDO will simply set the error \
                code for you
-     to inspect using the <function>PDO::errorCode</function> and
-     <function>PDO::errorInfo</function> methods on both the
+     to inspect using the <methodname>PDO::errorCode</methodname> and
+     <methodname>PDO::errorInfo</methodname> methods on both the
      statement and database objects; if the error resulted from a call on a
      statement object, you would invoke the
-     <function>PDOStatement::errorCode</function> or
-     <function>PDOStatement::errorInfo</function>
+     <methodname>PDOStatement::errorCode</methodname> or
+     <methodname>PDOStatement::errorInfo</methodname>
      method on that object. If the error resulted from a call on the
      database object, you would invoke those methods on the database object
      instead.
@@ -66,10 +66,10 @@
  <para>
   PDO standardizes on using SQL-92 SQLSTATE error code strings; individual
   PDO drivers are responsible for mapping their native codes to the
-  appropriate SQLSTATE codes.   The <function>PDO::errorCode</function>
+  appropriate SQLSTATE codes.   The <methodname>PDO::errorCode</methodname>
   method returns a single SQLSTATE code. If you need more specific
   information about an error, PDO also offers an
-  <function>PDO::errorInfo</function> method which returns an array
+  <methodname>PDO::errorInfo</methodname> method which returns an array
   containing the SQLSTATE code, the driver specific error code and driver
   specific error string.
  </para>
@@ -98,7 +98,7 @@ try {
  </para>
  <note>
   <para>
-   <function>PDO::__construct</function> will always throw a \
<classname>PDOException</classname> if the connection fails +   \
<methodname>PDO::__construct</methodname> will always throw a \
<classname>PDOException</classname> if the connection fails  regardless of which \
<constant>PDO::ATTR_ERRMODE</constant> is currently set. Uncaught Exceptions are \
fatal.  </para>
  </note>
diff --git a/reference/pdo/ini.xml b/reference/pdo/ini.xml
index 9fbd03d3871..fe354067c39 100644
--- a/reference/pdo/ini.xml
+++ b/reference/pdo/ini.xml
@@ -39,7 +39,7 @@
    </term>
    <listitem>
     <para>
-     Defines DSN alias. See <function>PDO::__construct</function> for
+     Defines DSN alias. See <methodname>PDO::__construct</methodname> for
      thorough explanation.
     </para>
    </listitem>
diff --git a/reference/pdo/lobs.xml b/reference/pdo/lobs.xml
index 76574e56c2f..1776c24d73b 100644
--- a/reference/pdo/lobs.xml
+++ b/reference/pdo/lobs.xml
@@ -10,8 +10,8 @@
    "large". Large objects can be either textual or binary in nature. PDO
    allows you to work with this large data type by using the
    <constant>PDO::PARAM_LOB</constant>
-   type code in your <function>PDOStatement::bindParam</function> or
-   <function>PDOStatement::bindColumn</function> calls.
+   type code in your <methodname>PDOStatement::bindParam</methodname> or
+   <methodname>PDOStatement::bindColumn</methodname> calls.
    <constant>PDO::PARAM_LOB</constant> tells
    PDO to map the data as a stream, so that you can manipulate it using the
    <link linkend="ref.stream">PHP Streams API</link>.
diff --git a/reference/pdo/pdo/begintransaction.xml \
b/reference/pdo/pdo/begintransaction.xml index 4dcb488efdf..6a053db6db9 100644
--- a/reference/pdo/pdo/begintransaction.xml
+++ b/reference/pdo/pdo/begintransaction.xml
@@ -17,8 +17,8 @@
   <para>
    Turns off autocommit mode.  While autocommit mode is turned off, changes
    made to the database via the PDO object instance are not committed until
-   you end the transaction by calling <function>PDO::commit</function>.
-   Calling <function>PDO::rollBack</function> will roll back all changes to
+   you end the transaction by calling <methodname>PDO::commit</methodname>.
+   Calling <methodname>PDO::rollBack</methodname> will roll back all changes to
    the database and return the connection to autocommit mode.
   </para>
   <para>
@@ -88,8 +88,8 @@ $dbh->rollBack();
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::commit</function></member>
-    <member><function>PDO::rollBack</function></member>
+    <member><methodname>PDO::commit</methodname></member>
+    <member><methodname>PDO::rollBack</methodname></member>
     <member><link linkend="pdo.transactions">Transactions and \
auto-commit</link></member>  </simplelist>
   </para>
diff --git a/reference/pdo/pdo/commit.xml b/reference/pdo/pdo/commit.xml
index e4494463818..0b09846d52a 100644
--- a/reference/pdo/pdo/commit.xml
+++ b/reference/pdo/pdo/commit.xml
@@ -16,7 +16,7 @@
   </methodsynopsis>
   <para>
    Commits a transaction, returning the database connection to autocommit
-   mode until the next call to <function>PDO::beginTransaction</function>
+   mode until the next call to <methodname>PDO::beginTransaction</methodname>
    starts a new transaction.
   </para>
  </refsect1>
@@ -111,8 +111,8 @@ $dbh->commit();
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::beginTransaction</function></member>
-    <member><function>PDO::rollBack</function></member>
+    <member><methodname>PDO::beginTransaction</methodname></member>
+    <member><methodname>PDO::rollBack</methodname></member>
     <member><link linkend="pdo.transactions">Transactions and \
auto-commit</link></member>  </simplelist>
   </para>
diff --git a/reference/pdo/pdo/construct.xml b/reference/pdo/pdo/construct.xml
index 7076ee51d1c..8bfd4f8bb32 100644
--- a/reference/pdo/pdo/construct.xml
+++ b/reference/pdo/pdo/construct.xml
@@ -110,7 +110,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <function>PDO::__construct</function> throws a \
<classname>PDOException</classname> if the attempt +   \
<methodname>PDO::__construct</methodname> throws a \
<classname>PDOException</classname> if the attempt  to connect to the requested \
database fails, regardless of which <constant>PDO::ATTR_ERRMODE</constant> is \
currently set.  </para>
  </refsect1>
diff --git a/reference/pdo/pdo/errorcode.xml b/reference/pdo/pdo/errorcode.xml
index 99081aec791..212ba454070 100644
--- a/reference/pdo/pdo/errorcode.xml
+++ b/reference/pdo/pdo/errorcode.xml
@@ -35,12 +35,12 @@
    class indicates that there is no subclass for that SQLSTATE.
   </para>
   <para>
-   <function>PDO::errorCode</function> only retrieves error codes for operations
+   <methodname>PDO::errorCode</methodname> only retrieves error codes for operations
    performed directly on the database handle. If you create a PDOStatement
-   object through <function>PDO::prepare</function> or
-   <function>PDO::query</function> and invoke an error on the statement
-   handle, <function>PDO::errorCode</function> will not reflect that error.
-   You must call <function>PDOStatement::errorCode</function> to return the error
+   object through <methodname>PDO::prepare</methodname> or
+   <methodname>PDO::query</methodname> and invoke an error on the statement
+   handle, <methodname>PDO::errorCode</methodname> will not reflect that error.
+   You must call <methodname>PDOStatement::errorCode</methodname> to return the \
error  code for an operation performed on a particular statement handle.
   </para>
   <para>
@@ -76,9 +76,9 @@ PDO::errorCode(): 42S02
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::errorInfo</function></member>
-    <member><function>PDOStatement::errorCode</function></member>
-    <member><function>PDOStatement::errorInfo</function></member>
+    <member><methodname>PDO::errorInfo</methodname></member>
+    <member><methodname>PDOStatement::errorCode</methodname></member>
+    <member><methodname>PDOStatement::errorInfo</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdo/errorinfo.xml b/reference/pdo/pdo/errorinfo.xml
index f6e805cfe72..ab019f106c8 100644
--- a/reference/pdo/pdo/errorinfo.xml
+++ b/reference/pdo/pdo/errorinfo.xml
@@ -24,7 +24,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>PDO::errorInfo</function> returns an array of error information
+   <methodname>PDO::errorInfo</methodname> returns an array of error information
    about the last operation performed by this database handle. The array
    consists of at least the following fields:
    <informaltable>
@@ -62,13 +62,13 @@
   </note>
 
   <para>
-   <function>PDO::errorInfo</function> only retrieves error information for
+   <methodname>PDO::errorInfo</methodname> only retrieves error information for
    operations performed directly on the database handle. If you create a
-   PDOStatement object through <function>PDO::prepare</function> or
-   <function>PDO::query</function> and invoke an error on the statement
-   handle, <function>PDO::errorInfo</function> will not reflect the error
+   PDOStatement object through <methodname>PDO::prepare</methodname> or
+   <methodname>PDO::query</methodname> and invoke an error on the statement
+   handle, <methodname>PDO::errorInfo</methodname> will not reflect the error
    from the statement handle. You must call
-   <function>PDOStatement::errorInfo</function> to return the error
+   <methodname>PDOStatement::errorInfo</methodname> to return the error
    information for an operation performed on a particular statement handle.
   </para>
  </refsect1>
@@ -109,9 +109,9 @@ Array
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::errorCode</function></member>
-    <member><function>PDOStatement::errorCode</function></member>
-    <member><function>PDOStatement::errorInfo</function></member>
+    <member><methodname>PDO::errorCode</methodname></member>
+    <member><methodname>PDOStatement::errorCode</methodname></member>
+    <member><methodname>PDOStatement::errorInfo</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdo/exec.xml b/reference/pdo/pdo/exec.xml
index d2486fec63d..1914e7d97f6 100644
--- a/reference/pdo/pdo/exec.xml
+++ b/reference/pdo/pdo/exec.xml
@@ -15,17 +15,17 @@
   </methodsynopsis>
 
   <para>
-   <function>PDO::exec</function> executes an SQL statement in
+   <methodname>PDO::exec</methodname> executes an SQL statement in
    a single function call, returning the number of rows affected by the
    statement.
   </para>
   <para>
-   <function>PDO::exec</function> does not return results from a SELECT
+   <methodname>PDO::exec</methodname> does not return results from a SELECT
    statement. For a SELECT statement that you only need to issue once
-   during your program, consider issuing <function>PDO::query</function>.
+   during your program, consider issuing <methodname>PDO::query</methodname>.
    For a statement that you need to issue multiple times, prepare 
-   a PDOStatement object with <function>PDO::prepare</function> and issue
-   the statement with <function>PDOStatement::execute</function>.
+   a PDOStatement object with <methodname>PDO::prepare</methodname> and issue
+   the statement with <methodname>PDOStatement::execute</methodname>.
   </para>
 
  </refsect1>
@@ -50,15 +50,15 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>PDO::exec</function> returns the number of rows that were modified
+   <methodname>PDO::exec</methodname> returns the number of rows that were modified
    or deleted by the SQL statement you issued. If no rows were affected, 
-   <function>PDO::exec</function> returns <literal>0</literal>. 
+   <methodname>PDO::exec</methodname> returns <literal>0</literal>. 
   </para>
 
   &return.falseproblem;
   <para>
    The following example incorrectly relies on the return value of
-   <function>PDO::exec</function>, wherein a statement that affected 0 rows
+   <methodname>PDO::exec</methodname>, wherein a statement that affected 0 rows
    results in a call to <function>die</function>:
    <programlisting role="php">
 <![CDATA[
@@ -108,9 +108,9 @@ Deleted 1 rows.
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDO::query</function></member>
-    <member><function>PDOStatement::execute</function></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDO::query</methodname></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdo/getattribute.xml b/reference/pdo/pdo/getattribute.xml
index 6cc22e11d24..11fa8aa1378 100644
--- a/reference/pdo/pdo/getattribute.xml
+++ b/reference/pdo/pdo/getattribute.xml
@@ -17,7 +17,7 @@
   <para>
    This function returns the value of a database connection attribute. To
    retrieve PDOStatement attributes, refer to
-   <function>PDOStatement::getAttribute</function>.
+   <methodname>PDOStatement::getAttribute</methodname>.
   </para>
 
   <para>
@@ -109,9 +109,9 @@ Use the PEAR Coding Standards
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::setAttribute</function></member>
-    <member><function>PDOStatement::getAttribute</function></member>
-    <member><function>PDOStatement::setAttribute</function></member>
+    <member><methodname>PDO::setAttribute</methodname></member>
+    <member><methodname>PDOStatement::getAttribute</methodname></member>
+    <member><methodname>PDOStatement::setAttribute</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdo/getavailabledrivers.xml \
b/reference/pdo/pdo/getavailabledrivers.xml index df809fbd108..dee72b8beec 100644
--- a/reference/pdo/pdo/getavailabledrivers.xml
+++ b/reference/pdo/pdo/getavailabledrivers.xml
@@ -21,7 +21,7 @@
   <para>
    This function returns all currently available PDO drivers which can be used
    in <parameter>DSN</parameter> parameter of
-   <function>PDO::__construct</function>.
+   <methodname>PDO::__construct</methodname>.
   </para>
 
  </refsect1>
@@ -34,7 +34,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>PDO::getAvailableDrivers</function> returns an array of PDO driver \
names. If +   <methodname>PDO::getAvailableDrivers</methodname> returns an array of \
PDO driver names. If  no drivers are available, it returns an empty array.
   </para>
  </refsect1>
@@ -43,7 +43,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title>A <function>PDO::getAvailableDrivers</function> example</title>
+    <title>A <methodname>PDO::getAvailableDrivers</methodname> example</title>
     <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/pdo/pdo/lastinsertid.xml b/reference/pdo/pdo/lastinsertid.xml
index e4bf079b5bd..9e50a37c885 100644
--- a/reference/pdo/pdo/lastinsertid.xml
+++ b/reference/pdo/pdo/lastinsertid.xml
@@ -49,19 +49,19 @@
   &reftitle.returnvalues;
   <para>
    If a sequence name was not specified for the <parameter>name</parameter>
-   parameter, <function>PDO::lastInsertId</function> returns a
+   parameter, <methodname>PDO::lastInsertId</methodname> returns a
    string representing the row ID of the last row that was inserted into
    the database.
   </para>
   <para>
    If a sequence name was specified for the <parameter>name</parameter>
-   parameter, <function>PDO::lastInsertId</function> returns a
+   parameter, <methodname>PDO::lastInsertId</methodname> returns a
    string representing the last value retrieved from the specified sequence
    object.
   </para>
   <para>
    If the PDO driver does not support this capability,
-   <function>PDO::lastInsertId</function> triggers an
+   <methodname>PDO::lastInsertId</methodname> triggers an
    <literal>IM001</literal> SQLSTATE.
   </para>
  </refsect1>
diff --git a/reference/pdo/pdo/prepare.xml b/reference/pdo/pdo/prepare.xml
index 80d7e916bde..92bb7ea4d64 100644
--- a/reference/pdo/pdo/prepare.xml
+++ b/reference/pdo/pdo/prepare.xml
@@ -17,7 +17,7 @@
 
   <para>
    Prepares an SQL statement to be executed by the
-   <function>PDOStatement::execute</function> method. The statement template can
+   <methodname>PDOStatement::execute</methodname> method. The statement template can
    contain zero or more named (:name) or question mark (?) parameter markers
    for which real values will be substituted when the statement is executed.
    Both named and question mark parameter markers cannot be used within the same
@@ -27,7 +27,7 @@
   </para>
   <para>
    You must include a unique parameter marker for each value you wish to pass
-   in to the statement when you call <function>PDOStatement::execute</function>.
+   in to the statement when you call <methodname>PDOStatement::execute</methodname>.
    You cannot use a named parameter marker of the same name more than once in a \
prepared  statement, unless emulation mode is on.
   </para>
@@ -40,12 +40,12 @@
    </para>
   </note>
   <para>
-   Calling <function>PDO::prepare</function> and
-   <function>PDOStatement::execute</function> for statements that will be
+   Calling <methodname>PDO::prepare</methodname> and
+   <methodname>PDOStatement::execute</methodname> for statements that will be
    issued multiple times with different parameter values optimizes the
    performance of your application by allowing the driver to negotiate
-   client and/or server side caching of the query plan and meta information. Also, \
                calling <function>PDO::prepare</function> and
-   <function>PDOStatement::execute</function> helps to prevent SQL injection attacks \
by eliminating the need to +   client and/or server side caching of the query plan \
and meta information. Also, calling <methodname>PDO::prepare</methodname> and +   \
<methodname>PDOStatement::execute</methodname> helps to prevent SQL injection attacks \
by eliminating the need to  manually quote and escape the parameters.
   </para>
   <para>
@@ -106,16 +106,16 @@
   &reftitle.returnvalues;
   <para>
    If the database server successfully prepares the statement,
-   <function>PDO::prepare</function> returns a
+   <methodname>PDO::prepare</methodname> returns a
    <classname>PDOStatement</classname> object.
    If the database server cannot successfully prepare the statement,
-   <function>PDO::prepare</function> returns &false; or emits
+   <methodname>PDO::prepare</methodname> returns &false; or emits
    <classname>PDOException</classname> (depending on <link \
linkend="pdo.error-handling">error handling</link>).  </para>
   <note>
    <para>
     Emulated prepared statements does not communicate with the database server
-    so <function>PDO::prepare</function> does not check the statement.
+    so <methodname>PDO::prepare</methodname> does not check the statement.
    </para>
   </note>
  </refsect1>
@@ -180,9 +180,9 @@ $performanceIssues = $sth->fetchAll();
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::exec</function></member>
-    <member><function>PDO::query</function></member>
-    <member><function>PDOStatement::execute</function></member>
+    <member><methodname>PDO::exec</methodname></member>
+    <member><methodname>PDO::query</methodname></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdo/query.xml b/reference/pdo/pdo/query.xml
index b70529742b2..e7ed7881ae6 100644
--- a/reference/pdo/pdo/query.xml
+++ b/reference/pdo/pdo/query.xml
@@ -38,28 +38,28 @@
   </methodsynopsis>
 
   <para>
-   <function>PDO::query</function> prepares and executes an SQL statement in
+   <methodname>PDO::query</methodname> prepares and executes an SQL statement in
    a single function call, returning the statement as a \
<classname>PDOStatement</classname> object.  </para>
   <para>
    For a query that you need to issue multiple times, you will realize better
    performance if you prepare a <classname>PDOStatement</classname> object using
-   <function>PDO::prepare</function> and issue the statement with multiple
-   calls to <function>PDOStatement::execute</function>.
+   <methodname>PDO::prepare</methodname> and issue the statement with multiple
+   calls to <methodname>PDOStatement::execute</methodname>.
   </para>
   <para>
    If you do not fetch all of the data in a result set before issuing your
-   next call to <function>PDO::query</function>, your call may fail. Call
-   <function>PDOStatement::closeCursor</function> to release the database
+   next call to <methodname>PDO::query</methodname>, your call may fail. Call
+   <methodname>PDOStatement::closeCursor</methodname> to release the database
    resources associated with the <classname>PDOStatement</classname> object before \
                issuing your
-   next call to <function>PDO::query</function>.
+   next call to <methodname>PDO::query</methodname>.
   </para>
 
   <note>
    <para>
     If the <parameter>query</parameter> contains placeholders, the statement
-    must be prepared and executed separately using <function>PDO::prepare</function> \
                and 
-    <function>PDOStatement::execute</function> methods.
+    must be prepared and executed separately using \
<methodname>PDO::prepare</methodname> and  +    \
<methodname>PDOStatement::execute</methodname> methods.  </para>
   </note>
 
@@ -75,11 +75,11 @@
         The SQL statement to prepare and execute.
        </para>
        <para>
-        If the SQL contains placeholders, <function>PDO::prepare</function> and 
-        <function>PDOStatement::execute</function> must be used instead.
+        If the SQL contains placeholders, <methodname>PDO::prepare</methodname> and 
+        <methodname>PDOStatement::execute</methodname> must be used instead.
         Alternatively, the SQL can be prepared manually before calling 
-        <function>PDO::query</function>, with the data properly formatted using
-        <function>PDO::quote</function> if the driver supports it.
+        <methodname>PDO::query</methodname>, with the data properly formatted using
+        <methodname>PDO::quote</methodname> if the driver supports it.
        </para>
       </listitem>
      </varlistentry>
@@ -112,7 +112,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title>SQL with no placeholders can be executed using \
<function>PDO::query</function></title> +    <title>SQL with no placeholders can be \
executed using <methodname>PDO::query</methodname></title>  <programlisting \
role="php">  <![CDATA[
 <?php
@@ -146,9 +146,9 @@ watermelon      pink    90
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::exec</function></member>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDOStatement::execute</function></member>
+    <member><methodname>PDO::exec</methodname></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdo/quote.xml b/reference/pdo/pdo/quote.xml
index 3b3ba6562a0..78e00336ac8 100644
--- a/reference/pdo/pdo/quote.xml
+++ b/reference/pdo/pdo/quote.xml
@@ -16,15 +16,15 @@
   </methodsynopsis>
 
   <para>
-   <function>PDO::quote</function> places quotes around the input string (if
+   <methodname>PDO::quote</methodname> places quotes around the input string (if
    required) and escapes special characters within the input string, using a
    quoting style appropriate to the underlying driver.
   </para>
   <para>
    If you are using this function to build SQL statements, you are
    <emphasis>strongly</emphasis> recommended to use
-   <function>PDO::prepare</function> to prepare SQL statements with bound
-   parameters instead of using <function>PDO::quote</function> to interpolate
+   <methodname>PDO::prepare</methodname> to prepare SQL statements with bound
+   parameters instead of using <methodname>PDO::quote</methodname> to interpolate
    user input into an SQL statement.  Prepared statements with bound parameters
    are not only more portable, more convenient, immune to SQL injection, but
    are often much faster to execute than interpolated queries, as both the
@@ -163,8 +163,8 @@ Quoted string: 'Co''mpl''''ex "st''"ring'
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDOStatement::execute</function></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdo/rollback.xml b/reference/pdo/pdo/rollback.xml
index 814f531c843..1954513b6db 100644
--- a/reference/pdo/pdo/rollback.xml
+++ b/reference/pdo/pdo/rollback.xml
@@ -17,7 +17,7 @@
 
   <para>
    Rolls back the current transaction, as initiated by
-   <function>PDO::beginTransaction</function>.
+   <methodname>PDO::beginTransaction</methodname>.
   </para>
   <para>
    If the database was set to autocommit mode, this function will restore
@@ -89,8 +89,8 @@ $dbh->rollBack();
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::beginTransaction</function></member>
-    <member><function>PDO::commit</function></member>
+    <member><methodname>PDO::beginTransaction</methodname></member>
+    <member><methodname>PDO::commit</methodname></member>
     <member><link linkend="pdo.transactions">Transactions and \
auto-commit</link></member>  </simplelist>
   </para>
diff --git a/reference/pdo/pdoexception.xml b/reference/pdo/pdoexception.xml
index 0923fb96f73..8b6b7f2232c 100644
--- a/reference/pdo/pdoexception.xml
+++ b/reference/pdo/pdoexception.xml
@@ -73,8 +73,8 @@
      <term><varname>errorInfo</varname></term>
      <listitem>
       <para>
-       Corresponds to <function>PDO::errorInfo</function> or
-       <function>PDOStatement::errorInfo</function>
+       Corresponds to <methodname>PDO::errorInfo</methodname> or
+       <methodname>PDOStatement::errorInfo</methodname>
       </para>
      </listitem>
     </varlistentry><!-- }}} -->
@@ -83,7 +83,7 @@
      <listitem>
       <para>
        <literal>SQLSTATE</literal> error code. Use
-       <function>Exception::getCode</function> to access it.
+       <methodname>Exception::getCode</methodname> to access it.
       </para>
      </listitem>
     </varlistentry><!-- }}} -->
diff --git a/reference/pdo/pdostatement/bindcolumn.xml \
b/reference/pdo/pdostatement/bindcolumn.xml index 21819e391de..0b7fbef0b62 100644
--- a/reference/pdo/pdostatement/bindcolumn.xml
+++ b/reference/pdo/pdostatement/bindcolumn.xml
@@ -19,22 +19,22 @@
   </methodsynopsis>
 
   <para>
-   <function>PDOStatement::bindColumn</function> arranges to have a
+   <methodname>PDOStatement::bindColumn</methodname> arranges to have a
    particular variable bound to a given column in the result-set from a
-   query.  Each call to <function>PDOStatement::fetch</function> or
-   <function>PDOStatement::fetchAll</function> will update all the variables
+   query.  Each call to <methodname>PDOStatement::fetch</methodname> or
+   <methodname>PDOStatement::fetchAll</methodname> will update all the variables
    that are bound to columns.
   </para>
   <note>
    <para>
     Since information about the columns is not always available to PDO until
     the statement is executed, portable applications should call this
-    function <emphasis>after</emphasis> <function>PDOStatement::execute</function>.
+    function <emphasis>after</emphasis> \
<methodname>PDOStatement::execute</methodname>.  </para>
    <para>
     However, to be able to bind a LOB column as a stream when using the
     <emphasis>PgSQL driver</emphasis>, applications should call this method
-    <emphasis>before</emphasis> calling <function>PDOStatement::execute</function>,
+    <emphasis>before</emphasis> calling \
<methodname>PDOStatement::execute</methodname>,  otherwise the large object OID will \
be returned as an integer.  </para>
   </note>
@@ -147,10 +147,10 @@ strawberry      red     25
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDOStatement::execute</function></member>
-    <member><function>PDOStatement::fetch</function></member>
-    <member><function>PDOStatement::fetchAll</function></member>
-    <member><function>PDOStatement::fetchColumn</function></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
+    <member><methodname>PDOStatement::fetch</methodname></member>
+    <member><methodname>PDOStatement::fetchAll</methodname></member>
+    <member><methodname>PDOStatement::fetchColumn</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/bindparam.xml \
b/reference/pdo/pdostatement/bindparam.xml index 61d8922bcee..a2e86c9250a 100644
--- a/reference/pdo/pdostatement/bindparam.xml
+++ b/reference/pdo/pdostatement/bindparam.xml
@@ -20,9 +20,9 @@
   <para>
    Binds a PHP variable to a corresponding named or question mark placeholder
    in the SQL statement that was used to prepare the statement.  Unlike
-   <function>PDOStatement::bindValue</function>, the variable is bound as a
+   <methodname>PDOStatement::bindValue</methodname>, the variable is bound as a
    reference and will only be evaluated at the time that
-   <function>PDOStatement::execute</function> is called.
+   <methodname>PDOStatement::execute</methodname> is called.
   </para>
   <para>
    Most parameters are input parameters, that is, parameters that are used
@@ -183,9 +183,9 @@ print("After pureeing fruit, the colour is: $colour");
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDOStatement::execute</function></member>
-    <member><function>PDOStatement::bindValue</function></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
+    <member><methodname>PDOStatement::bindValue</methodname></member>
    </simplelist>
   </para>
 
diff --git a/reference/pdo/pdostatement/bindvalue.xml \
b/reference/pdo/pdostatement/bindvalue.xml index bffc7f22c3a..44684be4d04 100644
--- a/reference/pdo/pdostatement/bindvalue.xml
+++ b/reference/pdo/pdostatement/bindvalue.xml
@@ -111,9 +111,9 @@ $sth->execute();
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDOStatement::execute</function></member>
-    <member><function>PDOStatement::bindParam</function></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
+    <member><methodname>PDOStatement::bindParam</methodname></member>
    </simplelist>
   </para>
 
diff --git a/reference/pdo/pdostatement/closecursor.xml \
b/reference/pdo/pdostatement/closecursor.xml index 436df9e2701..89421dcf8c4 100644
--- a/reference/pdo/pdostatement/closecursor.xml
+++ b/reference/pdo/pdostatement/closecursor.xml
@@ -15,7 +15,7 @@
   </methodsynopsis>
 
   <para>
-   <function>PDOStatement::closeCursor</function> frees up the connection
+   <methodname>PDOStatement::closeCursor</methodname> frees up the connection
    to the server so that other SQL statements may be issued, but leaves the
    statement in a state that enables it to be executed again.
   </para>
@@ -26,7 +26,7 @@
    the problem may manifest itself in an out-of-sequence error.
   </para>
   <para>
-   <function>PDOStatement::closeCursor</function> is implemented either as an
+   <methodname>PDOStatement::closeCursor</methodname> is implemented either as an
    optional driver specific method (allowing for maximum efficiency), or as
    the generic PDO fallback if no driver specific function is installed.
    The PDO generic fallback is semantically the same as writing the following
@@ -62,13 +62,13 @@ do {
   &reftitle.examples;
   <para>
    <example>
-    <title>A <function>PDOStatement::closeCursor</function> example</title>
+    <title>A <methodname>PDOStatement::closeCursor</methodname> example</title>
     <para>
      In the following example, the <varname>$stmt</varname> PDOStatement
      object returns multiple rows but the application fetches only the first
      row, leaving the PDOStatement object in a state of having unfetched rows.
      To ensure that the application will work with all database drivers, the
-     author inserts a call to <function>PDOStatement::closeCursor</function>
+     author inserts a call to <methodname>PDOStatement::closeCursor</methodname>
      on <varname>$stmt</varname> before executing the
      <varname>$otherStmt</varname> PDOStatement object.
     </para>
@@ -103,7 +103,7 @@ $otherStmt->execute();
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDOStatement::execute</function></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/columncount.xml \
b/reference/pdo/pdostatement/columncount.xml index b83cabdb101..8130f2975fb 100644
--- a/reference/pdo/pdostatement/columncount.xml
+++ b/reference/pdo/pdostatement/columncount.xml
@@ -15,17 +15,17 @@
   </methodsynopsis>
 
   <para>
-   Use <function>PDOStatement::columnCount</function> to return the number
+   Use <methodname>PDOStatement::columnCount</methodname> to return the number
    of columns in the result set represented by the PDOStatement object.
   </para>
   <para>
-   If the PDOStatement object was returned from <function>PDO::query</function>,
+   If the PDOStatement object was returned from <methodname>PDO::query</methodname>,
    the column count is immediately available.
   </para>
   <para>
    If the PDOStatement object was returned from
-   <function>PDO::prepare</function>, an accurate column count will not be
-   available until you invoke <function>PDOStatement::execute</function>.
+   <methodname>PDO::prepare</methodname>, an accurate column count will not be
+   available until you invoke <methodname>PDOStatement::execute</methodname>.
   </para>
  </refsect1>
 
@@ -39,7 +39,7 @@
   <para>
    Returns the number of columns in the result set represented by the
    PDOStatement object, even if the result set is empty. If there is no result set,
-   <function>PDOStatement::columnCount</function> returns <literal>0</literal>.
+   <methodname>PDOStatement::columnCount</methodname> returns <literal>0</literal>.
   </para>
  </refsect1>
 
@@ -49,7 +49,7 @@
    <example>
     <title>Counting columns</title>
     <para>
-     This example demonstrates how <function>PDOStatement::columnCount</function>
+     This example demonstrates how \
<methodname>PDOStatement::columnCount</methodname>  operates with and without a \
result set.  </para>
     <programlisting role="php">
@@ -88,9 +88,9 @@ After execute(), result set has 2 columns (should be 2)
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDOStatement::execute</function></member>
-    <member><function>PDOStatement::rowCount</function></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
+    <member><methodname>PDOStatement::rowCount</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/debugdumpparams.xml \
b/reference/pdo/pdostatement/debugdumpparams.xml index c4155a6b24a..ec5bb7454c7 \
                100644
--- a/reference/pdo/pdostatement/debugdumpparams.xml
+++ b/reference/pdo/pdostatement/debugdumpparams.xml
@@ -76,7 +76,7 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
-   <title><function>PDOStatement::debugDumpParams</function> example with named \
parameters</title> +   <title><methodname>PDOStatement::debugDumpParams</methodname> \
example with named parameters</title>  <programlisting role="php">
 <![CDATA[
 <?php
@@ -117,7 +117,7 @@ param_type=2
   </example>
 
   <example>
-   <title><function>PDOStatement::debugDumpParams</function> example with unnamed \
parameters</title> +   <title><methodname>PDOStatement::debugDumpParams</methodname> \
example with unnamed parameters</title>  <programlisting role="php">
 <![CDATA[
 <?php
@@ -166,9 +166,9 @@ param_type=2
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDOStatement::bindParam</function></member>
-    <member><function>PDOStatement::bindValue</function></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDOStatement::bindParam</methodname></member>
+    <member><methodname>PDOStatement::bindValue</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/errorcode.xml \
b/reference/pdo/pdostatement/errorcode.xml index afef0eca063..27d309c428a 100644
--- a/reference/pdo/pdostatement/errorcode.xml
+++ b/reference/pdo/pdostatement/errorcode.xml
@@ -23,8 +23,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Identical to <function>PDO::errorCode</function>, except that 
-   <function>PDOStatement::errorCode</function> only retrieves error codes
+   Identical to <methodname>PDO::errorCode</methodname>, except that 
+   <methodname>PDOStatement::errorCode</methodname> only retrieves error codes
    for operations performed with PDOStatement objects.
   </para>
  </refsect1>
@@ -59,9 +59,9 @@ PDOStatement::errorCode(): 42S02
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::errorCode</function></member>
-    <member><function>PDO::errorInfo</function></member>
-    <member><function>PDOStatement::errorInfo</function></member>
+    <member><methodname>PDO::errorCode</methodname></member>
+    <member><methodname>PDO::errorInfo</methodname></member>
+    <member><methodname>PDOStatement::errorInfo</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/errorinfo.xml \
b/reference/pdo/pdostatement/errorinfo.xml index 1f6362c0929..2eb5bc0a384 100644
--- a/reference/pdo/pdostatement/errorinfo.xml
+++ b/reference/pdo/pdostatement/errorinfo.xml
@@ -23,7 +23,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>PDOStatement::errorInfo</function> returns an array of
+   <methodname>PDOStatement::errorInfo</methodname> returns an array of
    error information about the last operation performed by this
    statement handle. The array consists of at least the following fields:
    <informaltable>
@@ -92,9 +92,9 @@ Array
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::errorCode</function></member>
-    <member><function>PDO::errorInfo</function></member>
-    <member><function>PDOStatement::errorCode</function></member>
+    <member><methodname>PDO::errorCode</methodname></member>
+    <member><methodname>PDO::errorInfo</methodname></member>
+    <member><methodname>PDOStatement::errorCode</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/execute.xml \
b/reference/pdo/pdostatement/execute.xml index fa0d700dbe9..6d391f4fb8b 100644
--- a/reference/pdo/pdostatement/execute.xml
+++ b/reference/pdo/pdostatement/execute.xml
@@ -17,8 +17,8 @@
    Execute the <link linkend="pdo.prepared-statements">prepared
    statement</link>. If the prepared statement included parameter markers, either:
    <itemizedlist>
-    <listitem><para><function>PDOStatement::bindParam</function> and/or
-     <function>PDOStatement::bindValue</function> has to be called to bind either \
variables or +    <listitem><para><methodname>PDOStatement::bindParam</methodname> \
and/or +     <methodname>PDOStatement::bindValue</methodname> has to be called to \
bind either variables or  values (respectively) to the parameter markers. Bound \
variables pass  their value as input and receive the output value, if any, of their
      associated parameter markers</para></listitem>
@@ -177,11 +177,11 @@ $sth->execute($params);
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDOStatement::bindParam</function></member>
-    <member><function>PDOStatement::fetch</function></member>
-    <member><function>PDOStatement::fetchAll</function></member>
-    <member><function>PDOStatement::fetchColumn</function></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDOStatement::bindParam</methodname></member>
+    <member><methodname>PDOStatement::fetch</methodname></member>
+    <member><methodname>PDOStatement::fetchAll</methodname></member>
+    <member><methodname>PDOStatement::fetchColumn</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/fetch.xml \
b/reference/pdo/pdostatement/fetch.xml index 473d48b780b..81e81527f67 100644
--- a/reference/pdo/pdostatement/fetch.xml
+++ b/reference/pdo/pdostatement/fetch.xml
@@ -48,7 +48,7 @@
         <listitem><para>
          <literal>PDO::FETCH_BOUND</literal>: returns &true; and assigns the
          values of the columns in your result set to the PHP variables to which
-         they were bound with the <function>PDOStatement::bindColumn</function>
+         they were bound with the <methodname>PDOStatement::bindColumn</methodname>
          method
         </para></listitem>
         <listitem><para>
@@ -108,7 +108,7 @@
        scrollable cursor for your PDOStatement object, you must set the
        <literal>PDO::ATTR_CURSOR</literal> attribute to
        <literal>PDO::CURSOR_SCROLL</literal> when you prepare the SQL
-       statement with <function>PDO::prepare</function>.
+       statement with <methodname>PDO::prepare</methodname>.
       </para>
      </listitem>
     </varlistentry>
@@ -126,7 +126,7 @@
        the <literal>cursor_orientation</literal> parameter is set to
        <literal>PDO::FETCH_ORI_REL</literal>, this value specifies the
        row to fetch relative to the cursor position before
-       <function>PDOStatement::fetch</function> was called.
+       <methodname>PDOStatement::fetch</methodname> was called.
       </para>
      </listitem>
     </varlistentry>
@@ -315,12 +315,12 @@ I am Bob.
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDOStatement::execute</function></member>
-    <member><function>PDOStatement::fetchAll</function></member>
-    <member><function>PDOStatement::fetchColumn</function></member>
-    <member><function>PDOStatement::fetchObject</function></member>
-    <member><function>PDOStatement::setFetchMode</function></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
+    <member><methodname>PDOStatement::fetchAll</methodname></member>
+    <member><methodname>PDOStatement::fetchColumn</methodname></member>
+    <member><methodname>PDOStatement::fetchObject</methodname></member>
+    <member><methodname>PDOStatement::setFetchMode</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/fetchall.xml \
b/reference/pdo/pdostatement/fetchall.xml index 669e20cb8db..08dcb8be122 100644
--- a/reference/pdo/pdostatement/fetchall.xml
+++ b/reference/pdo/pdostatement/fetchall.xml
@@ -43,7 +43,7 @@
      <listitem>
       <para>
        Controls the contents of the returned array as documented in
-       <function>PDOStatement::fetch</function>.
+       <methodname>PDOStatement::fetch</methodname>.
        Defaults to value of <constant>PDO::ATTR_DEFAULT_FETCH_MODE</constant>
        (which defaults to <constant>PDO::FETCH_BOTH</constant>)
       </para>
@@ -110,7 +110,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>PDOStatement::fetchAll</function> returns an array containing
+   <methodname>PDOStatement::fetchAll</methodname> returns an array containing
    all of the remaining rows in the result set. The array represents each
    row as either an array of column values or an object with properties
    corresponding to each column name. An empty array is returned if there
@@ -395,11 +395,11 @@ array(3) {
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::query</function></member>
-    <member><function>PDOStatement::fetch</function></member>
-    <member><function>PDOStatement::fetchColumn</function></member>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDOStatement::setFetchMode</function></member>
+    <member><methodname>PDO::query</methodname></member>
+    <member><methodname>PDOStatement::fetch</methodname></member>
+    <member><methodname>PDOStatement::fetchColumn</methodname></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDOStatement::setFetchMode</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/fetchcolumn.xml \
b/reference/pdo/pdostatement/fetchcolumn.xml index 03030d13b06..3e6833c29cf 100644
--- a/reference/pdo/pdostatement/fetchcolumn.xml
+++ b/reference/pdo/pdostatement/fetchcolumn.xml
@@ -22,10 +22,10 @@
 
   <note>
    <para>
-    <function>PDOStatement::fetchColumn</function> should not be used to
+    <methodname>PDOStatement::fetchColumn</methodname> should not be used to
     retrieve boolean columns, as it is impossible to distinguish a value of
     &false; from there being no more rows to retrieve. Use
-    <function>PDOStatement::fetch</function> instead.
+    <methodname>PDOStatement::fetch</methodname> instead.
    </para>
   </note>
  </refsect1>
@@ -39,7 +39,7 @@
      <listitem>
       <para>
        0-indexed number of the column you wish to retrieve from the row. If
-       no value is supplied, <function>PDOStatement::fetchColumn</function>
+       no value is supplied, <methodname>PDOStatement::fetchColumn</methodname>
        fetches the first column.
       </para>
      </listitem>
@@ -51,13 +51,13 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>PDOStatement::fetchColumn</function> returns a single column
+   <methodname>PDOStatement::fetchColumn</methodname> returns a single column
    from the next row of a result set or &false; if there are no more rows.
   </para>
   <warning>
    <para>
     There is no way to return another column from the same row if you
-    use <function>PDOStatement::fetchColumn</function> to retrieve data.
+    use <methodname>PDOStatement::fetchColumn</methodname> to retrieve data.
    </para>
   </warning>
  </refsect1>
@@ -99,11 +99,11 @@ colour = red
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::query</function></member>
-    <member><function>PDOStatement::fetch</function></member>
-    <member><function>PDOStatement::fetchAll</function></member>
-    <member><function>PDO::prepare</function></member>
-    <member><function>PDOStatement::setFetchMode</function></member>
+    <member><methodname>PDO::query</methodname></member>
+    <member><methodname>PDOStatement::fetch</methodname></member>
+    <member><methodname>PDOStatement::fetchAll</methodname></member>
+    <member><methodname>PDO::prepare</methodname></member>
+    <member><methodname>PDOStatement::setFetchMode</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/fetchobject.xml \
b/reference/pdo/pdostatement/fetchobject.xml index fc1d44d1556..3a53d628596 100644
--- a/reference/pdo/pdostatement/fetchobject.xml
+++ b/reference/pdo/pdostatement/fetchobject.xml
@@ -15,7 +15,7 @@
 
   <para>
    Fetches the next row and returns it as an object. This function is an
-   alternative to <function>PDOStatement::fetch</function> with
+   alternative to <methodname>PDOStatement::fetch</methodname> with
    <constant>PDO::FETCH_CLASS</constant> or
    <constant>PDO::FETCH_OBJ</constant> style.
   </para>
@@ -60,7 +60,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDOStatement::fetch</function></member>
+    <member><methodname>PDOStatement::fetch</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/getattribute.xml \
b/reference/pdo/pdostatement/getattribute.xml index b6c76a0cd52..5354888d702 100644
--- a/reference/pdo/pdostatement/getattribute.xml
+++ b/reference/pdo/pdostatement/getattribute.xml
@@ -55,9 +55,9 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::getAttribute</function></member>
-    <member><function>PDO::setAttribute</function></member>
-    <member><function>PDOStatement::setAttribute</function></member>
+    <member><methodname>PDO::getAttribute</methodname></member>
+    <member><methodname>PDO::setAttribute</methodname></member>
+    <member><methodname>PDOStatement::setAttribute</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/getcolumnmeta.xml \
b/reference/pdo/pdostatement/getcolumnmeta.xml index 2cc98435ced..45ab5900950 100644
--- a/reference/pdo/pdostatement/getcolumnmeta.xml
+++ b/reference/pdo/pdostatement/getcolumnmeta.xml
@@ -21,7 +21,7 @@
   <warning>
    <simpara>
     Some drivers may not implement
-    <function>PDOStatement::getColumnMeta</function>,
+    <methodname>PDOStatement::getColumnMeta</methodname>,
     as it is optional. However, all
     <link linkend="pdo.drivers">PDO drivers</link>
     documented in the manual implement this function.
@@ -71,7 +71,7 @@
        <entry><literal>driver:decl_type</literal></entry>
        <entry>The SQL type used to represent the column value in the database.
        If the column in the result set is the result of a function, this value
-       is not returned by <function>PDOStatement::getColumnMeta</function>.
+       is not returned by <methodname>PDOStatement::getColumnMeta</methodname>.
        </entry>
       </row>
       <row>
@@ -168,8 +168,8 @@ array(6) {
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDOStatement::columnCount</function></member>
-    <member><function>PDOStatement::rowCount</function></member>
+    <member><methodname>PDOStatement::columnCount</methodname></member>
+    <member><methodname>PDOStatement::rowCount</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/nextrowset.xml \
b/reference/pdo/pdostatement/nextrowset.xml index 2f2cfca5dcc..0bff88c036b 100644
--- a/reference/pdo/pdostatement/nextrowset.xml
+++ b/reference/pdo/pdostatement/nextrowset.xml
@@ -17,7 +17,7 @@
   <para>
    Some database servers support stored procedures that return more than one
    rowset (also known as a result set).
-   <function>PDOStatement::nextRowset</function> enables you to access the
+   <methodname>PDOStatement::nextRowset</methodname> enables you to access the
    second and subsequent rowsets associated with a PDOStatement object. Each
    rowset can have a different set of columns from the preceding rowset.
   </para>
@@ -99,10 +99,10 @@ banana   yellow
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDOStatement::columnCount</function></member>
-    <member><function>PDOStatement::execute</function></member>
-    <member><function>PDOStatement::getColumnMeta</function></member>
-    <member><function>PDO::query</function></member>
+    <member><methodname>PDOStatement::columnCount</methodname></member>
+    <member><methodname>PDOStatement::execute</methodname></member>
+    <member><methodname>PDOStatement::getColumnMeta</methodname></member>
+    <member><methodname>PDO::query</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/rowcount.xml \
b/reference/pdo/pdostatement/rowcount.xml index 177cfcc6298..1889c8e6f36 100644
--- a/reference/pdo/pdostatement/rowcount.xml
+++ b/reference/pdo/pdostatement/rowcount.xml
@@ -15,7 +15,7 @@
   </methodsynopsis>
 
   <para>
-   <function>PDOStatement::rowCount</function> returns the number of
+   <methodname>PDOStatement::rowCount</methodname> returns the number of
    rows affected by the last DELETE, INSERT, or UPDATE statement
    executed by the corresponding <literal>PDOStatement</literal> object. 
   </para>
@@ -54,7 +54,7 @@
    <example>
     <title>Return the number of deleted rows</title>
     <para>
-     <function>PDOStatement::rowCount</function> returns the number of
+     <methodname>PDOStatement::rowCount</methodname> returns the number of
      rows affected by a DELETE, INSERT, or UPDATE statement.
     </para>
     <programlisting role="php">
@@ -82,11 +82,11 @@ Deleted 9 rows.
    <example>
     <title>Counting rows returned by a SELECT statement</title>
     <para>
-     For most databases, <function>PDOStatement::rowCount</function> does not
+     For most databases, <methodname>PDOStatement::rowCount</methodname> does not
      return the number of rows affected by a SELECT statement. Instead, use
-     <function>PDO::query</function> to issue a SELECT COUNT(*) statement
+     <methodname>PDO::query</methodname> to issue a SELECT COUNT(*) statement
      with the same predicates as your intended SELECT statement, then use
-     <function>PDOStatement::fetchColumn</function> to retrieve the number
+     <methodname>PDOStatement::fetchColumn</methodname> to retrieve the number
      of matching rows. 
     </para>
     <programlisting role="php">
@@ -113,9 +113,9 @@ There are 2 matching records.
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDOStatement::columnCount</function></member>
-    <member><function>PDOStatement::fetchColumn</function></member>
-    <member><function>PDO::query</function></member>
+    <member><methodname>PDOStatement::columnCount</methodname></member>
+    <member><methodname>PDOStatement::fetchColumn</methodname></member>
+    <member><methodname>PDO::query</methodname></member>
    </simplelist>
   </para>
 
diff --git a/reference/pdo/pdostatement/setattribute.xml \
b/reference/pdo/pdostatement/setattribute.xml index c868f710843..78459616513 100644
--- a/reference/pdo/pdostatement/setattribute.xml
+++ b/reference/pdo/pdostatement/setattribute.xml
@@ -65,9 +65,9 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>PDO::getAttribute</function></member>
-    <member><function>PDO::setAttribute</function></member>
-    <member><function>PDOStatement::getAttribute</function></member>
+    <member><methodname>PDO::getAttribute</methodname></member>
+    <member><methodname>PDO::setAttribute</methodname></member>
+    <member><methodname>PDOStatement::getAttribute</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/pdo/pdostatement/setfetchmode.xml \
b/reference/pdo/pdostatement/setfetchmode.xml index 6eb44591326..f5864f78814 100644
--- a/reference/pdo/pdostatement/setfetchmode.xml
+++ b/reference/pdo/pdostatement/setfetchmode.xml
@@ -97,7 +97,7 @@
     <title>Setting the fetch mode</title>
     <para>
      The following example demonstrates how
-     <function>PDOStatement::setFetchMode</function> changes the default fetch
+     <methodname>PDOStatement::setFetchMode</methodname> changes the default fetch
      mode for a PDOStatement object.
     </para>
     <programlisting role="php">
@@ -130,7 +130,7 @@ pear    green   150
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function></function></member>
+    <member><methodname></methodname></member>
     <member>Or <link linkend="somethingelse">something else</link></member>
    </simplelist>
   </para>
diff --git a/reference/pdo/transactions.xml b/reference/pdo/transactions.xml
index 9d14d5020e7..f8cb1320c72 100644
--- a/reference/pdo/transactions.xml
+++ b/reference/pdo/transactions.xml
@@ -27,12 +27,12 @@
   connection.  Auto-commit mode means that every query that you run has its
   own implicit transaction, if the database supports it, or no transaction
   if the database doesn't support transactions. If you need a transaction,
-  you must use the <function>PDO::beginTransaction</function> method to
+  you must use the <methodname>PDO::beginTransaction</methodname> method to
   initiate one. If the underlying driver does not support transactions, a
   PDOException will be thrown (regardless of your error handling settings:
   this is always a serious error condition). Once you are in a transaction,
-  you may use <function>PDO::commit</function> or
-  <function>PDO::rollBack</function> to finish it, depending on the success
+  you may use <methodname>PDO::commit</methodname> or
+  <methodname>PDO::rollBack</methodname> to finish it, depending on the success
   of the code you run during the transaction.
  </para>
  <warning>
@@ -59,7 +59,7 @@
  <warning>
   <para>
    The automatic rollback only happens if you initiate the transaction via
-   <function>PDO::beginTransaction</function>. If you manually issue a
+   <methodname>PDO::beginTransaction</methodname>. If you manually issue a
    query that begins a transaction PDO has no way of knowing about it and
    thus cannot roll it back if something bad happens.
   </para>
@@ -72,8 +72,8 @@
     In addition to entering the basic data for that person, we also need to
     record their salary. It's pretty simple to make two separate updates,
     but by enclosing them within the
-    <function>PDO::beginTransaction</function> and
-    <function>PDO::commit</function> calls, we are guaranteeing that no one
+    <methodname>PDO::beginTransaction</methodname> and
+    <methodname>PDO::commit</methodname> calls, we are guaranteeing that no one
     else will be able to see those changes until they are complete. If
     something goes wrong, the catch block rolls back all changes made
     since the transaction was started, and then prints out an error

-- 
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic