com doc/fr: Apply commit 18680fd1681731888c6fb7c530cfdb712f53e954: reference/ftp/functions/ftp-alloc.xml reference/ftp/functions/ftp-append.xml reference/ftp/functions/ftp-cdup.xml reference/ftp/functions/ftp-chdir.xml reference/ftp/functions/ftp-chmod.xml reference/ftp/functions/ftp-close.xml reference/ftp/functions/ftp-connect.xml reference/ftp/functions/ftp-delete.xml reference/ftp/functions/ftp-exec.xml reference/ftp/functions/ftp-fget.xml re

[email protected] (George Peter Banyard)
Newsgroups php.doc.fr
Message-ID <[email protected]>
Commit:    15f1f5cd6d5f5ff4877b0220f91e3009d40850f6
Author:    George Peter Banyard <[email protected]>         Mon, 4 Jan 2021 01:03:18 +0100
Parents:   4ade3c4fe695f9cfb91c13901e25b1e8901dba00
Branches:  master

Link:       http://git.php.net/?p=doc/fr.git;a=commitdiff;h=15f1f5cd6d5f5ff4877b0220f91e3009d40850f6

Log:
Apply commit 18680fd1681731888c6fb7c530cfdb712f53e954

Generate FTP methodsynopses based on stubs

Changed paths:
  M  reference/ftp/functions/ftp-alloc.xml
  M  reference/ftp/functions/ftp-append.xml
  M  reference/ftp/functions/ftp-cdup.xml
  M  reference/ftp/functions/ftp-chdir.xml
  M  reference/ftp/functions/ftp-chmod.xml
  M  reference/ftp/functions/ftp-close.xml
  M  reference/ftp/functions/ftp-connect.xml
  M  reference/ftp/functions/ftp-delete.xml
  M  reference/ftp/functions/ftp-exec.xml
  M  reference/ftp/functions/ftp-fget.xml
  M  reference/ftp/functions/ftp-fput.xml
  M  reference/ftp/functions/ftp-get-option.xml
  M  reference/ftp/functions/ftp-get.xml
  M  reference/ftp/functions/ftp-login.xml
  M  reference/ftp/functions/ftp-mdtm.xml
  M  reference/ftp/functions/ftp-mkdir.xml
  M  reference/ftp/functions/ftp-mlsd.xml
  M  reference/ftp/functions/ftp-nb-continue.xml
  M  reference/ftp/functions/ftp-nb-fget.xml
  M  reference/ftp/functions/ftp-nb-fput.xml
  M  reference/ftp/functions/ftp-nb-get.xml
  M  reference/ftp/functions/ftp-nb-put.xml
  M  reference/ftp/functions/ftp-nlist.xml
  M  reference/ftp/functions/ftp-pasv.xml
  M  reference/ftp/functions/ftp-put.xml
  M  reference/ftp/functions/ftp-pwd.xml
  M  reference/ftp/functions/ftp-raw.xml
  M  reference/ftp/functions/ftp-rawlist.xml
  M  reference/ftp/functions/ftp-rename.xml
  M  reference/ftp/functions/ftp-rmdir.xml
  M  reference/ftp/functions/ftp-set-option.xml
  M  reference/ftp/functions/ftp-site.xml
  M  reference/ftp/functions/ftp-size.xml
  M  reference/ftp/functions/ftp-ssl-connect.xml
  M  reference/ftp/functions/ftp-systype.xml
diff_15f1f5cd6d5f5ff4877b0220f91e3009d40850f6.txt (text/plain, 74.1 KB)
diff --git a/reference/ftp/functions/ftp-alloc.xml b/reference/ftp/functions/ftp-alloc.xml
index 9dc4df386e..37b84d734e 100644
--- a/reference/ftp/functions/ftp-alloc.xml
+++ b/reference/ftp/functions/ftp-alloc.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ba38a95b6a5392bf8562b8148426864bdacd5ef1 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-alloc" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_alloc</refname>
@@ -12,9 +11,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>
    <function>ftp_alloc</function> envoie la commande FTP <literal>ALLO</literal>
@@ -40,7 +39,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -48,7 +47,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>filesize</parameter></term>
+     <term><parameter>size</parameter></term>
      <listitem>
       <para>
        Le nombre d'octets à allouer.
@@ -56,11 +55,11 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>result</parameter></term>
+     <term><parameter>response</parameter></term>
      <listitem>
       <para>
        Une représentation textuelle de la réponse du serveur qui sera retournée
