Bulk PDO and mysqli grammar fixes

appendices/migration72/new-features.xml

@@ -156,13 +156,13 @@ $db->quote('über', PDO::PARAM_STR | PDO::PARAM_STR_NATL);
  <sect2 xml:id="migration72.new-features.additional-emulated-prepares-debugging-info">
   <title>Additional emulated prepares debugging information for <link linkend="book.pdo">PDO</link></title>
 
-  <para>
+  <simpara>
    The <function>PDOStatement::debugDumpParams</function> method has been
    updated to include the SQL being sent to the DB, where the full, raw query
-   (including the replaced placeholders with their bounded values) will be
+   (including the replaced placeholders with their bound values) will be
    shown. This has been added to aid with debugging emulated prepares (and so
    it will only be available when emulated prepares are turned on).
-  </para>
+  </simpara>
  </sect2>
 
  <sect2 xml:id="migration72.new-features.extended-ops-in-ldap">

appendices/migration83/other-changes.xml

@@ -266,7 +266,7 @@
     <function>mysqli_fetch_object</function> now raises a
     <classname>ValueError</classname> instead of an <classname>Exception</classname>
     when the <parameter>constructor_args</parameter> argument is non empty with
-    the class not having constructor.
+    the class not having a constructor.
    </simpara>
 
    <simpara>
@@ -300,7 +300,7 @@
     <function>pg_fetch_object</function> now raises a
     <classname>ValueError</classname> instead of an <classname>Exception</classname>
     when the <parameter>constructor_args</parameter> argument is non empty with
-    the class not having constructor.
+    the class not having a constructor.
    </simpara>
 
    <para>

reference/mysqli/book.xml

@@ -29,10 +29,10 @@
    xlink:href="&url.mysql.docs;">&url.mysql.docs;</link>.
   </para>
 
-  <para>
-   Parts of this documentation included from MySQL manual with
-   permissions of Oracle Corporation.
-  </para>
+  <simpara>
+   Parts of this documentation were included from the MySQL manual with
+   permission of Oracle Corporation.
+  </simpara>
 
   <para>
    Examples use either the <link xlink:href="&url.mysql.example;">world</link>

reference/mysqli/configure.xml

@@ -35,14 +35,15 @@
    as your choice of client library for each extension.
   </para>
 
-  <para>
-   The MySQL Native Driver is the recommended client library option, as it
+  <simpara>
+   The MySQL Native Driver is the recommended client library option,
+   and as of PHP 8.2.0 the only option, as it
    results in improved performance and gives access to features not
    available when using the MySQL Client Library. Refer to
    <link linkend="mysqli.overview.mysqlnd">What is PHP's MySQL Native
    Driver?</link> for a brief overview of the advantages of MySQL Native
    Driver.
-  </para>
+  </simpara>
 
   <para>
    The <literal>/path/to/mysql_config</literal> represents the location of
@@ -64,7 +65,14 @@
     </thead>
     <tbody>
      <row>
-      <entry>5.4.x and above</entry>
+      <entry>8.2.0 and later</entry>
+      <entry>mysqlnd</entry>
+      <entry><option role="configure">--with-mysqli</option></entry>
+      <entry>libmysqlclient is not supported</entry>
+      <entry>mysqlnd is the only option</entry>
+     </row>
+     <row>
+      <entry>5.4.0 through 8.1.x</entry>
       <entry>mysqlnd</entry>
       <entry><option role="configure">--with-mysqli</option></entry>
       <entry><option role="configure">--with-mysqli=/path/to/mysql_config</option></entry>
@@ -88,15 +96,6 @@
    </tgroup>
   </table>
 
-  <para>
-   Note that it is possible to freely mix MySQL extensions and client
-   libraries. For example, it is possible to enable the MySQL extension
-   to use the MySQL Client Library (libmysqlclient), while configuring the
-   <literal>mysqli</literal> extension to use the MySQL Native Driver.
-   However, all permutations of extension and client library are
-   possible.
-  </para>
-
  </section>
 
  <section xml:id="mysqli.installation.windows">

reference/mysqli/constants.xml

@@ -448,9 +448,9 @@
      (<type>int</type>)
     </term>
     <listitem>
-     <para>
-      Field is part of an multi-index.
-     </para>
+     <simpara>
+      Field is part of a multi-index.
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry xml:id="constant.mysqli-group-flag">

reference/mysqli/ini.xml

