Modified: phpdoc/ja/trunk/appendices/ini.xml
===================================================================
--- phpdoc/ja/trunk/appendices/ini.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/appendices/ini.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -1667,7 +1667,7 @@
       <row>
        <entry><link linkend="ini.mbstring.func-overload">mbstring.func_overload</link></entry>
        <entry>"0"</entry>
-       <entry>PHP_INI_PERDIR</entry>
+       <entry>PHP_INI_SYSTEM</entry>
        <entry>PHP &lt;= 4.2.3 では PHP_INI_SYSTEM。
        PHP 4.3 から  PHP 5.2.6 ではPHP_INI_SYSTEM | PHP_INI_PERDIR。
        PHP 4.2.0 以降で利用可能。</entry>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-convert-kana.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-convert-kana.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-convert-kana.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 291316 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-convert-kana" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -13,7 +13,7 @@
   <methodsynopsis>
    <type>string</type><methodname>mb_convert_kana</methodname>
    <methodparam><type>string</type><parameter>str</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>option</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>option</parameter><initializer>"KV"</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -39,11 +39,10 @@
      <term><parameter>option</parameter></term>
      <listitem>
       <para>
-       変換オプション。デフォルト値は <literal>"KV"</literal> です。
+       変換オプション。
       </para>
       <para>
-       以下のオプションを組み合わせて指定します。デフォルト値は
-       <literal>KV</literal> です。
+       以下のオプションを組み合わせて指定します。
        <table>
         <title>使用可能な変換オプション</title>
         <tgroup cols="2">

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search-init.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search-init.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search-init.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 291313 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-ereg-search-init" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -50,7 +50,7 @@
      <term><parameter>option</parameter></term>
      <listitem>
       <para>
-       検索オプション。デフォルトは 'ms'。
+       検索オプション。
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search-pos.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search-pos.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search-pos.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 291313 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-ereg-search-pos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -40,7 +40,7 @@
      <term><parameter>option</parameter></term>
      <listitem>
       <para>
-       検索オプション。デフォルトは 'ms'。
+       検索オプション。
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search-regs.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search-regs.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search-regs.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 291313 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-ereg-search-regs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -36,7 +36,7 @@
      <term><parameter>option</parameter></term>
      <listitem>
       <para>
-       検索オプション。デフォルトは 'ms'。
+       検索オプション。
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-ereg-search.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 291313 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-ereg-search" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -36,7 +36,7 @@
      <term><parameter>option</parameter></term>
      <listitem>
       <para>
-       検索オプション。デフォルトは 'ms'。
+       検索オプション。
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-regex-set-options.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-regex-set-options.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-regex-set-options.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 293213 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-regex-set-options" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -28,8 +28,101 @@
      <term><parameter>options</parameter></term>
      <listitem>
       <para>
-       設定するオプション。
+       設定するオプション。文字列で設定し、各文字がオプションを表します。
+       モードを設定する際には、モード文字は最後に指定しなければなりません。
+       オプションは複数指定できますが、モードはひとつしか指定できません。
       </para>
+
+      <table>
+       <title>Regex のオプション</title>
+       <tgroup cols="4">
+        <thead>
+         <row>
+          <entry>オプション</entry>
+          <entry>意味</entry>
+         </row>
+        </thead>
+        <tbody>
+         <row>
+          <entry>i</entry>
+          <entry>曖昧なマッチをオンにする</entry>
+         </row>
+         <row>
+          <entry>x</entry>
+          <entry>拡張パターン形式を有効にする</entry>
+         </row>
+         <row>
+          <entry>m</entry>
+          <entry><literal>'.'</literal> が改行にマッチする</entry>
+         </row>
+         <row>
+          <entry>s</entry>
+          <entry><literal>'^'</literal> -> <literal>'\A'</literal>, <literal>'$'</literal> -> <literal>'\Z'</literal></entry>
+         </row>
+         <row>
+          <entry>p</entry>
+          <entry><literal>m</literal> と <literal>s</literal> を両方指定するのと同じ</entry>
+         </row>
+         <row>
+          <entry>l</entry>
+          <entry>最も長くマッチするものを探す</entry>
+         </row>
+         <row>
+          <entry>n</entry>
+          <entry>空のマッチを無視する</entry>
+         </row>
+         <row>
+          <entry>e</entry>
+          <entry>結果のコードを <function>eval</function> する</entry>
+         </row>
+        </tbody>
+       </tgroup>
+      </table>
+      <table>
+       <title>Regex 構文モード</title>
+       <tgroup cols="4">
+        <thead>
+         <row>
+          <entry>モード</entry>
+          <entry>意味</entry>
+         </row>
+        </thead>
+        <tbody>
+         <row>
+          <entry>j</entry>
+          <entry>Java (Sun java.util.regex)</entry>
+         </row>
+         <row>
+          <entry>u</entry>
+          <entry>GNU regex</entry>
+         </row>
+         <row>
+          <entry>g</entry>
+          <entry>grep</entry>
+         </row>
+         <row>
+          <entry>c</entry>
+          <entry>Emacs</entry>
+         </row>
+         <row>
+          <entry>r</entry>
+          <entry>Ruby</entry>
+         </row>
+         <row>
+          <entry>z</entry>
+          <entry>Perl</entry>
+         </row>
+         <row>
+          <entry>b</entry>
+          <entry>POSIX Basic regex</entry>
+         </row>
+         <row>
+          <entry>d</entry>
+          <entry>POSIX Extended regex</entry>
+         </row>
+        </tbody>
+       </tgroup>
+      </table>
      </listitem>
     </varlistentry>
    </variablelist>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-strimwidth.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-strimwidth.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-strimwidth.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 291069 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.mb-strimwidth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>mb_strimwidth</refname>
@@ -86,7 +86,8 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$str = mb_strimwidth($str, 0, 40, "..>");
+echo mb_strimwidth("Hello World", 0, 10, "...");
+// Hello W... と出力します
 ?>
 ]]>
     </programlisting>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-stristr.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-stristr.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-stristr.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -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.mb-stristr" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mb_stristr</refname>
@@ -15,7 +15,7 @@
    <type>string</type><methodname>mb_stristr</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>string</type><parameter>needle</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>part</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>part</parameter><initializer>false</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -58,7 +58,6 @@
        <parameter>needle</parameter> が最初に現れる位置までを返します。
        &false; の場合は、<parameter>needle</parameter> が最初に現れる位置から
        <parameter>haystack</parameter> の最後までを返します。
-       デフォルト値は &false; です。
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-strrchr.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-strrchr.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-strrchr.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -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.mb-strrchr" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mb_strrchr</refname>
@@ -12,7 +12,7 @@
    <type>string</type><methodname>mb_strrchr</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>string</type><parameter>needle</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>part</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>part</parameter><initializer>false</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -53,7 +53,6 @@
        <parameter>needle</parameter> が最後に現れる位置までを返します。
        &false; の場合は、<parameter>needle</parameter> が最後に現れる位置から
        <parameter>haystack</parameter> の最後までを返します。
-       デフォルト値は &false; です。
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-strrichr.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-strrichr.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-strrichr.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -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.mb-strrichr" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mb_strrichr</refname>
@@ -15,7 +15,7 @@
    <type>string</type><methodname>mb_strrichr</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>string</type><parameter>needle</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>part</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>part</parameter><initializer>false</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -58,7 +58,6 @@
        <parameter>needle</parameter> が最後に現れる位置までを返します。
        &false; の場合は、<parameter>needle</parameter> が最後に現れる位置から
        <parameter>haystack</parameter> の最後までを返します。
-       デフォルト値は &false; です。
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-strstr.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-strstr.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-strstr.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -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.mb-strstr" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mb_strstr</refname>
@@ -12,7 +12,7 @@
    <type>string</type><methodname>mb_strstr</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>string</type><parameter>needle</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>part</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>part</parameter><initializer>false</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -53,7 +53,6 @@
        <parameter>needle</parameter> が最初に現れる位置までを返します。
        &false; の場合は、<parameter>needle</parameter> が最初に現れる位置から
        <parameter>haystack</parameter> の最後までを返します。
-       デフォルト値は &false; です。
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/mbstring/functions/mb-substitute-character.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/functions/mb-substitute-character.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/functions/mb-substitute-character.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 288721 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 295501 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-substitute-character" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -45,9 +45,14 @@
         </listitem>
         <listitem>
          <simpara>
-          "long" : 文字コードの値 (例: U+3000,JIS+7E7E) を出力する
+          "long" : 文字コードの値 (例: U+3000, JIS+7E7E) を出力する
          </simpara>
         </listitem>
+        <listitem>
+         <simpara>
+          "entity" : 文字エンティティ (例: &#x200;) を出力する
+         </simpara>
+        </listitem>
        </itemizedlist>
       </para>
      </listitem>

Modified: phpdoc/ja/trunk/reference/mbstring/ini.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/ini.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/ini.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -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 -->
 <!-- CREDITS: takagi -->
 <section xml:id="mbstring.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
@@ -63,8 +63,10 @@
     <row>
       <entry><link linkend="ini.mbstring.func-overload">mbstring.func_overload</link></entry>
      <entry>"0"</entry>
-     <entry>PHP_INI_PERDIR</entry>
-     <entry>PHP 4.2.0 から利用可能で、PHP &lt;= 4.2.3 は PHP_INI_SYSTEM です。</entry>
+     <entry>PHP_INI_SYSTEM</entry>
+     <entry>PHP &lt;= 4.2.3 では PHP_INI_SYSTEM。
+     PHP 4.3 から  PHP 5.2.6 では PHP_INI_SYSTEM | PHP_INI_PERDIR。
+     PHP 4.2.0 から利用可能です。</entry>
     </row>
     <row>
       <entry><link linkend="ini.mbstring.encoding-translation">mbstring.encoding_translation</link></entry>

Modified: phpdoc/ja/trunk/reference/mbstring/overloading.xml
===================================================================
--- phpdoc/ja/trunk/reference/mbstring/overloading.xml	2010-04-09 17:46:22 UTC (rev 297764)
+++ phpdoc/ja/trunk/reference/mbstring/overloading.xml	2010-04-09 18:05:12 UTC (rev 297765)
@@ -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 -->
 <!-- CREDITS: hirokawa -->

 <chapter xml:id="mbstring.overload" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -77,6 +77,31 @@
      </row>
      <row>
       <entry>2</entry>
+      <entry><function>stripos</function></entry>
+      <entry><function>mb_stripos</function></entry>
+     </row>
+     <row>
+      <entry>2</entry>
+      <entry><function>strripos</function></entry>
+      <entry><function>mb_strripos</function></entry>
+     </row>
+     <row>
+      <entry>2</entry>
+      <entry><function>strstr</function></entry>
+      <entry><function>mb_strstr</function></entry>
+     </row>
+     <row>
+      <entry>2</entry>
+      <entry><function>stristr</function></entry>
+      <entry><function>mb_stristr</function></entry>
+     </row>
+     <row>
+      <entry>2</entry>
+      <entry><function>strrchr</function></entry>
+      <entry><function>mb_strrchr</function></entry>
+     </row>
+     <row>
+      <entry>2</entry>
       <entry><function>substr_count</function></entry>
       <entry><function>mb_substr_count</function></entry>
      </row>