diff --git a/appendices/migration52.xml b/appendices/migration52.xml
index f7ecb17d4f..0f7ab5f897 100644
--- a/appendices/migration52.xml
+++ b/appendices/migration52.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.33 $ -->
+<!-- $Revision: 1.34 $ -->
 <appendix xml:id="migration52" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Migrating from PHP 5.1.x to PHP 5.2.x</title>
 
@@ -57,10 +57,10 @@
    </listitem>
    <listitem>
     <simpara>
-     Changed priority of <constant>PHPRC</constant> environment variable on Win32
+     Changed priority of <varname>PHPRC</varname> environment variable on Win32
     </simpara>
     <simpara>
-     The PHPRC environment variable now takes priority over the path stored
+     The <varname>PHPRC</varname> environment variable now takes priority over the path stored
      in the Windows registry.
     </simpara>
    </listitem>
@@ -220,12 +220,13 @@ include "data:;base64,PD9waHAgcGhwaW5mbygpOz8+";
    </listitem>
    <listitem>
     <simpara>
-     Regression in glob() patterns
+     Regression in <literal>glob()</literal> patterns
     </simpara>
     <simpara>
      In version 5.2.4 a security fix caused a regression for patterns of
      the form "/foo/*/bar/*". Since version 5.2.5 instead of raising a warning the
-     glob() function will return &false; when openbase_dir restrictions are violated.
+     <literal>glob()</literal> function will return &false; when
+     <literal>openbase_dir</literal> restrictions are violated.
     </simpara>
    </listitem>
   </itemizedlist>
@@ -524,7 +525,7 @@ $obj->getCommentName('');
    </listitem>
    <listitem>
     <simpara>
-     on your system using the <constant>TZ</constant> environmental variable
+     on your system using the <varname>TZ</varname> environmental variable
     </simpara>
    </listitem>
    <listitem>
@@ -540,7 +541,7 @@ $obj->getCommentName('');
   </para>
   <para>
    With the advent of PHP 5.2.x, there are <type>object</type> representations of the
-   date and timezone, named DateTime and DateTimeZone respectively.
+   date and timezone, named <literal>DateTime</literal> and <literal>DateTimeZone</literal> respectively.
    The methods map to existing procedural date functions.
   </para>
  </section>
@@ -786,7 +787,7 @@ $obj->getCommentName('');
     <simpara>
      <function>array_fill_keys</function>
      - Create an array using the elements of the first parameter as keys,
-     each initialized to val
+     each initialized to <literal>val</literal>
     </simpara>
    </listitem>
    <listitem>
@@ -799,8 +800,9 @@ $obj->getCommentName('');
    <listitem>
     <simpara>
      <function>image_type_to_extension</function>
-     - Get file extension for image-type returned by getimagesize,
-     exif_read_data, exif_thumbnail, exif_imagetype
+     - Get file extension for image-type returned by
+     <function>getimagesize</function>, <function>exif_read_data</function>,
+     <function>exif_thumbnail</function>, <function>exif_imagetype</function>
     </simpara>
    </listitem>
    <listitem>
@@ -993,7 +995,7 @@ $obj->getCommentName('');
     <simpara>
      <function>pg_field_table</function>
      - Returns the name of the table field belongs to, or table's oid
-     if oid_only is &true;
+     if <literal>oid_only</literal> is &true;
     </simpara>
    </listitem>
   </itemizedlist>
@@ -1101,7 +1103,7 @@ $obj->getCommentName('');
    <listitem>
     <simpara>
      DOMNode::getNodePath()
-     - Gets an xpath for a node
+     - Gets an <literal>xpath</literal> for a node
     </simpara>
    </listitem>
   </itemizedlist>
@@ -1158,7 +1160,7 @@ $obj->getCommentName('');
    <listitem>
     <simpara>
      ArrayIterator AppendIterator::getArrayIterator()
-     - Get access to inner ArrayIterator
+     - Get access to inner <literal>ArrayIterator</literal>
     </simpara>
    </listitem>
    <listitem>
