com doc/ja: Generate FTP methodsynopses based on stubs: 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 reference/ftp

diff --git a/reference/ftp/functions/ftp-alloc.xml b/reference/ftp/functions/ftp-alloc.xml
index 4f800da3dd..d381689050 100644
--- a/reference/ftp/functions/ftp-alloc.xml
+++ b/reference/ftp/functions/ftp-alloc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ba38a95b6a5392bf8562b8148426864bdacd5ef1 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.ftp-alloc" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,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>
    <literal>ALLO</literal> コマンドを FTP サーバーに送信し、
@@ -36,7 +36,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -44,7 +44,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>filesize</parameter></term>
+     <term><parameter>size</parameter></term>
      <listitem>
       <para>
        確保したいバイト数。
@@ -52,11 +52,11 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>result</parameter></term>
+     <term><parameter>response</parameter></term>
      <listitem>
       <para>
-       もし変数が指定されていた場合、サーバーからの応答テキストの内容の
-       参照が格納されます。
+       <parameter>response</parameter> 変数が指定されていた場合、
+       サーバーからの応答テキストの内容の参照が格納されます。
       </para>
      </listitem>
     </varlistentry>
@@ -109,7 +109,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 e9e076023c..dc618f93d7 100644
--- a/reference/ftp/functions/ftp-append.xml
+++ b/reference/ftp/functions/ftp-append.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 633eac97ff9a4b290b0762b1867ad15fc457ba40 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: mumumu Status: ready -->
 
 <refentry xml:id="function.ftp-append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -13,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>
@@ -37,7 +37,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>remote_file</parameter></term>
+    <term><parameter>remote_filename</parameter></term>
     <listitem>
      <para>
       
@@ -45,7 +45,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>local_file</parameter></term>
+    <term><parameter>local_filename</parameter></term>
     <listitem>
      <para>
       
@@ -71,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 a761f4c178..aada3a806e 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: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <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> 
    親ディレクトリに移動します。
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -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 f951920e9c..518a1bb69f 100644
--- a/reference/ftp/functions/ftp-chdir.xml
+++ b/reference/ftp/functions/ftp-chdir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-chdir" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,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> 
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -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-chmod.xml b/reference/ftp/functions/ftp-chmod.xml
index 550183b763..7476435adb 100644
--- a/reference/ftp/functions/ftp-chmod.xml
+++ b/reference/ftp/functions/ftp-chmod.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.ftp-chmod" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_chmod</refname>
@@ -9,14 +9,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> 
    指定したリモートファイルのパーミッションを
-   <parameter>mode</parameter> に設定します。
+   <parameter>permissions</parameter> に設定します。
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>mode</parameter></term>
+     <term><parameter>permissions</parameter></term>
      <listitem>
       <para>
        新しいパーミッション。<emphasis>8 進数</emphasis> で指定します。
@@ -96,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-close.xml b/reference/ftp/functions/ftp-close.xml
index 55dec4f55d..2317d89f3d 100644
--- a/reference/ftp/functions/ftp-close.xml
+++ b/reference/ftp/functions/ftp-close.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-close" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,7 +11,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> は、指定されたリンク ID を閉じて
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -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-connect.xml b/reference/ftp/functions/ftp-connect.xml
index 78507f1aa0..80d433021a 100644
--- a/reference/ftp/functions/ftp-connect.xml
+++ b/reference/ftp/functions/ftp-connect.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: hirokawa Status: ready -->
-<!-- CREDITS: takagi -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
+<!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.ftp-connect" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_connect</refname>
@@ -10,13 +10,13 @@
  <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> は、指定した <parameter>host</parameter>
+   <function>ftp_connect</function> は、指定した <parameter>hostname</parameter>
    への FTP 接続をオープンします。
   </para>
  </refsect1>
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>host</parameter></term>
+     <term><parameter>hostname</parameter></term>
      <listitem>
       <para>
        FTP サーバーのアドレス。このパラメータには、最後のスラッシュや最初の
@@ -93,7 +93,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 676adfde3d..b60af4064d 100644
--- a/reference/ftp/functions/ftp-delete.xml
+++ b/reference/ftp/functions/ftp-delete.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: hirokawa Status: ready -->
-<!-- CREDITS: takagi -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
+<!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.ftp-delete" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_delete</refname>
@@ -11,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> は、<parameter>path</parameter>
+   <function>ftp_delete</function> は、<parameter>filename</parameter>
    で指定したファイルを FTP サーバーから削除します。
   </para>
  </refsect1>
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
         FTP 接続のリンク ID 。
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>path</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        削除するファイル。
@@ -80,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 e617a3e7f8..a937812663 100644
--- a/reference/ftp/functions/ftp-exec.xml
+++ b/reference/ftp/functions/ftp-exec.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: hirokawa Status: ready -->
-<!-- CREDITS: takagi -->
-<refentry xml:id='function.ftp-exec' xmlns="http://docbook.org/ns/docbook">
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
+<!-- CREDITS: takagi,mumumu -->
+<refentry xml:id="function.ftp-exec" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_exec</refname>
   <refpurpose>FTP サーバー上でのコマンドの実行をリクエストする</refpurpose>
