diff --git a/reference/ftp/functions/ftp-alloc.xml b/reference/ftp/functions/ftp-alloc.xml
index 79c7fb2762..0f28792634 100644
--- a/reference/ftp/functions/ftp-alloc.xml
+++ b/reference/ftp/functions/ftp-alloc.xml
@@ -9,9 +9,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_alloc</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>int</type><parameter>filesize</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter role="reference">result</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>int</type><parameter>size</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter role="reference">response</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Sends an <literal>ALLO</literal> command to the remote FTP server to 
@@ -34,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -42,7 +42,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>filesize</parameter></term>
+     <term><parameter>size</parameter></term>
      <listitem>
       <para>
        The number of bytes to allocate.
@@ -50,11 +50,11 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>result</parameter></term>
+     <term><parameter>response</parameter></term>
      <listitem>
       <para>
        A textual representation of the servers response will be returned by 
-       reference in <parameter>result</parameter> if a variable is provided.
+       reference in <parameter>response</parameter> if a variable is provided.
       </para>
      </listitem>
     </varlistentry>
@@ -107,7 +107,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-append.xml b/reference/ftp/functions/ftp-append.xml
index 0904a1ba32..0039e40d3b 100644
--- a/reference/ftp/functions/ftp-append.xml
+++ b/reference/ftp/functions/ftp-append.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="function.ftp-append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>ftp_append</refname>
@@ -12,8 +11,8 @@
   <methodsynopsis>
    <type>bool</type><methodname>ftp_append</methodname>
    <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>local_file</parameter></methodparam>
+   <methodparam><type>string</type><parameter>remote_filename</parameter></methodparam>
+   <methodparam><type>string</type><parameter>local_filename</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>FTP_BINARY</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -36,7 +35,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>remote_file</parameter></term>
+    <term><parameter>remote_filename</parameter></term>
     <listitem>
      <para>
       
@@ -44,7 +43,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>local_file</parameter></term>
+    <term><parameter>local_filename</parameter></term>
     <listitem>
      <para>
       
@@ -70,7 +69,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-cdup.xml b/reference/ftp/functions/ftp-cdup.xml
index 937c584b5a..7970c98714 100644
--- a/reference/ftp/functions/ftp-cdup.xml
+++ b/reference/ftp/functions/ftp-cdup.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_cdup</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
   </methodsynopsis>
   <para> 
    Changes to the parent directory.
@@ -20,7 +20,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -81,7 +81,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-chdir.xml b/reference/ftp/functions/ftp-chdir.xml
index 3a691c208c..5b301be17b 100644
--- a/reference/ftp/functions/ftp-chdir.xml
+++ b/reference/ftp/functions/ftp-chdir.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_chdir</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>string</type><parameter>directory</parameter></methodparam>
   </methodsynopsis>
   <para> 
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -93,7 +93,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-chmod.xml b/reference/ftp/functions/ftp-chmod.xml
index becc128b63..0a2b8035db 100644
--- a/reference/ftp/functions/ftp-chmod.xml
+++ b/reference/ftp/functions/ftp-chmod.xml
@@ -8,14 +8,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>ftp_chmod</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
+   <type class="union"><type>int</type><type>false</type></type><methodname>ftp_chmod</methodname>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>int</type><parameter>permissions</parameter></methodparam>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para> 
    Sets the permissions on the specified remote file to 
-   <parameter>mode</parameter>.
+   <parameter>permissions</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -31,7 +31,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>mode</parameter></term>
+     <term><parameter>permissions</parameter></term>
      <listitem>
       <para>
        The new permissions, given as an <emphasis>octal</emphasis> value.
@@ -95,7 +95,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-close.xml b/reference/ftp/functions/ftp-close.xml
index 03d77994ee..f85e35b18f 100644
--- a/reference/ftp/functions/ftp-close.xml
+++ b/reference/ftp/functions/ftp-close.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_close</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_close</function> closes the given link identifier
@@ -27,7 +27,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -78,7 +78,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-connect.xml b/reference/ftp/functions/ftp-connect.xml
index 7194bcb92c..242d46b5d7 100644
--- a/reference/ftp/functions/ftp-connect.xml
+++ b/reference/ftp/functions/ftp-connect.xml
@@ -8,14 +8,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>ftp_connect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>ftp_connect</methodname>
+   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>21</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>90</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_connect</function> opens an FTP connection to the
-   specified <parameter>host</parameter>.  
+   specified <parameter>hostname</parameter>.  
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>host</parameter></term>
+     <term><parameter>hostname</parameter></term>
      <listitem>
       <para>
        The FTP server address. This parameter shouldn't have any trailing 