-       par référence dans <parameter>result</parameter> si une variable est fournie.
+       par référence dans <parameter>response</parameter> si une variable est fournie.
       </para>
      </listitem>
     </varlistentry>
@@ -113,7 +112,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 ec2255065b..b7bac9286b 100644
--- a/reference/ftp/functions/ftp-append.xml
+++ b/reference/ftp/functions/ftp-append.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 633eac97ff9a4b290b0762b1867ad15fc457ba40 Maintainer: jbnahan Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: jbnahan Status: ready -->
 <!-- Reviewed: no -->
-
 <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>
@@ -14,8 +13,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>
@@ -38,7 +37,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>remote_file</parameter></term>
+    <term><parameter>remote_filename</parameter></term>
     <listitem>
      <para>
       
@@ -46,7 +45,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>local_file</parameter></term>
+    <term><parameter>local_filename</parameter></term>
     <listitem>
      <para>
       
@@ -72,7 +71,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 2f099476d3..9c9c68dec3 100644
--- a/reference/ftp/functions/ftp-cdup.xml
+++ b/reference/ftp/functions/ftp-cdup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <refentry xml:id="function.ftp-cdup" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,7 +11,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> 
    <function>ftp_cdup</function> change de dossier et passe au dossier parent.
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de la connexion FTP.
@@ -83,7 +83,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 db404c0755..5a58f41467 100644
--- a/reference/ftp/functions/ftp-chdir.xml
+++ b/reference/ftp/functions/ftp-chdir.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-chdir" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_chdir</refname>
@@ -12,7 +11,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>
@@ -25,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -97,7 +96,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 252ed1876f..012dcce092 100644
--- a/reference/ftp/functions/ftp-chmod.xml
+++ b/reference/ftp/functions/ftp-chmod.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-chmod" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_chmod</refname>
@@ -11,16 +10,16 @@
  <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> 
    <function>ftp_chmod</function> modifie les droits d'accès au fichier
    <parameter>filename</parameter> sur le serveur FTP 
-   <parameter>ftp_stream</parameter>, en lui attribuant les droits de
-   <parameter>mode</parameter>, spécifié sous la forme d'un entier
+   <parameter>ftp</parameter>, en lui attribuant les droits de
+   <parameter>permissions</parameter>, spécifié sous la forme d'un entier
    en base octale.
   </para>
  </refsect1>
@@ -29,7 +28,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -37,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>mode</parameter></term>
+     <term><parameter>permissions</parameter></term>
      <listitem>
       <para>
        La nouvelle permission, donnée en tant que valeur <emphasis>octale</emphasis>.
@@ -102,7 +101,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 8199b97110..aca15d2b1e 100644
--- a/reference/ftp/functions/ftp-close.xml
+++ b/reference/ftp/functions/ftp-close.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-close" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_close</refname>
@@ -12,11 +11,11 @@
   &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> ferme la connexion 
-   <parameter>ftp_stream</parameter> et libère les ressources.
+   <parameter>ftp</parameter> et libère les ressources.
   </para>
   <note>
    <para>
@@ -31,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -82,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-connect.xml b/reference/ftp/functions/ftp-connect.xml
index fee961fd4d..bc5b1fe77d 100644
--- a/reference/ftp/functions/ftp-connect.xml
+++ b/reference/ftp/functions/ftp-connect.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.ftp-connect" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_connect</refname>
@@ -11,14 +10,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> ouvre une connexion FTP avec l'hôte
-   <parameter>host</parameter>.
+   <parameter>hostname</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -26,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>host</parameter></term>
+     <term><parameter>hostname</parameter></term>
      <listitem>
       <para>
        L'adresse du serveur FTP. Ce paramètre ne doit jamais avoir de slash final