@@ -147,10 +147,10 @@
     <type>int</type>
    </term>
    <listitem>
-    <para>
-     Maximum of persistent connections that can be made. Set to 
+    <simpara>
+     The maximum number of persistent connections that can be made. Set to
      0 for unlimited.
-    </para>
+    </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="ini.mysqli.max-links">
@@ -159,9 +159,9 @@
     <type>int</type>
    </term>
    <listitem>
-    <para>
-     The maximum number of MySQL connections per process.
-    </para>
+    <simpara>
+     The maximum number of connections per process.
+    </simpara>
    </listitem>
   </varlistentry>
    <varlistentry xml:id="ini.mysqli.default-port">

reference/mysqli/mysqli/change-user.xml

@@ -31,12 +31,12 @@
    In comparison to <methodname>mysqli::connect</methodname>, this method will
    not disconnect the current connection if the new connection cannot be opened.
   </para>
-  <para>
-   In order to successfully change users a valid <parameter>username</parameter> and
-   <parameter>password</parameter> parameters must be provided and that user must have
+  <simpara>
+   In order to successfully change users, a valid <parameter>username</parameter> and
+   <parameter>password</parameter> must be provided, and that user must have
    sufficient permissions to access the desired database. If for any reason authorization
    fails, the current user authentication will remain.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -172,13 +172,13 @@ Default database:
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
-   <para>
+   <simpara>
     Using this command will always cause the current database connection to
-    behave as if was a completely new database connection, regardless of if
+    behave as if it was a completely new database connection, regardless of if
     the operation was completed successfully. This reset includes performing
     a rollback on any active transactions, closing all temporary tables, and
     unlocking all locked tables.
-   </para>
+   </simpara>
   </note>
  </refsect1>
 

reference/mysqli/mysqli/dump-debug-info.xml

@@ -19,11 +19,11 @@
    <type>bool</type><methodname>mysqli_dump_debug_info</methodname>
    <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
   </methodsynopsis>
-  <para>
-   This function is designed to be executed by an user with the SUPER
+  <simpara>
+   This function is designed to be executed by a user with the SUPER
    privilege and is used to dump debugging information into the log for the
    MySQL Server relating to the connection.
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">

reference/mysqli/mysqli/errno.xml

@@ -33,10 +33,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   An error code value for the last call, if it failed. zero means no error
-   occurred.
-  </para>
+  <simpara>
+   An error code value for the last call, if it failed.
+   <literal>0</literal> means no error occurred.
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">

reference/mysqli/mysqli/init.xml

@@ -25,11 +25,11 @@
    <function>mysqli_options</function> and <function>mysqli_real_connect</function>.
   </para>
   <note>
-   <para>
-    Any subsequent calls to any mysqli function (except <function>mysqli_options</function>
+   <simpara>
+    Any subsequent call to any mysqli function (except <function>mysqli_options</function>
     and <function>mysqli_ssl_set</function>)
-    will fail until <function>mysqli_real_connect</function> was called.
-   </para>
+    will fail until <function>mysqli_real_connect</function> is called.
+   </simpara>
   </note>
  </refsect1>
 

reference/mysqli/mysqli/multi-query.xml

@@ -28,7 +28,7 @@
    Queries are sent in a single call to the database and processed sequentially.
    <methodname>mysqli_multi_query</methodname> waits for the first query to
    complete before returning control to PHP. In the meantime, the MySQL server
-   will continue processing the remaining queries asynchronously of PHP and make
+   will continue processing the remaining queries asynchronously from PHP and make
    the results available for fetching.
   </para>
   <para>

reference/mysqli/mysqli/options.xml

@@ -75,7 +75,7 @@
           </row>
           <row>
            <entry><constant>MYSQLI_INIT_COMMAND</constant></entry>
-           <entry>Command to execute after when connecting to MySQL server</entry>
+           <entry>Command to execute after establishing a connection to the MySQL server</entry>
           </row>
           <row>
            <entry><constant>MYSQLI_SET_CHARSET_NAME</constant></entry>

reference/mysqli/mysqli/ping.xml

@@ -80,8 +80,8 @@
       <entry>
        Both <methodname>mysqli::ping</methodname> and
        <function>mysqli_ping</function> are now deprecated.
-       The <literal>reconnect</literal> feature has not been available
-       as of PHP 8.2.0, making this function obsolete.
+       As of PHP 8.2.0, the <literal>reconnect</literal> feature is no longer
+       available, making this function obsolete.
       </entry>
      </row>
     </tbody>

reference/mysqli/mysqli/poll.xml

@@ -63,10 +63,10 @@
     <varlistentry>
      <term><parameter>reject</parameter></term>
      <listitem>
-      <para>
-      List of connections rejected because no asynchronous query
-      has been run on for which the function could poll results.
-      </para>
+      <simpara>
+      List of connections rejected because no pending asynchronous query exists
+      to poll.
+      </simpara>
      </listitem>
     </varlistentry>
     <varlistentry>

reference/mysqli/mysqli/rollback.xml

@@ -22,9 +22,9 @@
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
-  <para>
-   Rollbacks the current transaction for the database.
-  </para>
+  <simpara>
+   Rolls back the current transaction for the database.
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">

reference/mysqli/mysqli/select-db.xml

@@ -25,11 +25,11 @@
    the database connection.
   </para>
   <note>
-   <para>
+   <simpara>
     This function should only be used to change the default database for the
-    connection. You can select the default database with 4th parameter in 
+    connection. You can select the default database with the 4th parameter in
     <function>mysqli_connect</function>.
-   </para>
+   </simpara>
   </note>
  </refsect1>
 

reference/mysqli/mysqli/sqlstate.xml

@@ -23,10 +23,10 @@
    <link xlink:href="&url.mysql.docs.error;">&url.mysql.docs.error;</link>.
   </para>
   <note>
-   <para>
-    Note that not all MySQL errors are yet mapped to SQLSTATE's.
+   <simpara>
+    Note that not all MySQL errors are yet mapped to SQLSTATEs.
     The value <literal>HY000</literal> (general error) is used for unmapped errors.
-   </para>
+   </simpara>
   </note>
  </refsect1>
 

reference/mysqli/mysqli/stmt-init.xml

@@ -24,10 +24,10 @@
    <function>mysqli_stmt_prepare</function>.
   </para>
   <note>
-   <para>
-    Any subsequent calls to any mysqli_stmt function
-    will fail until <function>mysqli_stmt_prepare</function> was called.
-   </para>
+   <simpara>
+    Any subsequent call to any <classname>mysqli_stmt</classname> method
+    will fail until <function>mysqli_stmt_prepare</function> is called.
+   </simpara>
   </note>
  </refsect1>
 
@@ -42,9 +42,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   Returns an object.
-  </para>
+  <simpara>
+   Returns a <classname>mysqli_stmt</classname> object.
+  </simpara>
  </refsect1>
 
  <refsect1 role="seealso">

reference/mysqli/mysqli/use-result.xml

@@ -31,17 +31,17 @@
    from failing.
   </para>
   <note>
-   <para>
+   <simpara>
     The <function>mysqli_use_result</function> function does not transfer
-    the entire result set from the database and hence cannot be used functions
+    the entire result set from the database and hence cannot be used with functions
     such as <function>mysqli_data_seek</function> to move to a particular
     row within the set. To use this functionality, the result set must be
     stored using <function>mysqli_store_result</function>. One should not
     use <function>mysqli_use_result</function> if a lot of processing on
     the client side is performed, since this will tie up the server and
     prevent other threads from updating any tables from which the data is
     being fetched.
-   </para>
+   </simpara>
   </note>
  </refsect1>
 

reference/mysqli/mysqli_driver.xml

@@ -9,11 +9,11 @@
 <!-- {{{ ClassName intro -->
   <section xml:id="mysqli-driver.intro">
    &reftitle.intro;
-   <para>
+   <simpara>
     The <classname>mysqli_driver</classname> class is an instance of the monostate
-    pattern, i.e. there is only one driver which can be accessed though an arbitrary
+    pattern, i.e. there is only one driver which can be accessed through an arbitrary
     amount of <classname>mysqli_driver</classname> instances.
-   </para>
+   </simpara>
   </section>
 <!-- }}} -->
 

reference/mysqli/mysqli_result/fetch-fields.xml

@@ -89,7 +89,7 @@
       <entry>length</entry>
       <entry>
        The width of the field in bytes. For string columns,
-       the length value varies on the connection character set. For example,
+       the length value depends on the connection character set. For example,
        if the character set is <literal>latin1</literal>, a single-byte character set,
        the length value for a <literal>SELECT 'abc'</literal> query is 3.
        If the character set is <literal>utf8mb4</literal>, a multibyte character