@@ -11,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>
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -92,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 c8d5de6996..b2a7f8dcc2 100644
--- a/reference/ftp/functions/ftp-fget.xml
+++ b/reference/ftp/functions/ftp-fget.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 633eac97ff9a4b290b0762b1867ad15fc457ba40 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.ftp-fget" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,16 +11,15 @@
   &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> は、FTP サーバーから
-   <parameter>remote_file</parameter> を取得し、指定したファイルポインタ
-   <parameter>fp</parameter> に書きこみます。
+   <parameter>remote_filename</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>
        FTP 接続のリンク ID 。
@@ -36,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        オープンされているファイルのポインタ。ここにデータが保存されます。
@@ -44,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        リモートファイルのパス。
@@ -61,7 +60,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        リモートファイル中で、ダウンロードを開始する位置。
@@ -150,7 +149,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 8652a9c85f..a97e5d00ca 100644
--- a/reference/ftp/functions/ftp-fput.xml
+++ b/reference/ftp/functions/ftp-fput.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 633eac97ff9a4b290b0762b1867ad15fc457ba40 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.ftp-fput" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,11 +11,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> は、ファイルポインタが指すデータを
@@ -27,7 +27,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -35,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        リモートファイルのパス。
@@ -43,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        ローカルでオープンされているファイルのポインタ。
@@ -61,7 +61,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>リモートファイル内での、アップロード開始位置。</para>
      </listitem>
@@ -146,7 +146,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 3635ad80fd..2fb751c2a3 100644
--- a/reference/ftp/functions/ftp-get-option.xml
+++ b/reference/ftp/functions/ftp-get-option.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: hirokawa Status: ready -->
-<!-- CREDITS: takagi -->
-<refentry xml:id='function.ftp-get-option' xmlns="http://docbook.org/ns/docbook">
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
+<!-- CREDITS: takagi,mumumu -->
+<refentry xml:id="function.ftp-get-option" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_get_option</refname>
   <refpurpose>カレント FTP ストリームでの種々の実行時動作を取得する</refpurpose>
@@ -10,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>
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID
@@ -95,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 c0c654c12e..6299a8bc6c 100644
--- a/reference/ftp/functions/ftp-get.xml
+++ b/reference/ftp/functions/ftp-get.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: f8cde5e160ab14cdb756f64ee805d63c6f90cc69 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.ftp-get" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,11 +11,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> は FTP サーバーからリモートファイルを取得し、
@@ -27,7 +27,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -35,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        ローカルファイルのパス（ファイルがすでに存在する場合は上書きされます）。
@@ -43,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        リモートファイルのパス。
@@ -60,7 +60,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        リモートファイルの、ダウンロードを開始する位置。
@@ -147,7 +147,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 d558f92f67..ac29a3813b 100644
--- a/reference/ftp/functions/ftp-login.xml
+++ b/reference/ftp/functions/ftp-login.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-login" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,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>
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -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-mdtm.xml b/reference/ftp/functions/ftp-mdtm.xml
index ce11f00dc0..573da30ab9 100644
--- a/reference/ftp/functions/ftp-mdtm.xml
+++ b/reference/ftp/functions/ftp-mdtm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-mdtm" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,8 +11,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> はリモートファイルが最後に更新された時刻を取得します。
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        最終更新時刻を取得するファイル。
@@ -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 3acf7d22b2..407ad58371 100644
--- a/reference/ftp/functions/ftp-mkdir.xml
+++ b/reference/ftp/functions/ftp-mkdir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-mkdir" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -10,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> 
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -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-mlsd.xml b/reference/ftp/functions/ftp-mlsd.xml
index bc925a972c..41620d5d78 100644
--- a/reference/ftp/functions/ftp-mlsd.xml
+++ b/reference/ftp/functions/ftp-mlsd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: mumumu Status: ready -->
 <refentry xml:id="function.ftp-mlsd" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_mlsd</refname>