@@ -90,7 +90,6 @@ $conn_id = ftp_connect($ftp_server) or die("Couldn't connect to $ftp_server");
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-delete.xml b/reference/ftp/functions/ftp-delete.xml
index 83667b405d..a8f9a8aca4 100644
--- a/reference/ftp/functions/ftp-delete.xml
+++ b/reference/ftp/functions/ftp-delete.xml
@@ -9,12 +9,12 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_delete</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_delete</function> deletes the file specified by
-   <parameter>path</parameter> from the FTP server.
+   <parameter>filename</parameter> from the FTP server.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -30,7 +30,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>path</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        The file to delete.
@@ -78,7 +78,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-exec.xml b/reference/ftp/functions/ftp-exec.xml
index f7f17cc94f..3933dc88b6 100644
--- a/reference/ftp/functions/ftp-exec.xml
+++ b/reference/ftp/functions/ftp-exec.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.ftp-exec' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.ftp-exec" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_exec</refname>
   <refpurpose>Requests execution of a command on the FTP server</refpurpose>
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_exec</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>string</type><parameter>command</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -90,7 +90,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-fget.xml b/reference/ftp/functions/ftp-fget.xml
index fe23a80192..7a29ceb16b 100644
--- a/reference/ftp/functions/ftp-fget.xml
+++ b/reference/ftp/functions/ftp-fget.xml
@@ -9,14 +9,14 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_fget</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>stream</parameter></methodparam>
+   <methodparam><type>string</type><parameter>remote_filename</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>FTP_BINARY</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>resumepos</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
-   <function>ftp_fget</function> retrieves <parameter>remote_file</parameter>
+   <function>ftp_fget</function> retrieves <parameter>remote_filename</parameter>
    from the FTP server, and writes it to the given file pointer.
   </para>
  </refsect1>
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        An open file pointer in which we store the data.
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        The remote file path.
@@ -58,7 +58,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        The position in the remote file to start downloading from.
@@ -147,7 +147,6 @@ fclose($handle);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-fput.xml b/reference/ftp/functions/ftp-fput.xml
index f5e53ca085..4b2fac943e 100644
--- a/reference/ftp/functions/ftp-fput.xml
+++ b/reference/ftp/functions/ftp-fput.xml
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_fput</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>string</type><parameter>remote_filename</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>stream</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>FTP_BINARY</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>startpos</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_fput</function> uploads the data from a file pointer
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        The remote file path.
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        An open file pointer on the local file. Reading stops at end of file.
@@ -58,7 +58,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>The position in the remote file to start uploading to.</para>
      </listitem>
@@ -143,7 +143,6 @@ fclose($fp);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-get-option.xml b/reference/ftp/functions/ftp-get-option.xml
index fda9b7813f..2ecdd91c0f 100644
--- a/reference/ftp/functions/ftp-get-option.xml
+++ b/reference/ftp/functions/ftp-get-option.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.ftp-get-option' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.ftp-get-option" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_get_option</refname>
   <refpurpose>Retrieves various runtime behaviours of the current FTP stream</refpurpose>
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>ftp_get_option</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <type class="union"><type>int</type><type>bool</type></type><methodname>ftp_get_option</methodname>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>int</type><parameter>option</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -92,7 +92,6 @@ $timeout = ftp_get_option($conn_id, FTP_TIMEOUT_SEC);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-get.xml b/reference/ftp/functions/ftp-get.xml
index 25d3819b8b..09466affb9 100644
--- a/reference/ftp/functions/ftp-get.xml
+++ b/reference/ftp/functions/ftp-get.xml
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_get</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>local_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>string</type><parameter>local_filename</parameter></methodparam>
+   <methodparam><type>string</type><parameter>remote_filename</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>FTP_BINARY</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>resumepos</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_get</function> retrieves a remote file from the FTP server,
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        The local file path (will be overwritten if the file already exists).
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        The remote file path.
@@ -58,7 +58,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        The position in the remote file to start downloading from.
@@ -145,7 +145,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-login.xml b/reference/ftp/functions/ftp-login.xml
index 8f78cd1062..ab82099e5d 100644
--- a/reference/ftp/functions/ftp-login.xml
+++ b/reference/ftp/functions/ftp-login.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_login</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>string</type><parameter>username</parameter></methodparam>
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
   </methodsynopsis>
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -87,7 +87,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-mdtm.xml b/reference/ftp/functions/ftp-mdtm.xml
index 338b61d023..15f62c4180 100644
--- a/reference/ftp/functions/ftp-mdtm.xml
+++ b/reference/ftp/functions/ftp-mdtm.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ftp_mdtm</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_mdtm</function> gets the last modified time for a remote
@@ -32,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -40,7 +40,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        The file from which to extract the last modification time.
@@ -94,7 +94,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-mkdir.xml b/reference/ftp/functions/ftp-mkdir.xml
index ff6bc68b99..57c1d81905 100644
--- a/reference/ftp/functions/ftp-mkdir.xml
+++ b/reference/ftp/functions/ftp-mkdir.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>ftp_mkdir</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <type class="union"><type>string</type><type>false</type></type><methodname>ftp_mkdir</methodname>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>string</type><parameter>directory</parameter></methodparam>
   </methodsynopsis>
   <para> 
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -86,7 +86,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-mlsd.xml b/reference/ftp/functions/ftp-mlsd.xml
index aa48d32315..9a7dabcc7d 100644
--- a/reference/ftp/functions/ftp-mlsd.xml
+++ b/reference/ftp/functions/ftp-mlsd.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>ftp_mlsd</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>ftp_mlsd</methodname>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>string</type><parameter>directory</parameter></methodparam>
   </methodsynopsis>
  </refsect1>
