Modified: phpdoc/ja/trunk/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml
===================================================================
--- phpdoc/ja/trunk/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.geoip-time-zone-by-country-and-region" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>geoip_time_zone_by_country_and_region</refname>
@@ -60,8 +60,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-    成功した場合はタイムゾーン、国コードと地域コードの組に対応するタイムゾーンが見つからなかった場合は
-    &false; を返します。
+   成功した場合はタイムゾーン、国コードと地域コードの組に対応するタイムゾーンが見つからなかった場合は
+   &false; を返します。
   </para>
  </refsect1>


Modified: phpdoc/ja/trunk/reference/hash/functions/hash-init.xml
===================================================================
--- phpdoc/ja/trunk/reference/hash/functions/hash-init.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/hash/functions/hash-init.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: takagi Status: ready -->
 <!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.hash-init" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,7 +13,7 @@
    <type>resource</type><methodname>hash_init</methodname>
    <methodparam><type>string</type><parameter>algo</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>key</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>key</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>

  </refsect1>

Modified: phpdoc/ja/trunk/reference/hash/functions/hash-update-file.xml
===================================================================
--- phpdoc/ja/trunk/reference/hash/functions/hash-update-file.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/hash/functions/hash-update-file.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.hash-update-file" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>hash_update_file</refname>
@@ -15,7 +15,7 @@
    <type>bool</type><methodname>hash_update_file</methodname>
    <methodparam><type>resource</type><parameter>context</parameter></methodparam>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>context</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>

  </refsect1>

Modified: phpdoc/ja/trunk/reference/http/HttpQueryString/get.xml
===================================================================
--- phpdoc/ja/trunk/reference/http/HttpQueryString/get.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/http/HttpQueryString/get.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.httpquerystring-get" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>HttpQueryString::get</refname>
@@ -13,7 +13,7 @@
    <type>mixed</type><methodname>HttpQueryString::get</methodname>
    <methodparam choice="opt"><type>string</type><parameter>key</parameter></methodparam>
    <methodparam choice="opt"><type>mixed</type><parameter>type</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>defval</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>mixed</type><parameter>defval</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>delete</parameter><initializer>false</initializer></methodparam>
   </methodsynopsis>


Modified: phpdoc/ja/trunk/reference/hw/configure.xml
===================================================================
--- phpdoc/ja/trunk/reference/hw/configure.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/hw/configure.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,26 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
 <section xml:id="hw.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.install;
  <para>
-  &pecl.moved;
-  <!--
-  Not yet available
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;hyperwave">&url.pecl.package;hyperwave</link>.
-  -->
+  &pecl.info.dead;
+  <link xlink:href="&url.pecl.vcs;hyperwave">&url.pecl.vcs;hyperwave</link>.
  </para>
  <para>
-  これらの関数を使用するには、オプション
-  <option role="configure">--with-hyperwave[=DIR]</option> を使用して
-  Hyperwave サポートつきで PHP をコンパイルする必要があります。
+  &pecl.moved-ver;5.0.0
  </para>
- <para>
-  Windows ユーザがこれらの関数を使用するには、&php.ini; の中で
-  <filename>php_hyperwave.dll</filename> を有効にします。
-  &pecl.windows.download;
- </para>
 </section>

 <!-- Keep this comment at the end of the file

Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-blob-create.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-blob-create.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-blob-create.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id='function.ibase-blob-create'>
  <refnamediv>
   <refname>ibase_blob_create</refname>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>resource</type><methodname>ibase_blob_create</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ibase_blob_create</function> は、
@@ -40,7 +40,7 @@
   &reftitle.returnvalues;
   <para>
    <function>ibase_blob_add</function> で使用するための
-   BLOB ハンドルを返します。失敗した場合は &false; を返します。
+   BLOB ハンドルを返します。&return.falseforfailure;。
   </para>
  </refsect1>


Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-blob-open.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-blob-open.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-blob-open.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id='function.ibase-blob-open'>
  <refnamediv>
   <refname>ibase_blob_open</refname>
@@ -52,7 +52,7 @@
   &reftitle.returnvalues;
   <para>
    後で <function>ibase_blob_get</function> とともに使用する
-   BLOB ハンドルを返します。失敗した場合には &false; を返します。
+   BLOB ハンドルを返します。&return.falseforfailure;。
   </para>
  </refsect1>


Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-close.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-close.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-close.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-close">
  <refnamediv>
   <refname>ibase_close</refname>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ibase_close</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>connection_id</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>connection_id</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>ibase_connect</function> から返された接続 ID が指す

Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-commit-ret.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-commit-ret.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-commit-ret.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: takagi Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-commit-ret">
  <refnamediv>
   <refname>ibase_commit_ret</refname>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ibase_commit_ret</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    トランザクションを閉じずにコミットします。

Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-commit.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-commit.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-commit.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-commit">
  <refnamediv>
   <refname>ibase_commit</refname>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ibase_commit</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    トランザクションをコミットします。

Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-connect.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-connect.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-connect.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-connect">
  <refnamediv>
   <refname>ibase_connect</refname>