@@ -1212,13 +1214,13 @@ $obj->getCommentName('');
    <listitem>
     <simpara>
      array("delimiter" =>, "enclosure" =>) SplFileObject::getCsvControl(void)
-     - Get the delimiter and enclosure character used in fgetcsv
+     - Get the delimiter and enclosure character used in <function>fgetcsv</function>
     </simpara>
    </listitem>
    <listitem>
     <simpara>
      void SplFileObject::setCsvControl([string delimiter = ',' [, string enclosure = '"']])
-     - Set the delimiter and enclosure character used in fgetcsv
+     - Set the delimiter and enclosure character used in <function>fgetcsv</function>
     </simpara>
    </listitem>
   </itemizedlist>
@@ -1238,7 +1240,8 @@ $obj->getCommentName('');
    <listitem>
     <simpara>
      boolean XMLReader::setSchema(string filename)
-     - Use W3C XSD schema to validate the document as it is processed. Activation is only possible before the first Read()
+     - Use W3C XSD schema to validate the document as it is processed. Activation is
+     only possible before the first <literal>Read()</literal>
     </simpara>
    </listitem>
   </itemizedlist>
@@ -1325,8 +1328,9 @@ $obj->getCommentName('');
 
    <listitem>
     <simpara>
-     RegexIterator - extends FilterIterator; implements Iterator,
-     Traversable, OuterIterator
+     RegexIterator - extends <classname>FilterIterator</classname>;
+     implements <classname>Iterator</classname>, <classname>Traversable</classname>,
+     <classname>OuterIterator</classname>
     </simpara>
     <simpara>
      Constants:
@@ -1380,7 +1384,7 @@ $obj->getCommentName('');
      <listitem>
       <simpara>
        RegexIterator::__construct(Iterator it, string regex [, int mode [, int flags [, int preg_flags]]])
-       - Create an RegexIterator from another iterator and a regular expression
+       - Create an <literal>RegexIterator</literal> from another iterator and a regular expression
       </simpara>
      </listitem>
      <listitem>
@@ -1474,7 +1478,7 @@ $obj->getCommentName('');
      <listitem>
       <simpara>
        RecursiveRegexIterator::__construct(RecursiveIterator it, string regex [, int mode [, int flags [, int preg_flags]]])
-       - Create an RecursiveRegexIterator from another recursive iterator and
+       - Create an <literal>RecursiveRegexIterator</literal> from another recursive iterator and
        a regular expression
       </simpara>
      </listitem>
@@ -1482,7 +1486,7 @@ $obj->getCommentName('');
       <simpara>
        RecursiveRegexIterator RecursiveRegexIterator::getChildren()
        - Return the inner iterator's children contained in a
-       RecursiveRegexIterator
+       <literal>RecursiveRegexIterator</literal>
       </simpara>
      </listitem>
      <listitem>
@@ -1960,16 +1964,16 @@ $obj->getCommentName('');
     <simpara>
      The new memory manager allocates less memory and works faster than the
      previous incarnation. It allocates memory from the system in large blocks,
-     and then manages the heap by itself. The memory_limit value in &php.ini; is
-     checked, not for each emalloc() call (as before), but for actual blocks
-     requested from the system. This means that memory_limit is far more
+     and then manages the heap by itself. The <literal>memory_limit</literal> value in &php.ini; is
+     checked, not for each <literal>emalloc()</literal> call (as before), but for actual blocks
+     requested from the system. This means that <literal>memory_limit</literal> is far more
      accurate than it used to be, since the old memory manager didn't calculate
-     all the memory overhead used by the malloc library.
+     all the memory overhead used by the <literal>malloc</literal> library.
     </simpara>
     <simpara>
      Thanks to this new-found accuracy memory usage may appear to have increased,
      although actually it has not. To accommodate this apparent increase, the
-     default memory_limit setting was also increased - from 8 to 16 megabytes.
+     default <literal>memory_limit</literal> setting was also increased - from 8 to 16 megabytes.
     </simpara>
    </listitem>
    <listitem>