@@ -9,8 +9,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>
@@ -19,7 +19,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP接続の識別子です。
@@ -183,7 +183,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 84a1b9135c..70cec79c31 100644
--- a/reference/ftp/functions/ftp-nb-continue.xml
+++ b/reference/ftp/functions/ftp-nb-continue.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ba38a95b6a5392bf8562b8148426864bdacd5ef1 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.ftp-nb-continue" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,7 +11,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> 
    非ブロッキングモードで、ファイルの取得/送信を継続します。
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -66,7 +66,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 66d0c650ac..4a9f39a38f 100644
--- a/reference/ftp/functions/ftp-nb-fget.xml
+++ b/reference/ftp/functions/ftp-nb-fget.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ba38a95b6a5392bf8562b8148426864bdacd5ef1 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.ftp-nb-fget" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,11 +11,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> は、FTP サーバーからリモートファイルを取得します。
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -39,7 +39,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        オープンされているファイルのポインタ。ここにデータが保存されます。
@@ -47,7 +47,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        リモートファイルのパス。
@@ -64,7 +64,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>ダウンロードを開始する、リモートファイル内の位置。</para>
      </listitem>
@@ -155,7 +155,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 c550c206f4..850754ea7c 100644
--- a/reference/ftp/functions/ftp-nb-fput.xml
+++ b/reference/ftp/functions/ftp-nb-fput.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ba38a95b6a5392bf8562b8148426864bdacd5ef1 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.ftp-nb-fput" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,11 +11,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> は、ファイルポインタが指すデータを
@@ -32,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -40,7 +40,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        リモートファイルのパス。
@@ -48,7 +48,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>handle</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        ローカルでオープンされているファイルのポインタ。
@@ -66,7 +66,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>リモートファイル内での、アップロード開始位置。</para>
      </listitem>
@@ -156,7 +156,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 b4efe90d66..a89c830a26 100644
--- a/reference/ftp/functions/ftp-nb-get.xml
+++ b/reference/ftp/functions/ftp-nb-get.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ba38a95b6a5392bf8562b8148426864bdacd5ef1 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.ftp-nb-get" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,11 +11,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> は FTP サーバーからリモートファイルを取得し、
@@ -32,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -40,7 +40,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        ローカルファイルのパス（ファイルがすでに存在する場合、上書きされます）。
@@ -48,7 +48,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        リモートファイルのパス。
@@ -65,7 +65,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>resumepos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>ダウンロードを開始する、リモートファイル内の位置。</para>
      </listitem>
@@ -205,7 +205,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 7721ad702f..a3cf654686 100644
--- a/reference/ftp/functions/ftp-nb-put.xml
+++ b/reference/ftp/functions/ftp-nb-put.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 633eac97ff9a4b290b0762b1867ad15fc457ba40 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.ftp-nb-put" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -10,12 +10,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> はローカルファイルを FTP サーバーに保存します。
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -39,7 +39,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        リモートファイルのパス。
@@ -47,7 +47,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        ローカルファイルのパス。
@@ -64,7 +64,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>リモートファイル内での、アップロード開始位置。</para>
      </listitem>
@@ -77,6 +77,7 @@
   <para>
    <constant>FTP_FAILED</constant>、<constant>FTP_FINISHED</constant>
    あるいは <constant>FTP_MOREDATA</constant> を返します。
+   ローカルファイルのオープンに失敗した場合、&false; を返します。
   </para>
  </refsect1>
 
@@ -172,7 +173,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 eaea7c2cb2..2963f70e27 100644
--- a/reference/ftp/functions/ftp-nlist.xml
+++ b/reference/ftp/functions/ftp-nlist.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-nlist" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -10,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>
@@ -20,7 +20,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -97,7 +97,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 2818b4fdd1..5072fcb629 100644
--- a/reference/ftp/functions/ftp-pasv.xml
+++ b/reference/ftp/functions/ftp-pasv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e1b57a19509f9b7a09d5945e601837e0211671ca Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-pasv" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,8 +11,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> はパッシブモードをオンまたはオフにします。
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -39,7 +39,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>pasv</parameter></term>
+     <term><parameter>enable</parameter></term>
      <listitem>
       <para>
        &true;, の場合はパッシブモードをオンに、そうでない場合はオフにします。
@@ -91,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 5043910750..a76d2990be 100644
--- a/reference/ftp/functions/ftp-put.xml
+++ b/reference/ftp/functions/ftp-put.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 633eac97ff9a4b290b0762b1867ad15fc457ba40 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.ftp-put" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,11 +11,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> ローカルファイルを FTP サーバーに保存します。
@@ -26,7 +26,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -34,7 +34,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>remote_filename</parameter></term>
      <listitem>
       <para>
        リモートファイルのパス。