@@ -138,31 +138,6 @@
   </para>
  </refsect1>

- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>4.0.0</entry>
-       <entry>
-        <parameter>buffers</parameter>、<parameter>dialect</parameter>
-        および <parameter>role</parameter> が追加されました。
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <para>

Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-drop-db.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-drop-db.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-drop-db.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: takagi Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-drop-db">
  <refnamediv>
   <refname>ibase_drop_db</refname>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ibase_drop_db</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    この関数は、<function>ibase_connect</function> あるいは

Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-gen-id.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-gen-id.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-gen-id.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297078 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: takagi Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-gen-id">
  <refnamediv>
   <refname>ibase_gen_id</refname>
@@ -13,7 +13,7 @@
    <type>mixed</type><methodname>ibase_gen_id</methodname>
    <methodparam><type>string</type><parameter>generator</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>increment</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>

   &warn.undocumented.func;

Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-pconnect.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-pconnect.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-pconnect.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-pconnect">
  <refnamediv>
   <refname>ibase_pconnect</refname>
@@ -136,31 +136,6 @@
   </para>
  </refsect1>

- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>4.0.0</entry>
-       <entry>
-        <parameter>buffers</parameter>、<parameter>dialect</parameter>
-        および <parameter>role</parameter> が追加されました。
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>

Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-rollback-ret.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-rollback-ret.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-rollback-ret.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: takagi Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-rollback-ret">
  <refnamediv>
   <refname>ibase_rollback_ret</refname>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ibase_rollback_ret</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    トランザクションを閉じずにロールバックします。

Modified: phpdoc/ja/trunk/reference/ibase/functions/ibase-rollback.xml
===================================================================
--- phpdoc/ja/trunk/reference/ibase/functions/ibase-rollback.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ibase/functions/ibase-rollback.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-rollback">
  <refnamediv>
   <refname>ibase_rollback</refname>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ibase_rollback</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    トランザクションをロールバックします。

Modified: phpdoc/ja/trunk/reference/iconv/functions/iconv-get-encoding.xml
===================================================================
--- phpdoc/ja/trunk/reference/iconv/functions/iconv-get-encoding.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/iconv/functions/iconv-get-encoding.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.iconv-get-encoding" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>iconv_get_encoding</refname>
@@ -43,7 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   成功時に内部設定変数の現在の設定、失敗時に &false; を返します。
+   成功時に内部設定変数の現在の設定、&return.falseforfailure;。
   </para>
   <para>
    <parameter>type</parameter> が省略されるか、"all"が指定された場合、

Modified: phpdoc/ja/trunk/reference/iconv/functions/iconv-mime-encode.xml
===================================================================
--- phpdoc/ja/trunk/reference/iconv/functions/iconv-mime-encode.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/iconv/functions/iconv-mime-encode.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 298918 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.iconv-mime-encode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>iconv_mime_encode</refname>
@@ -13,7 +13,7 @@
    <type>string</type><methodname>iconv_mime_encode</methodname>
    <methodparam><type>string</type><parameter>field_name</parameter></methodparam>
    <methodparam><type>string</type><parameter>field_value</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>preferences</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>preferences</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    有効な <literal>MIME</literal> ヘッダフィールドを作成し、返します。

Modified: phpdoc/ja/trunk/reference/iconv/functions/iconv-substr.xml
===================================================================
--- phpdoc/ja/trunk/reference/iconv/functions/iconv-substr.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/iconv/functions/iconv-substr.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 297078 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.iconv-substr" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>iconv_substr</refname>
@@ -13,7 +13,7 @@
    <type>string</type><methodname>iconv_substr</methodname>
    <methodparam><type>string</type><parameter>str</parameter></methodparam>
    <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>strlen($str)</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>charset</parameter><initializer>ini_set("iconv.internal_encoding")</initializer></methodparam>
   </methodsynopsis>
   <para>

Modified: phpdoc/ja/trunk/reference/iconv/functions/iconv.xml
===================================================================
--- phpdoc/ja/trunk/reference/iconv/functions/iconv.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/iconv/functions/iconv.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 290987 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.iconv" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -67,7 +67,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   変換された文字列、あるいは失敗した場合に &false; を返します。
+   変換された文字列、&return.falseforfailure;。
   </para>
  </refsect1>


Modified: phpdoc/ja/trunk/reference/ifx/functions/ifx-errormsg.xml
===================================================================
--- phpdoc/ja/trunk/reference/ifx/functions/ifx-errormsg.xml	2010-05-04 07:09:36 UTC (rev 298943)
+++ phpdoc/ja/trunk/reference/ifx/functions/ifx-errormsg.xml	2010-05-04 07:33:12 UTC (rev 298944)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.ifx-errormsg" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ifx_errormsg</refname>
@@ -48,7 +48,7 @@
     <title><function>ifx_errormsg</function> の例</title>
     <programlisting role="php">
 <![CDATA[
-printf("%s\n&lt;br>", ifx_errormsg(-201));
+printf("%s\n<br>", ifx_errormsg(-201));
 ]]>
     </programlisting>
    </example>