@@ -95,7 +94,6 @@ $conn_id = ftp_connect($ftp_server) or die("Impossible de se connecter au serveu
   </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 b232c04249..aabea13422 100644
--- a/reference/ftp/functions/ftp-delete.xml
+++ b/reference/ftp/functions/ftp-delete.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-delete" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_delete</refname>
@@ -12,11 +11,11 @@
   &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> efface le fichier <parameter>path</parameter>
+   <function>ftp_delete</function> efface le fichier <parameter>filename</parameter>
    sur un serveur FTP.
   </para>
  </refsect1>
@@ -25,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -33,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>path</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        Le fichier à effacer.
@@ -81,7 +80,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 9e01fee30b..70757c210e 100644
--- a/reference/ftp/functions/ftp-exec.xml
+++ b/reference/ftp/functions/ftp-exec.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
-<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>Exécute une commande sur un serveur FTP</refpurpose>
@@ -12,7 +11,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>
@@ -25,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -93,7 +92,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 1f3dce248d..6b49502fdb 100644
--- a/reference/ftp/functions/ftp-fget.xml
+++ b/reference/ftp/functions/ftp-fget.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 633eac97ff9a4b290b0762b1867ad15fc457ba40 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.ftp-fget" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_fget</refname>
@@ -12,16 +11,16 @@
   &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> télécharge le fichier
-   <parameter>remote_file</parameter> depuis le serveur FTP et l'écrit
-   dans le fichier identifié par <parameter>handle</parameter>.
+   <parameter>remote_filename</parameter> depuis le serveur FTP et l'écrit
+   dans le fichier identifié par <parameter>stream</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -29,7 +28,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -37,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        Un pointeur de fichier ouvert dans lequel on écrit les données.
@@ -45,7 +44,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier distant.
@@ -62,7 +61,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        La position du fichier distant à partir de laquelle le téléchargement commence.
@@ -152,7 +151,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 db5109e850..a2a7130aa5 100644
--- a/reference/ftp/functions/ftp-fput.xml
+++ b/reference/ftp/functions/ftp-fput.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 633eac97ff9a4b290b0762b1867ad15fc457ba40 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.ftp-fput" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_fput</refname>
@@ -12,15 +11,15 @@
   &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> charge les données issues du fichier
-   identifié par <parameter>handle</parameter> jusqu'à la fin du fichier.
+   identifié par <parameter>stream</parameter> jusqu'à la fin du fichier.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -28,7 +27,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -36,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier distant.
@@ -44,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        Un pointeur de fichier ouvert sur le fichier local. La lecture s'arrête à la fin 
@@ -62,7 +61,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        La position dans le fichier distant à partir de laquelle
@@ -94,7 +93,7 @@
      <row>
       <entry>7.3.0</entry>
       <entry>
-       Le paramètre <parameter>mode</parameter> est maintenant optionel. Précédemment il
+       Le paramètre <parameter>mode</parameter> est maintenant optionnel. Précédemment il
        était obligatoire.
       </entry>
      </row>
@@ -151,7 +150,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 de00ee15cc..7ae7f06e06 100644
--- a/reference/ftp/functions/ftp-get-option.xml
+++ b/reference/ftp/functions/ftp-get-option.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
-<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>Lit différentes options pour la connexion FTP courante</refpurpose>
@@ -11,8 +10,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>
@@ -25,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -96,7 +95,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 b46a36811b..b3ed49400e 100644
--- a/reference/ftp/functions/ftp-get.xml
+++ b/reference/ftp/functions/ftp-get.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: f8cde5e160ab14cdb756f64ee805d63c6f90cc69 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.ftp-get" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_get</refname>
@@ -12,16 +11,16 @@
   &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> télécharge le fichier
-   <parameter>remote_file</parameter> depuis le serveur FTP, et le sauve dans
-   le fichier local <parameter>local_file</parameter>.
+   <parameter>remote_filename</parameter> depuis le serveur FTP, et le sauve dans
+   le fichier local <parameter>local_filename</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -29,7 +28,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -37,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier local (sera écrasé si le fichier existe déjà).
@@ -45,7 +44,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier distant.
@@ -62,7 +61,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        La position dans le fichier distant à partir duquel on commence le téléchargement.
@@ -150,7 +149,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 d8118609f4..2c05537286 100644
--- a/reference/ftp/functions/ftp-login.xml
+++ b/reference/ftp/functions/ftp-login.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-login" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_login</refname>
@@ -12,7 +11,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>
@@ -27,7 +26,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -92,7 +91,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 c45c9b4663..97cee99fab 100644
--- a/reference/ftp/functions/ftp-mdtm.xml
+++ b/reference/ftp/functions/ftp-mdtm.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-mdtm" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_mdtm</refname>
@@ -15,8 +14,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> lit la date de dernière modification
@@ -38,7 +37,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -46,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        Le fichier depuis lequel on doit extraire la date de dernière modification.
@@ -100,7 +99,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 54994db84e..56c6702886 100644
--- a/reference/ftp/functions/ftp-mkdir.xml
+++ b/reference/ftp/functions/ftp-mkdir.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-mkdir" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_mkdir</refname>
@@ -11,8 +10,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> 
@@ -25,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -90,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-mlsd.xml b/reference/ftp/functions/ftp-mlsd.xml
index ddb1914030..b4a1e5cc7f 100644
--- a/reference/ftp/functions/ftp-mlsd.xml
+++ b/reference/ftp/functions/ftp-mlsd.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: jbnahan Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: jbnahan Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-mlsd" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_mlsd</refname>
@@ -11,8 +10,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>
@@ -21,7 +20,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -185,7 +184,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 bd14e87835..54732b792f 100644
--- a/reference/ftp/functions/ftp-nb-continue.xml
+++ b/reference/ftp/functions/ftp-nb-continue.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ba38a95b6a5392bf8562b8148426864bdacd5ef1 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-nb-continue" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_nb_continue</refname>
@@ -12,11 +11,11 @@
   &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> 
    <function>ftp_nb_continue</function> reprend le téléchargement
-   d'un fichier sur la connexion <parameter>ftp_stream</parameter>, 
+   d'un fichier sur la connexion <parameter>ftp</parameter>,
    de manière asynchrone.
   </para>
  </refsect1>
@@ -25,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -69,7 +68,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 0d9cb4486c..7de21c8ae4 100644
--- a/reference/ftp/functions/ftp-nb-fget.xml
+++ b/reference/ftp/functions/ftp-nb-fget.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ba38a95b6a5392bf8562b8148426864bdacd5ef1 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.ftp-nb-fget" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_nb_fget</refname>
@@ -12,15 +11,15 @@
   &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> lit le fichier <parameter>remote_file</parameter>
-   présent sur le serveur FTP <parameter>ftp_stream</parameter>.
+   <function>ftp_nb_fget</function> lit le fichier <parameter>remote_filename</parameter>
+   présent sur le serveur FTP <parameter>ftp</parameter>.
   </para>
   <para>
    La différence entre cette fonction et <function>ftp_fget</function> est
@@ -33,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -41,7 +40,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        Un pointeur de fichier ouvert dans lequel les données sont écrites.
@@ -49,7 +48,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier distant.
@@ -66,7 +65,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        La position dans le fichier distant à partir de laquelle
@@ -160,7 +159,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 3a8878092d..d8aac7c7f1 100644
--- a/reference/ftp/functions/ftp-nb-fput.xml
+++ b/reference/ftp/functions/ftp-nb-fput.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ba38a95b6a5392bf8562b8148426864bdacd5ef1 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.ftp-nb-fput" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_nb_fput</refname>
@@ -12,15 +11,15 @@
   &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>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>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> écrit le fichier <parameter>remote_file</parameter>
-   présent sur la machine locale, sur le serveur FTP <parameter>ftp_stream</parameter>.
+   <function>ftp_nb_fput</function> écrit le fichier <parameter>remote_filename</parameter>
+   présent sur la machine locale, sur le serveur FTP <parameter>ftp</parameter>.
   </para>
   <para>
    La différence entre cette fonction et <function>ftp_fput</function> est
@@ -34,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -42,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier distant.
@@ -50,7 +49,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        Un pointeur de fichier vers un fichier local. La lecture s'arrête à la fin
@@ -68,7 +67,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        La position dans le fichier distant à partir de laquelle
@@ -161,7 +160,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 2dacbfd9a2..6c6c1d2033 100644
--- a/reference/ftp/functions/ftp-nb-get.xml
+++ b/reference/ftp/functions/ftp-nb-get.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ba38a95b6a5392bf8562b8148426864bdacd5ef1 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.ftp-nb-get" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_nb_get</refname>
@@ -12,15 +11,15 @@
   &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> lit le fichier <parameter>remote_file</parameter>
-   présent sur le serveur FTP <parameter>ftp_stream</parameter> et le sauvegarde
+   <function>ftp_nb_get</function> lit le fichier <parameter>remote_filename</parameter>
+   présent sur le serveur FTP <parameter>ftp</parameter> et le sauvegarde
    dans un fichier local. 
   </para>
   <para>
@@ -35,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -43,7 +42,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier local (sera écrasé si le fichier existe déjà).
@@ -51,7 +50,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier distant.
@@ -68,7 +67,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        La position dans le fichier distant à partir de laquelle
@@ -101,7 +100,7 @@
      <row>
       <entry>7.3.0</entry>
       <entry>
-       Le paramètre <parameter>mode</parameter> est maintenant optionel. Précédemment il
+       Le paramètre <parameter>mode</parameter> est maintenant optionnel. Précédemment il
        était obligatoire.
       </entry>
      </row>
@@ -211,7 +210,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 1072258b9a..85ec5768a7 100644
--- a/reference/ftp/functions/ftp-nb-put.xml
+++ b/reference/ftp/functions/ftp-nb-put.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 633eac97ff9a4b290b0762b1867ad15fc457ba40 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.ftp-nb-put" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_nb_put</refname>
@@ -11,16 +10,16 @@
  <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> écrit le fichier <parameter>remote_file</parameter>
-   présent sur la machine locale, sur le serveur FTP <parameter>ftp_stream</parameter>.
+   <function>ftp_nb_put</function> écrit le fichier <parameter>remote_filename</parameter>
+   présent sur la machine locale, sur le serveur FTP <parameter>ftp</parameter>.
   </para>
   <para>
    La différence entre cette fonction et <function>ftp_put</function> est
@@ -34,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -42,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier distant.
@@ -50,7 +49,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier local.
@@ -67,7 +66,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        La position dans le fichier distant à partir de laquelle
@@ -82,7 +81,7 @@
   &reftitle.returnvalues;
   <para>
    Retourne <constant>FTP_FAILED</constant>, <constant>FTP_FINISHED</constant>
-   ou <constant>FTP_MOREDATA</constant>.
+   ou <constant>FTP_MOREDATA</constant>, ou &false; en cas d'échec de l'ouverture du fichier local.
   </para>
  </refsect1>
  
@@ -178,7 +177,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 4fb31a2067..9f141665f1 100644
--- a/reference/ftp/functions/ftp-nlist.xml
+++ b/reference/ftp/functions/ftp-nlist.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-nlist" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_nlist</refname>
@@ -11,8 +10,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>
@@ -21,7 +20,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -99,7 +98,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 f1c0fcdaf9..3e0bf3dfa6 100644
--- a/reference/ftp/functions/ftp-pasv.xml
+++ b/reference/ftp/functions/ftp-pasv.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e1b57a19509f9b7a09d5945e601837e0211671ca Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DavidA -->
-
 <refentry xml:id="function.ftp-pasv" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_pasv</refname>
@@ -13,8 +12,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> active ou non le mode passif. 
@@ -32,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -40,7 +39,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>pasv</parameter></term>
+     <term><parameter>enable</parameter></term>
      <listitem>
       <para>
        Si &true;, le mode passif est activé, sinon, il est désactivé.
@@ -92,7 +91,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 8bf360115f..bb22303f11 100644
--- a/reference/ftp/functions/ftp-put.xml
+++ b/reference/ftp/functions/ftp-put.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 633eac97ff9a4b290b0762b1867ad15fc457ba40 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.ftp-put" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_put</refname>
@@ -12,15 +11,15 @@
   &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> enregistre le fichier
-   <parameter>local_file</parameter> sur le serveur FTP.
+   <parameter>local_filename</parameter> sur le serveur FTP.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -28,7 +27,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de la connexion FTP.
@@ -36,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier distant.
@@ -44,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        Le chemin vers le fichier local.
@@ -61,7 +60,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        La position dans le fichier distant à partir de laquelle
@@ -147,7 +146,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 aacf1d8eae..19ef12f71c 100644
--- a/reference/ftp/functions/ftp-pwd.xml
+++ b/reference/ftp/functions/ftp-pwd.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-pwd" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_pwd</refname>
@@ -11,8 +10,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>
@@ -22,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -77,7 +76,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 a6cf959f03..7c87a5a758 100644
--- a/reference/ftp/functions/ftp-raw.xml
+++ b/reference/ftp/functions/ftp-raw.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-raw" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_raw</refname>
@@ -12,13 +11,13 @@
   &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>
    <function>ftp_raw</function> envoie la commande FTP brute 
    <parameter>command</parameter> au serveur FTP identifié par 
-   <parameter>ftp_stream</parameter>.
+   <parameter>ftp</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -26,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        La &resource; de connexion FTP.
@@ -84,7 +83,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 9e6feacdcf..236ab6e7f5 100644
--- a/reference/ftp/functions/ftp-rawlist.xml
+++ b/reference/ftp/functions/ftp-rawlist.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b8758b0605e80c4e3610137b7502a6abeea5c69b Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.ftp-rawlist" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_rawlist</refname>
@@ -11,8 +10,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>
@@ -26,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -118,7 +117,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 96f3d06339..306a6c5e2e 100644
--- a/reference/ftp/functions/ftp-rename.xml
+++ b/reference/ftp/functions/ftp-rename.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 309ccd7aa4b2409c1b60d5ed5d910ee5dcfea982 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DavidA -->
-
 <refentry xml:id="function.ftp-rename" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_rename</refname>
@@ -13,14 +12,14 @@
   &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> renomme le fichier ou le dossier
-   <parameter>oldname</parameter> en <parameter>newname</parameter>,
-   sur le serveur <parameter>ftp_stream</parameter>.
+   <parameter>from</parameter> en <parameter>to</parameter>,
+   sur le serveur <parameter>ftp</parameter>.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -28,7 +27,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -36,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>oldname</parameter></term>
+     <term><parameter>from</parameter></term>
      <listitem>
       <para>
        L'ancien nom du dossier / fichier.
@@ -44,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>newname</parameter></term>
+     <term><parameter>to</parameter></term>
      <listitem>
       <para>
        Le nouveau nom.
@@ -94,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-rmdir.xml b/reference/ftp/functions/ftp-rmdir.xml
index a0a422d69f..70558afa23 100644
--- a/reference/ftp/functions/ftp-rmdir.xml
+++ b/reference/ftp/functions/ftp-rmdir.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-rmdir" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_rmdir</refname>
@@ -12,7 +11,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> 
@@ -25,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identification du lien de connexion FTP.
@@ -91,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-set-option.xml b/reference/ftp/functions/ftp-set-option.xml
index a019c7de3e..0773da5f16 100644
--- a/reference/ftp/functions/ftp-set-option.xml
+++ b/reference/ftp/functions/ftp-set-option.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: cbbd9d134a64d9621ad9ab340e211010d6727d90 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
-<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>Modifie les options de la connexion FTP</refpurpose>
@@ -12,9 +11,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>
    <function>ftp_set_option</function> contrôle diverses options de connexion
@@ -26,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -121,7 +120,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 0757baeae9..233c20fce2 100644
--- a/reference/ftp/functions/ftp-site.xml
+++ b/reference/ftp/functions/ftp-site.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-site" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_site</refname>
@@ -12,7 +11,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>
@@ -30,7 +29,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -92,7 +91,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 6ef59f5973..0df0ae9cfc 100644
--- a/reference/ftp/functions/ftp-size.xml
+++ b/reference/ftp/functions/ftp-size.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-size" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_size</refname>
@@ -12,8 +11,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> retourne la taille d'un fichier donné en octets.
@@ -29,7 +28,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -37,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        Le fichier distant.
@@ -97,7 +96,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 c7b104d213..24671791e0 100644
--- a/reference/ftp/functions/ftp-ssl-connect.xml
+++ b/reference/ftp/functions/ftp-ssl-connect.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DavidA -->
-
 <refentry xml:id="function.ftp-ssl-connect" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_ssl_connect</refname>
@@ -12,15 +11,15 @@
  <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> ouvre <emphasis>explicitement</emphasis> une connexion SSL-FTP 
-   à l'<parameter>hôte</parameter> spécifié. Cela implique que
+   à l'<parameter>hostname</parameter> spécifié. Cela implique que
    <function>ftp_ssl_connect</function> réussira même si le serveur n'est pas 
    configuré SSL-FTP, ou si le certificat est invalide. C'est uniquement quand 
    <function>ftp_login</function> est appelé, que le client recevra la 
@@ -51,7 +50,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>host</parameter></term>
+     <term><parameter>hostname</parameter></term>
      <listitem>
       <para>
        L'adresse FTP du serveur. Ce paramètre ne doit pas comporter de slash
@@ -127,7 +126,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 8442d8f6db..d7cc080384 100644
--- a/reference/ftp/functions/ftp-systype.xml
+++ b/reference/ftp/functions/ftp-systype.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.ftp-systype" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_systype</refname>
@@ -11,8 +10,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>
    <function>ftp_systype</function> retourne le type de serveur FTP distant.
@@ -23,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        L'identifiant du lien de connexion FTP.
@@ -72,7 +71,6 @@ Example.com est exécuté par UNIX
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.