@@ -42,7 +42,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>local_file</parameter></term>
+     <term><parameter>local_filename</parameter></term>
      <listitem>
       <para>
        ローカルファイルのパス。
@@ -59,7 +59,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>startpos</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>リモートファイル内での、アップロード開始位置。</para>
      </listitem>
@@ -141,7 +141,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 8bb3be56f9..36188af637 100644
--- a/reference/ftp/functions/ftp-pwd.xml
+++ b/reference/ftp/functions/ftp-pwd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-pwd" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -10,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>
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -76,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 c3cd3887ce..ffd9095d8c 100644
--- a/reference/ftp/functions/ftp-raw.xml
+++ b/reference/ftp/functions/ftp-raw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.ftp-raw" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ftp_raw</refname>
@@ -10,7 +10,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>
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -78,7 +78,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 9d26017d40..229a9095a3 100644
--- a/reference/ftp/functions/ftp-rawlist.xml
+++ b/reference/ftp/functions/ftp-rawlist.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa -->
 <refentry xml:id="function.ftp-rawlist" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -10,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>
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -117,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 91fdf2de55..4248e13803 100644
--- a/reference/ftp/functions/ftp-rename.xml
+++ b/reference/ftp/functions/ftp-rename.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 309ccd7aa4b2409c1b60d5ed5d910ee5dcfea982 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.ftp-rename" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,9 +11,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> は FTP サーバー上のファイルやディレクトリの
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>oldname</parameter></term>
+     <term><parameter>from</parameter></term>
      <listitem>
       <para>
        現在のファイル/ディレクトリの名前。
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>newname</parameter></term>
+     <term><parameter>to</parameter></term>
      <listitem>
       <para>
        新しい名前。
@@ -92,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-rmdir.xml b/reference/ftp/functions/ftp-rmdir.xml
index b386f106d6..3e9ee516e2 100644
--- a/reference/ftp/functions/ftp-rmdir.xml
+++ b/reference/ftp/functions/ftp-rmdir.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-rmdir" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,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> 
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -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-set-option.xml b/reference/ftp/functions/ftp-set-option.xml
index 1e7d469674..314002893e 100644
--- a/reference/ftp/functions/ftp-set-option.xml
+++ b/reference/ftp/functions/ftp-set-option.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: cbbd9d134a64d9621ad9ab340e211010d6727d90 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
-<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>さまざまな FTP 実行時オプションを設定する</refpurpose>
@@ -11,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>
    この関数は、指定した FTP ストリームに関してのさまざまな実行時オプションを
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -120,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 a03e6674b1..d6dd84a984 100644
--- a/reference/ftp/functions/ftp-site.xml
+++ b/reference/ftp/functions/ftp-site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-site" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,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>
@@ -29,7 +29,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -91,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 4116a5889b..0bd9dd9627 100644
--- a/reference/ftp/functions/ftp-size.xml
+++ b/reference/ftp/functions/ftp-size.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-size" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,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> は指定されたファイルのサイズを
@@ -29,7 +29,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -37,7 +37,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>remote_file</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        リモートファイル。
@@ -97,7 +97,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 82eee6e7ce..beccbc0d3f 100644
--- a/reference/ftp/functions/ftp-ssl-connect.xml
+++ b/reference/ftp/functions/ftp-ssl-connect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.ftp-ssl-connect" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -10,14 +10,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> は、指定した
-   <parameter>host</parameter> への<emphasis>明示的な</emphasis> SSL-FTP 接続をオープンします。
+   <parameter>hostname</parameter> への<emphasis>明示的な</emphasis> SSL-FTP 接続をオープンします。
    サーバー側が SSL-FTP 接続に対応していなかったり、証明書が無効であったりした場合でも、
    <function>ftp_ssl_connect</function> は成功します。
    そういった場合は、<function>ftp_login</function>
@@ -46,7 +46,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>host</parameter></term>
+     <term><parameter>hostname</parameter></term>
      <listitem>
       <para>
        FTP サーバーのアドレス。このパラメータには、最後のスラッシュや
@@ -126,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 6fa67db34b..fd91499554 100644
--- a/reference/ftp/functions/ftp-systype.xml
+++ b/reference/ftp/functions/ftp-systype.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 18680fd1681731888c6fb7c530cfdb712f53e954 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.ftp-systype" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -10,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>
    リモート FTP サーバーのシステム型 ID を返します。
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>ftp_stream</parameter></term>
+     <term><parameter>ftp</parameter></term>
      <listitem>
       <para>
        FTP 接続のリンク ID 。
@@ -71,7 +71,6 @@ Example.com is powered by UNIX
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml