diff --git a/features/file-upload.xml b/features/file-upload.xml
index 354cc3c1e3..27fa55c220 100644
--- a/features/file-upload.xml
+++ b/features/file-upload.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.34 $ -->
+<!-- $Revision: 1.35 $ -->
  <chapter id="features.file-upload">
   <title>Handling file uploads</title>
 
@@ -65,7 +65,7 @@ Send this file: <input name="userfile" type="file">
     from PHP 4.0.3. From PHP 4.1.0 or later, $_FILES may be used
     instead of
     <varname>$HTTP_POST_FILES</varname>. <varname>$_FILES</varname> is
-    always global, so <literal>global</literal> is should not be used
+    always global, so <literal>global</literal> should not be used
     for $_FILES in function scope.
     </para>
    </note>
@@ -126,9 +126,10 @@ Send this file: <input name="userfile" type="file">
 
    <para>
     When <link linkend="ini.register-globals">register_globals</link>
-    is turned on in <filename>php.ini</filename>. Note that the
-    following variable names assume the use of the file upload name
-    'userfile', as used in the example script above:
+    is turned on in <filename>php.ini</filename> the available variables
+    are as follows. Note that the following variable names assume the
+    use of the file upload name 'userfile', as used in the example
+    script above:
 
     <itemizedlist>
      <listitem>
@@ -237,12 +238,12 @@ move_uploaded_file($HTTP_POST_FILES['userfile']['tmp_name'], "/place/to/put/uplo
    </simpara>
 <!-- FIXME: max_execution_time INI -->
    <simpara>
-    If <literal>max_execution_time</literal> is set too small, script
-    execution may be exceeded the value. Make sure to set
-    <literal>max_execution_time</literal> large enough.
+    If <link linkend="ini.max-execution-time">max_execution_time</link>
+    is set too small, script execution may be exceeded the value. Make
+    sure to set <literal>max_execution_time</literal> large enough.
    </simpara>
    <simpara>
-    If <literal>post_max_size</literal> is set too small, large file
+    If <literal>post_max_size</literal> is set too small, large files
     cannot be uploaded.  Make sure to set
     <literal>post_max_size</literal> large enough.
    </simpara>