diff --git a/reference/mysqlinfo/set.xml b/reference/mysqlinfo/set.xml
index c33e0f0026..337ca8cc30 100644
--- a/reference/mysqlinfo/set.xml
+++ b/reference/mysqlinfo/set.xml
@@ -18,7 +18,7 @@
 
  <book xml:id="mysql">
   <title>Overview of the MySQL PHP drivers</title>
-  
+
   <!-- Add a description of the overview here, as a preface? -->
 
   <chapter xml:id="mysqlinfo.terminology" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -101,7 +101,7 @@
 
    <para>
     Sometimes people use the terms connector and driver interchangeably,
-    this can be confusing. In the MySQL-related documentation the term 
+    this can be confusing. In the MySQL-related documentation the term
     <quote>driver</quote> is reserved for software that provides
     the database-specific part of a connector package.
    </para>
@@ -142,10 +142,10 @@
   <chapter xml:id="mysqlinfo.api.choosing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>Choosing an API</title>
    <para>
-    PHP offers three different APIs to connect to MySQL. Below we show 
-    the APIs provided by the mysqli, mysqli, and PDO extensions. Each code snippet 
-    creates a connection to a MySQL server running on "example.com" using 
-    the username "user" and the password "password". And a query is run to 
+    PHP offers three different APIs to connect to MySQL. Below we show
+    the APIs provided by the mysqli, mysqli, and PDO extensions. Each code snippet
+    creates a connection to a MySQL server running on "example.com" using
+    the username "user" and the password "password". And a query is run to
     greet the user.
    </para>
    <para>
@@ -182,12 +182,12 @@ echo htmlentities($row['_message']);
    </para>
    <para>
     It is recommended to use either the <link linkend="book.mysqli">mysqli</link>
-    or <link linkend="ref.pdo-mysql">PDO_MySQL</link> extensions. 
+    or <link linkend="ref.pdo-mysql">PDO_MySQL</link> extensions.
     It is not recommended to use the old <link linkend="ref.mysql">mysql</link>
     extension for new development. A detailed feature comparison matrix is provided
     below. The overall performance of all three extensions is considered to be
     about the same. Although the performance of the extension contributes only a fraction
-    of the total run time of a PHP web request. Often, the impact is as low as 0.1%.  
+    of the total run time of a PHP web request. Often, the impact is as low as 0.1%.
    </para>
    <para>
     <emphasis role="bold">Feature comparison</emphasis>
@@ -198,7 +198,7 @@ echo htmlentities($row['_message']);
       <row>
        <entry></entry>
        <entry>ext/mysqli</entry>
-       <entry>PDO_MySQL w/ mysqlnd</entry>
+       <entry>PDO_MySQL</entry>
        <entry>ext/mysql</entry>
       </row>
      </thead>
@@ -319,14 +319,14 @@ echo htmlentities($row['_message']);
   <chapter xml:id="mysqlinfo.library.choosing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>Choosing a library</title>
    <para>
-    The mysqli, PDO_MySQL and mysql PHP extensions are lightweight wrappers on 
+    The mysqli, PDO_MySQL and mysql PHP extensions are lightweight wrappers on
     top of a C client library. The extensions can either use the
     <link linkend="book.mysqlnd">mysqlnd</link> library or the <literal>libmysql</literal>
     library. Choosing a library is a compile time decision.
    </para>
    <para>
     The mysqlnd library is part of the PHP distribution since 5.3.0. It offers
-    features like lazy connections and query caching, features that are not available 
+    features like lazy connections and query caching, features that are not available
     with libmysql, so using the built-in mysqlnd library is highly recommended.
     See the <link linkend="book.mysqlnd">mysqlnd documentation</link> for
     additional details, and a listing of features and functionality that it offers.
@@ -351,7 +351,7 @@ $ ./configure --with-mysqli=/path/to/mysql_config --with-pdo-mysql=/path/to/mysq
    <para>
     It is recommended to use the <link linkend="book.mysqlnd">mysqlnd</link>
     library instead of the MySQL Client Server library (libmysql). Both
-    libraries are supported and constantly being improved. 
+    libraries are supported and constantly being improved.
    </para>
    <informaltable>
     <tgroup cols="3">