@@ -18,7 +18,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -182,7 +182,6 @@ array(5) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-nb-continue.xml b/reference/ftp/functions/ftp-nb-continue.xml
index 4b74aadc7f..d1729878fe 100644
--- a/reference/ftp/functions/ftp-nb-continue.xml
+++ b/reference/ftp/functions/ftp-nb-continue.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ftp_nb_continue</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
   </methodsynopsis>
   <para> 
    Continues retrieving/sending a file non-blocking.
@@ -20,7 +20,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -64,7 +64,6 @@ if ($ret != FTP_FINISHED) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-nb-fget.xml b/reference/ftp/functions/ftp-nb-fget.xml
index e29313e7ab..c3d6078cfa 100644
--- a/reference/ftp/functions/ftp-nb-fget.xml
+++ b/reference/ftp/functions/ftp-nb-fget.xml
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ftp_nb_fget</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>stream</parameter></methodparam>
+   <methodparam><type>string</type><parameter>remote_filename</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>FTP_BINARY</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>resumepos</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_nb_fget</function> retrieves a remote file from the FTP 
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        An open file pointer in which we store the data.
@@ -46,7 +46,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        The remote file path.
@@ -63,7 +63,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>The position in the remote file to start downloading from.</para>
      </listitem>
@@ -154,7 +154,6 @@ fclose($fp);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-nb-fput.xml b/reference/ftp/functions/ftp-nb-fput.xml
index 0df123bbad..cf895b10d2 100644
--- a/reference/ftp/functions/ftp-nb-fput.xml
+++ b/reference/ftp/functions/ftp-nb-fput.xml
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ftp_nb_fput</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>string</type><parameter>remote_filename</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>stream</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>FTP_BINARY</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>startpos</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_nb_fput</function> uploads the data from a file pointer to
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        The remote file path.
@@ -46,7 +46,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        An open file pointer on the local file. Reading stops at end of file.
@@ -63,7 +63,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>The position in the remote file to start uploading to.</para>
      </listitem>
@@ -153,7 +153,6 @@ fclose($fp);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-nb-get.xml b/reference/ftp/functions/ftp-nb-get.xml
index a9f8f8e909..fff30e5aa4 100644
--- a/reference/ftp/functions/ftp-nb-get.xml
+++ b/reference/ftp/functions/ftp-nb-get.xml
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ftp_nb_get</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>local_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>string</type><parameter>local_filename</parameter></methodparam>
+   <methodparam><type>string</type><parameter>remote_filename</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>FTP_BINARY</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>resumepos</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_nb_get</function> retrieves a remote file from the FTP server,
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        The local file path (will be overwritten if the file already exists).
@@ -46,7 +46,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        The remote file path.
@@ -63,7 +63,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>The position in the remote file to start downloading from.</para>
      </listitem>
@@ -202,7 +202,6 @@ while ($ret == FTP_MOREDATA) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-nb-put.xml b/reference/ftp/functions/ftp-nb-put.xml
index cccd1a5e0a..84175031a4 100644
--- a/reference/ftp/functions/ftp-nb-put.xml
+++ b/reference/ftp/functions/ftp-nb-put.xml
@@ -8,12 +8,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>ftp_nb_put</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>local_file</parameter></methodparam>
+   <type class="union"><type>int</type><type>false</type></type><methodname>ftp_nb_put</methodname>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>string</type><parameter>remote_filename</parameter></methodparam>
+   <methodparam><type>string</type><parameter>local_filename</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>FTP_BINARY</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>startpos</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_nb_put</function> stores a local file on the FTP server.
@@ -29,7 +29,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -37,7 +37,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        The remote file path.
@@ -45,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        The local file path.
@@ -62,7 +62,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>The position in the remote file to start uploading to.</para>
      </listitem>
@@ -74,7 +74,7 @@
   &reftitle.returnvalues;
   <para>
    Returns <constant>FTP_FAILED</constant> or <constant>FTP_FINISHED</constant>
-   or <constant>FTP_MOREDATA</constant>.
+   or <constant>FTP_MOREDATA</constant>, or &false; on failure to open the local file.
   </para>
  </refsect1>
 
@@ -170,7 +170,6 @@ if ($ret != FTP_FINISHED) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-nlist.xml b/reference/ftp/functions/ftp-nlist.xml
index 0185c5b8f0..e75a502e95 100644
--- a/reference/ftp/functions/ftp-nlist.xml
+++ b/reference/ftp/functions/ftp-nlist.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>ftp_nlist</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>ftp_nlist</methodname>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>string</type><parameter>directory</parameter></methodparam>
   </methodsynopsis>
  </refsect1>
@@ -18,7 +18,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -95,7 +95,6 @@ array(3) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-pasv.xml b/reference/ftp/functions/ftp-pasv.xml
index d7bfe63aa6..d7a1d589be 100644
--- a/reference/ftp/functions/ftp-pasv.xml
+++ b/reference/ftp/functions/ftp-pasv.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_pasv</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>pasv</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>bool</type><parameter>enable</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_pasv</function> turns on or off passive mode. In
@@ -28,7 +28,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -36,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>pasv</parameter></term>
+     <term><parameter>enable</parameter></term>
      <listitem>
       <para>
        If &true;, the passive mode is turned on, else it's turned off.
@@ -88,7 +88,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-put.xml b/reference/ftp/functions/ftp-put.xml
index 31223dc791..623abbb3d5 100644
--- a/reference/ftp/functions/ftp-put.xml
+++ b/reference/ftp/functions/ftp-put.xml
@@ -9,11 +9,11 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_put</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>local_file</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>string</type><parameter>remote_filename</parameter></methodparam>
+   <methodparam><type>string</type><parameter>local_filename</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>FTP_BINARY</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>startpos</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_put</function> stores a local file on the FTP server.
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        The remote file path.
@@ -40,7 +40,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        The local file path.
@@ -57,7 +57,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>The position in the remote file to start uploading to.</para>
      </listitem>
@@ -139,7 +139,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-pwd.xml b/reference/ftp/functions/ftp-pwd.xml
index 75bf657325..6c799e4250 100644
--- a/reference/ftp/functions/ftp-pwd.xml
+++ b/reference/ftp/functions/ftp-pwd.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>ftp_pwd</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <type class="union"><type>string</type><type>false</type></type><methodname>ftp_pwd</methodname>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
   </methodsynopsis>
   <para>
   </para>
@@ -19,7 +19,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -74,7 +74,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-raw.xml b/reference/ftp/functions/ftp-raw.xml
index e0fb90c79f..48a4170c14 100644
--- a/reference/ftp/functions/ftp-raw.xml
+++ b/reference/ftp/functions/ftp-raw.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>ftp_raw</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>string</type><parameter>command</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -76,7 +76,6 @@ ftp_raw($fp, "PASS secret");
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-rawlist.xml b/reference/ftp/functions/ftp-rawlist.xml
index 65a4ec83d0..3430c70519 100644
--- a/reference/ftp/functions/ftp-rawlist.xml
+++ b/reference/ftp/functions/ftp-rawlist.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>ftp_rawlist</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <type class="union"><type>array</type><type>false</type></type><methodname>ftp_rawlist</methodname>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>string</type><parameter>directory</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>recursive</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -114,7 +114,6 @@ array(3) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-rename.xml b/reference/ftp/functions/ftp-rename.xml
index 575b071a5b..e253f282b7 100644
--- a/reference/ftp/functions/ftp-rename.xml
+++ b/reference/ftp/functions/ftp-rename.xml
@@ -9,9 +9,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_rename</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oldname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>newname</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>string</type><parameter>from</parameter></methodparam>
+   <methodparam><type>string</type><parameter>to</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_rename</function> renames a file or a directory on the FTP
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -31,7 +31,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>oldname</parameter></term>
+     <term><parameter>from</parameter></term>
      <listitem>
       <para>
        The old file/directory name.
@@ -39,7 +39,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>newname</parameter></term>
+     <term><parameter>to</parameter></term>
      <listitem>
       <para>
        The new name.
@@ -89,7 +89,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-rmdir.xml b/reference/ftp/functions/ftp-rmdir.xml
index 8b4cdfe6fe..40f385bb52 100644
--- a/reference/ftp/functions/ftp-rmdir.xml
+++ b/reference/ftp/functions/ftp-rmdir.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_rmdir</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>string</type><parameter>directory</parameter></methodparam>
   </methodsynopsis>
   <para> 
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -87,7 +87,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-set-option.xml b/reference/ftp/functions/ftp-set-option.xml
index 3f822488a9..f5dc7133e7 100644
--- a/reference/ftp/functions/ftp-set-option.xml
+++ b/reference/ftp/functions/ftp-set-option.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id='function.ftp-set-option' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.ftp-set-option" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_set_option</refname>
   <refpurpose>Set miscellaneous runtime FTP options</refpurpose>
@@ -9,9 +9,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_set_option</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>int</type><parameter>option</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+   <methodparam><type class="union"><type>int</type><type>bool</type></type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
    This function controls various runtime options for the specified FTP 
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -115,7 +115,6 @@ ftp_set_option($conn_id, FTP_TIMEOUT_SEC, 10);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-site.xml b/reference/ftp/functions/ftp-site.xml
index 4584e69b55..4110492726 100644
--- a/reference/ftp/functions/ftp-site.xml
+++ b/reference/ftp/functions/ftp-site.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ftp_site</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
    <methodparam><type>string</type><parameter>command</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -27,7 +27,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -88,7 +88,6 @@ if (ftp_site($conn, 'CHMOD 0600 /home/user/privatefile')) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-size.xml b/reference/ftp/functions/ftp-size.xml
index 1265f0e7dd..b54e6fa18e 100644
--- a/reference/ftp/functions/ftp-size.xml
+++ b/reference/ftp/functions/ftp-size.xml
@@ -9,8 +9,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ftp_size</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
+   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_size</function> returns the size of the given file in
@@ -27,7 +27,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -35,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        The remote file.
@@ -95,7 +95,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-ssl-connect.xml b/reference/ftp/functions/ftp-ssl-connect.xml
index 3f1c2b735e..1cb329a6fa 100644
--- a/reference/ftp/functions/ftp-ssl-connect.xml
+++ b/reference/ftp/functions/ftp-ssl-connect.xml
@@ -8,14 +8,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>resource</type><methodname>ftp_ssl_connect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
+   <type class="union"><type>resource</type><type>false</type></type><methodname>ftp_ssl_connect</methodname>
+   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>21</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>90</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ftp_ssl_connect</function> opens an <emphasis>explicit</emphasis> SSL-FTP connection to the
-   specified <parameter>host</parameter>. That implies that
+   specified <parameter>hostname</parameter>. That implies that
    <function>ftp_ssl_connect</function> will succeed even if the server is not
    configured for SSL-FTP, or its certificate is invalid. Only when
    <function>ftp_login</function> is called, the client will send the
@@ -44,7 +44,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>host</parameter></term>
+     <term><parameter>hostname</parameter></term>
      <listitem>
       <para>
        The FTP server address. This parameter shouldn't have any trailing 
@@ -121,7 +121,6 @@ ftp_close($conn_id);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/ftp/functions/ftp-systype.xml b/reference/ftp/functions/ftp-systype.xml
index 40c23a5705..761f7a6114 100644
--- a/reference/ftp/functions/ftp-systype.xml
+++ b/reference/ftp/functions/ftp-systype.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>string</type><methodname>ftp_systype</methodname>
-   <methodparam><type>resource</type><parameter>ftp_stream</parameter></methodparam>
+   <type class="union"><type>string</type><type>false</type></type><methodname>ftp_systype</methodname>
+   <methodparam><type>resource</type><parameter>ftp</parameter></methodparam>
   </methodsynopsis>
   <para>
    Returns the system type identifier of the remote FTP server.
@@ -20,7 +20,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        The link identifier of the FTP connection.
@@ -69,7 +69,6 @@ Example.com is powered by UNIX
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml