Modified: phpdoc/ja/trunk/reference/eio/functions/eio-seek.xml
===================================================================
--- phpdoc/ja/trunk/reference/eio/functions/eio-seek.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/eio/functions/eio-seek.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 324122 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 329114 Maintainer: takagi Status: ready -->

 <refentry xml:id="function.eio-seek" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>

Modified: phpdoc/ja/trunk/reference/mongo/mongogridfs/storeupload.xml
===================================================================
--- phpdoc/ja/trunk/reference/mongo/mongogridfs/storeupload.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/mongo/mongogridfs/storeupload.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 329045 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 329130 Maintainer: takagi Status: ready -->

 <refentry xml:id="mongogridfs.storeupload" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -42,6 +42,11 @@
        格納するファイルに含めるその他のメタデータフィールド。
       </para>
       &mongo.gridfs.store.metadata.note;
+      <note>
+       <para>
+        <literal>filename</literal> インデックスには、使用したファイル名が入ります。
+       </para>
+      </note>
      </listitem>
     </varlistentry>
    </variablelist>

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-split.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-split.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-split.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 313291 Maintainer: hirokawa Status: ready -->
-<!-- CREDITS: haruki -->
-<!-- CREDITS: elf -->
+<!-- EN-Revision: 329086 Maintainer: hirokawa Status: ready -->
+<!-- CREDITS: haruki,elf -->
 <refentry xml:id="function.preg-split" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>preg_split</refname>
@@ -149,9 +148,20 @@
 <?php
 // カンマまたは " ", \r, \t, \n , \f などの空白文字で句を分割する。
 $keywords = preg_split("/[\s,]+/", "hypertext language, programming");
-?>
+print_r($keywords);
 ]]>
     </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+Array
+(
+    [0] => hypertext
+    [1] => language
+    [2] => programming
+)
+]]>
+    </screen>
    </example>
   </para>
   <para>
@@ -163,9 +173,22 @@
 $str = 'string';
 $chars = preg_split('//', $str, -1, PREG_SPLIT_NO_EMPTY);
 print_r($chars);
-?>
 ]]>
     </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+Array
+(
+    [0] => s
+    [1] => t
+    [2] => r
+    [3] => i
+    [4] => n
+    [5] => g
+)
+]]>
+    </screen>
    </example>
   </para>
   <para>

Modified: phpdoc/ja/trunk/reference/pdo/pdostatement/setfetchmode.xml
===================================================================
--- phpdoc/ja/trunk/reference/pdo/pdostatement/setfetchmode.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/pdo/pdostatement/setfetchmode.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 322104 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 329087 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="pdostatement.setfetchmode" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -88,7 +88,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   成功時は <literal>1</literal>、&return.falseforfailure;。
+   &return.success;
   </para>
  </refsect1>


Modified: phpdoc/ja/trunk/reference/regex/functions/ereg-replace.xml
===================================================================
--- phpdoc/ja/trunk/reference/regex/functions/ereg-replace.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/regex/functions/ereg-replace.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 324523 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 329092 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ereg-replace">
  <refnamediv>
   <refname>ereg_replace</refname>
@@ -143,9 +143,8 @@
   &note.regex.deprecated;
   <tip>
    <para>
-    Perl 互換の正規表現構文を使用する
-    <function>preg_replace</function> のほうが、
-    <function>ereg_replace</function> より高速に動作することがよくあります。
+    <function>ereg_replace</function> は PHP 5.3.0 以降で非推奨になりました。この関数のかわりに
+    <function>preg_replace</function> を使うことを推奨します。
    </para>
   </tip>
  </refsect1>

Modified: phpdoc/ja/trunk/reference/regex/functions/ereg.xml
===================================================================
--- phpdoc/ja/trunk/reference/regex/functions/ereg.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/regex/functions/ereg.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 329092 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ereg">
  <refnamediv>
   <refname>ereg</refname>
@@ -133,12 +133,12 @@
  <refsect1 role="notes">
   &reftitle.notes;
   &note.regex.deprecated;
-  <note>
+  <tip>
    <para>
-    Perl 互換の正規表現構文を使用する <function>preg_match</function>
-    のほうが、多くの場合 <function>ereg</function> よりも速く動作します。
+    <function>ereg</function> は PHP 5.3.0 以降で非推奨になりました。この関数のかわりに
+    <function>preg_match</function> を使うことを推奨します。
    </para>
-  </note>
+  </tip>
  </refsect1>

  <refsect1 role="seealso">

Modified: phpdoc/ja/trunk/reference/regex/functions/eregi-replace.xml
===================================================================
--- phpdoc/ja/trunk/reference/regex/functions/eregi-replace.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/regex/functions/eregi-replace.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 324523 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 329092 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.eregi-replace">
  <refnamediv>
   <refname>eregi_replace</refname>
@@ -92,6 +92,13 @@
  <refsect1 role="notes">
   &reftitle.notes;
   &note.regex.deprecated;
+  <tip>
+   <para>
+    <function>eregi_replace</function> は PHP 5.3.0 以降で非推奨になりました。この関数のかわりに
+    <function>preg_replace</function> で <literal>i</literal> (<constant>PCRE_CASELESS</constant>)
+    修飾子 を使うことを推奨します。
+   </para>
+  </tip>
  </refsect1>

  <refsect1 role="seealso">

Modified: phpdoc/ja/trunk/reference/regex/functions/eregi.xml
===================================================================
--- phpdoc/ja/trunk/reference/regex/functions/eregi.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/regex/functions/eregi.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 321866 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 329092 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.eregi">
  <refnamediv>
@@ -100,6 +100,13 @@
  <refsect1 role="notes">
   &reftitle.notes;
   &note.regex.deprecated;
+  <tip>
+   <para>
+    <function>eregi</function> は PHP 5.3.0 以降で非推奨になりました。この関数のかわりに
+    <function>preg_match</function> で <literal>i</literal> (<constant>PCRE_CASELESS</constant>)
+    修飾子 を使うことを推奨します。
+   </para>
+  </tip>
  </refsect1>

  <refsect1 role="seealso">

Modified: phpdoc/ja/trunk/reference/regex/functions/split.xml
===================================================================
--- phpdoc/ja/trunk/reference/regex/functions/split.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/regex/functions/split.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 308253 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 329092 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.split">
  <refnamediv>
@@ -130,8 +130,8 @@
   &note.regex.deprecated;
   <tip>
    <para>
-    Perl 互換の正規表現構文を使用する <function>preg_split</function>
-    は、往々にして <function>split</function> よりも速い代替案となります。
+    <function>split</function> は PHP 5.3.0 以降で非推奨になりました。この関数のかわりに
+    <function>preg_split</function> を使うことを推奨します。
     正規表現の威力が必要ないのであれば、<function>explode</function>
     を使用するほうがより高速です。これは正規表現エンジンの
     オーバーヘッドを受けません。

Modified: phpdoc/ja/trunk/reference/regex/functions/spliti.xml
===================================================================
--- phpdoc/ja/trunk/reference/regex/functions/spliti.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/regex/functions/spliti.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 308253 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 329092 Maintainer: hirokawa Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.spliti">
  <refnamediv>
   <refname>spliti</refname>
@@ -124,6 +124,13 @@
  <refsect1 role="notes">
   &reftitle.notes;
   &note.regex.deprecated;
+  <tip>
+   <para>
+    <function>spliti</function> は PHP 5.3.0 以降で非推奨になりました。この関数のかわりに
+    <function>preg_split</function> で <literal>i</literal> (<constant>PCRE_CASELESS</constant>)
+    修飾子 を使うことを推奨します。
+   </para>
+  </tip>
  </refsect1>

  <refsect1 role="seealso">

Modified: phpdoc/ja/trunk/reference/spl/arrayobject/construct.xml
===================================================================
--- phpdoc/ja/trunk/reference/spl/arrayobject/construct.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/spl/arrayobject/construct.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 326112 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 329089 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="arrayobject.construct" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -58,7 +58,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.void;
+   成功した場合に ArrayObject オブジェクトを返します。
   </para>
  </refsect1>


Modified: phpdoc/ja/trunk/reference/strings/functions/crypt.xml
===================================================================
--- phpdoc/ja/trunk/reference/strings/functions/crypt.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/strings/functions/crypt.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 326912 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 329093 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook" xml:id="function.crypt">
  <refnamediv>
@@ -70,7 +70,7 @@
     <simpara>
      <constant>CRYPT_BLOWFISH</constant> - Blowfish ハッシュ。salt の形式は、
      "$2a$" か "$2x$" あるいは "$2y$"、2 桁のコストパラメータ、"$"、そして文字 "./0-9A-Za-z"
-     からなる 22 桁となります。
+     からなる 22 文字となります。
      この範囲外の文字を salt に使うと、crypt() は長さゼロの文字列を返します。
      2 桁のコストパラメータは反復回数の 2 を底とする対数で、
      これは Blowfish ベースのハッシュアルゴリズムで使います。

Modified: phpdoc/ja/trunk/reference/yaf/yaf_view_simple/clear.xml
===================================================================
--- phpdoc/ja/trunk/reference/yaf/yaf_view_simple/clear.xml	2013-01-14 08:24:43 UTC (rev 329134)
+++ phpdoc/ja/trunk/reference/yaf/yaf_view_simple/clear.xml	2013-01-14 10:33:07 UTC (rev 329135)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 320078 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 329114 Maintainer: takagi Status: ready -->

 <refentry xml:id="yaf-view-simple.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>