--- migration4.xml	2007-06-21 01:24:10.000000000 +0300
+++ migration4.xml	2007-07-09 14:45:28.000000000 +0300
@@ -132,8 +132,8 @@
     type lines! You have to convert these yourself.
    </simpara>
    <para>
-    To convert your Apache configuration files, run the apconf-conv.sh 
-    script (available in the scripts/apache/ directory).  For example:
+    To convert your Apache configuration files, run the <filename>apconf-conv.sh</filename>
+    script (available in the <filename>scripts/apache/</filename> directory).  For example:
     <informalexample>
      <programlisting role="shell">
 <![CDATA[
@@ -159,10 +159,10 @@
    </para>
    <simpara>
     Likewise, your old &htaccess; files will be saved with 
-    an .orig prefix.
+    an .orig suffix.
    </simpara>
    <simpara>
-    The conversion scripts require awk to be installed.
+    The conversion scripts require 'awk' to be installed.
    </simpara>
   </section>
 
@@ -187,7 +187,7 @@
     a different file.
    </para>
    <para>
-    It still perfectly legal to include additional code within loops
+    It is still perfectly legal to include additional code within loops
     or other control structures, only the controlling keywords and
     corresponding curly braces <literal>{...}</literal> have to be
     within the same compile unit (file or <function>eval</function>ed
@@ -241,7 +241,7 @@
       When upgrading code or servers from PHP 3 to PHP 4 you should
       check these settings and calls to
       <function>error_reporting</function> or you might disable
-      reporting the new error types, especially E_COMPILE_ERROR. This
+      reporting the new error types, especially <literal>E_COMPILE_ERROR</literal>. This
       may lead to empty documents without any feedback of what happened
       or where to look for the problem.
      </para>
@@ -257,7 +257,7 @@
      <para>
       This has lead to a lot of unreproducible bug reports in the
       past where people reported script engine problems they were not
-      capable to track down while the &true; case was usually some
+      capable to track down while the true case was usually some
       missing '}' in a required file that the parser was not able to
       report due to a misconfigured error reporting system.
      </para>
@@ -278,8 +278,8 @@
      the intended thing now, could easily be broken by changes in
      other places. PHP 4 will output a lot of notice messages in
      such situations where PHP 3 didn't.  The easy fix is to just
-     turn off E_NOTICE messages, but it is usually a good idea to fix
-     the code instead.
+     turn off <literal>E_NOTICE</literal> messages, but it is usually
+     a good idea to fix the code instead.
     </para>
     <para>
      The most common case that will now produce notice messages is the
@@ -324,7 +324,7 @@
   <section xml:id='migration4.empty'>
    <title><literal>empty("0")</literal></title>
    <para>
-    The perhaps most controversial change in behavior has happened to the
+    Perhaps the most controversial change in behavior has happened to the
     behavior of the <function>empty</function>. A String containing
     only the character '0' (zero) is now considered empty while it
     wasn't in PHP 3.
@@ -361,7 +361,7 @@
      possible to change the behavior of the parser (now embedded in
      the Zend engine) at runtime as parsing already happened by
      then. So the function <function>short_tags</function> no longer
-     exists. You can still change the parsers behavior by setting
+     exists. You can still change the parser's behavior by setting
      appropriate values in the &php.ini; file.
     </para>
     <para>