diff --git a/reference/mysql/configure.xml b/reference/mysql/configure.xml
index 6d87c5e6fc..48da063f65 100644
--- a/reference/mysql/configure.xml
+++ b/reference/mysql/configure.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <section id="mysql.installation">
  &reftitle.install;
  <para id="mysql.configure">
   By using the <option role="configure">--with-mysql[=DIR]</option>
-  configuration option you enable <literal>PHP</literal> to access MySQL
+  configuration option you enable PHP to access MySQL
   databases.
  </para>
  <para>
@@ -12,13 +12,13 @@
   enabled by default.  To disable this default behavior, you may use the
   <option role="configure">--without-mysql</option> configure option.  
   Also in PHP 4, if you enable MySQL without specifying the path to the
-  MySQL install DIR, <literal>PHP</literal> will use the bundled MySQL client
+  MySQL install DIR, PHP will use the bundled MySQL client
   libraries.  In Windows, there is no DLL, it's simply built into PHP 4.
   Users who run other applications that use MySQL (for example,
   auth-mysql) should not use the bundled library, but rather specify the
   path to MySQL's install directory, like so:
   <option role="configure">--with-mysql=/path/to/mysql</option>.
-  This will force <literal>PHP</literal> to use the client libraries
+  This will force PHP to use the client libraries
   installed by MySQL, thus avoiding any conflicts.
  </para>
  <para>
@@ -26,10 +26,10 @@
   bundled with PHP.  Read this <link linkend="faq.databases.mysql.php5">
   FAQ</link> for details on why.  Because of this, Windows users will need
   to enable <filename>php_mysql.dll</filename> inside of &php.ini; and either
-  copy libmysql.dll into the Windows system directory or make it available to 
-  the PATH.  For compiling, simply use <option role="configure"> 
-  --with-mysql=[DIR]</option> where 
-  <literal>[DIR]</literal> is defined.
+  copy <filename>libmysql.dll</filename> into the Windows system directory or
+  make it available to the <envar>PATH</envar>. For compiling, simply use
+  <option role="configure"> --with-mysql=[DIR]</option> where
+  <literal>[DIR]</literal> points to your MySQL installation directory.
  </para>
  <para>
   This MySQL extension doesn't support full functionality of MySQL versions greater than
@@ -41,7 +41,7 @@
  </para>
  <warning>
   <para>
-   Crashes and startup problems of <literal>PHP</literal> may be encountered
+   Crashes and startup problems of PHP may be encountered
    when loading this extension in conjunction with the recode extension.
    See the <link linkend="ref.recode">recode</link> extension for more
    information.
diff --git a/reference/mysql/ini.xml b/reference/mysql/ini.xml
index 820ab8decf..5395cd3e7c 100644
--- a/reference/mysql/ini.xml
+++ b/reference/mysql/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <section id="mysql.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -140,11 +140,11 @@
      The default TCP port number to use when connecting to
      the database server if no other port is specified. If
      no default is specified, the port will be obtained
-     from the <literal>MYSQL_TCP_PORT</literal> environment
+     from the <envar>MYSQL_TCP_PORT</envar> environment
      variable, the <literal>mysql-tcp</literal> entry in
      <filename>/etc/services</filename> or the compile-time
-     <literal>MYSQL_PORT</literal> constant, in that order. Win32
-     will only use the <literal>MYSQL_PORT</literal> constant.
+     <constant>MYSQL_PORT</constant> constant, in that order. Win32
+     will only use the <constant>MYSQL_PORT</constant> constant.
     </para>
    </listitem>
   </varlistentry>
@@ -239,4 +239,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-