Modified: phpdoc/ja/trunk/appendices/migration56/new-features.xml
===================================================================
--- phpdoc/ja/trunk/appendices/migration56/new-features.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/appendices/migration56/new-features.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334740 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335317 Maintainer: takagi Status: ready -->

 <sect1 xml:id="migration56.new-features" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>新機能</title>

  <sect2 xml:id="migration56.new-features.const-scalar-exprs">
-  <title>定数のスカラー式</title>
+  <title>定数式</title>

   <para>
    数値や文字列リテラルと定数を、これまでのバージョンでは静的な値が想定されていた場面
@@ -44,6 +44,29 @@
 ]]>
    </screen>
   </informalexample>
+
+  <para>
+   配列も、
+   <literal>const</literal> キーワードで定数として定義できるようになりました。
+  </para>
+
+  <informalexample>
+   <programlisting role="php">
+<![CDATA[
+<?php
+const ARR = ['a', 'b'];
+
+echo ARR[0];
+?>
+]]>
+   </programlisting>
+   &example.outputs;
+   <screen>
+<![CDATA[
+a
+]]>
+   </screen>
+  </informalexample>
  </sect2>

  <sect2 xml:id="migration56.new-features.variadics">

Modified: phpdoc/ja/trunk/reference/imagick/imagick/compositeimage.xml
===================================================================
--- phpdoc/ja/trunk/reference/imagick/imagick/compositeimage.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/imagick/imagick/compositeimage.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 322115 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335338 Maintainer: takagi Status: ready -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.compositeimage">
  <refnamediv>
   <refname>Imagick::compositeImage</refname>
@@ -19,6 +19,8 @@
   </methodsynopsis>
   <para>
    ある画像を、別の画像の指定した位置に合成します。
+   合成アルゴリズムに指定する引数は、
+   setImageArtifact の第一パラメータに 'compose:args'、第二パラメータにデータを渡す必要があります。
   </para>
  </refsect1>

@@ -80,6 +82,45 @@
   </para>
  </refsect1>

+  <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>Imagick::compositeImage</function> の利用例</title>
+    <para>
+     二つの画像を 'mathematics' 方式で合成します。
+    </para>
+    <programlisting role="php">
+<![CDATA[
+<?php
+
+// これは、以下のコマンドを実行するのと同等の処理です
+// convert src1.png src2.png -compose mathematics -define compose:args="1,0,-0.5,0.5" -composite output.png
+
+$src1 = new \Imagick("./src1.png");
+$src2 = new \Imagick("./src2.png");
+
+$src1->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
+$src1->setImageArtifact('compose:args', "1,0,-0.5,0.5");
+$src1->compositeImage($src2, Imagick::COMPOSITE_MATHEMATICS, 0, 0);
+$src1->writeImage("./output.png");
+
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>Imagick::setImageArtifact</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
 </refentry>

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

Modified: phpdoc/ja/trunk/reference/mongo/mongocursor/batchsize.xml
===================================================================
--- phpdoc/ja/trunk/reference/mongo/mongocursor/batchsize.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/mongo/mongocursor/batchsize.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <!-- $Revision$ -->
-<!-- EN-Revision: 332247 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335345 Maintainer: takagi Status: ready -->
 <refentry xml:id="mongocursor.batchsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>MongoCursor::batchSize</refname>
@@ -17,7 +17,7 @@
   <para>
    カーソルは一般的に、結果オブジェクトをバッチで取得してローカルに格納します。
    このメソッドはバッチのサイズを決めるもので、
-   ひとつのデータパケットでサーバーから取得するドキュメントの数を設定できます。
+   一回の欧風でサーバーから取得するドキュメントの数を設定できます。
    しかし、バッチサイズの最大値 (通常は 4MB) に収まらないドキュメントは返せません。
   </para>
  </refsect1>

Modified: phpdoc/ja/trunk/reference/mongo/mongodb/getcollectionnames.xml
===================================================================
--- phpdoc/ja/trunk/reference/mongo/mongodb/getcollectionnames.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/mongo/mongodb/getcollectionnames.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334841 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335314 Maintainer: takagi Status: ready -->

 <refentry xml:id="mongodb.getcollectionnames" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -75,6 +75,7 @@
   <para>
    <simplelist>
     <member><function>MongoDB::listCollections</function></member>
+    <member><function>MongoDB::getCollectionInfo</function></member>
    </simplelist>
   </para>
  </refsect1>

Modified: phpdoc/ja/trunk/reference/mongo/mongodb/listcollections.xml
===================================================================
--- phpdoc/ja/trunk/reference/mongo/mongodb/listcollections.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/mongo/mongodb/listcollections.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334840 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335314 Maintainer: takagi Status: ready -->

 <refentry xml:id="mongodb.listcollections"  xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -105,6 +105,7 @@
   <para>
    <simplelist>
     <member><function>MongoDB::getCollectionNames</function></member>
+    <member><function>MongoDB::getCollectionInfo</function></member>
    </simplelist>
   </para>
  </refsect1>

Modified: phpdoc/ja/trunk/reference/mysqli/functions/mysqli-report.xml
===================================================================
--- phpdoc/ja/trunk/reference/mysqli/functions/mysqli-report.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/mysqli/functions/mysqli-report.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 329175 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335334 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.mysqli-report" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysqli_report</refname>

Modified: phpdoc/ja/trunk/reference/ncurses/functions/ncurses-deleteln.xml
===================================================================
--- phpdoc/ja/trunk/reference/ncurses/functions/ncurses-deleteln.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/ncurses/functions/ncurses-deleteln.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335340 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.ncurses-deleteln" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ncurses_deleteln</refname>

Modified: phpdoc/ja/trunk/reference/ncurses/functions/ncurses-mousemask.xml
===================================================================
--- phpdoc/ja/trunk/reference/ncurses/functions/ncurses-mousemask.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/ncurses/functions/ncurses-mousemask.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335343 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.ncurses-mousemask" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ncurses_mousemask</refname>
@@ -83,8 +83,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <parameter>newmask</parameter> が指定するイベントを報告することが
-   できるマスクを返します。失敗した場合は 0 を返します。
+   イベントを報告することができるマスクを返します。失敗した場合は <literal>0</literal> を返します。
   </para>
  </refsect1>
  <refsect1 role="examples">

Modified: phpdoc/ja/trunk/reference/ncurses/functions/ncurses-nocbreak.xml
===================================================================
--- phpdoc/ja/trunk/reference/ncurses/functions/ncurses-nocbreak.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/ncurses/functions/ncurses-nocbreak.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335352 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.ncurses-nocbreak" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ncurses_nocbreak</refname>

Modified: phpdoc/ja/trunk/reference/ncurses/functions/ncurses-noraw.xml
===================================================================
--- phpdoc/ja/trunk/reference/ncurses/functions/ncurses-noraw.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/ncurses/functions/ncurses-noraw.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335350 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.ncurses-noraw" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ncurses_noraw</refname>

Modified: phpdoc/ja/trunk/reference/ncurses/functions/ncurses-raw.xml
===================================================================
--- phpdoc/ja/trunk/reference/ncurses/functions/ncurses-raw.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/ncurses/functions/ncurses-raw.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335351 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.ncurses-raw" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ncurses_raw</refname>

Modified: phpdoc/ja/trunk/reference/ncurses/functions/ncurses-ungetmouse.xml
===================================================================
--- phpdoc/ja/trunk/reference/ncurses/functions/ncurses-ungetmouse.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/ncurses/functions/ncurses-ungetmouse.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335349 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.ncurses-ungetmouse" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ncurses_ungetmouse</refname>

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-filter.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-filter.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-filter.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 307739 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335337 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.preg-filter" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>preg_filter</refname>
@@ -96,11 +96,12 @@
   &reftitle.seealso;
   <para>
    <simplelist>
+    <member><link linkend="pcre.pattern">PCRE のパターン</link></member>
+    <member><function>preg_quote</function></member>
     <member><function>preg_replace</function></member>
     <member><function>preg_replace_callback</function></member>
     <member><function>preg_grep</function></member>
     <member><function>preg_last_error</function></member>
-    <member><link linkend="pcre.pattern">PCRE のパターン</link></member>
    </simplelist>
   </para>
  </refsect1>

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-grep.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-grep.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-grep.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334592 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335337 Maintainer: hirokawa Status: ready -->
 <!-- Credits: haruki -->
 <refentry xml:id="function.preg-grep" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -87,6 +87,7 @@
   <para>
    <simplelist>
     <member><link linkend="pcre.pattern">PCRE のパターン</link></member>
+    <member><function>preg_quote</function></member>
     <member><function>preg_match_all</function></member>
     <member><function>preg_filter</function></member>
     <member><function>preg_last_error</function></member>

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-match-all.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-match-all.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-match-all.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334605 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335337 Maintainer: hirokawa Status: ready -->
 <!-- Credits: haruki -->
 <refentry xml:id="function.preg-match-all" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -363,6 +363,7 @@
   <para>
    <simplelist>
     <member><link linkend="pcre.pattern">PCRE のパターン</link></member>
+    <member><function>preg_quote</function></member>
     <member><function>preg_match</function></member>
     <member><function>preg_replace</function></member>
     <member><function>preg_split</function></member>

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-match.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-match.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-match.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334605 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335337 Maintainer: hirokawa Status: ready -->
 <!-- Credits: haruki -->
 <refentry xml:id="function.preg-match" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -320,6 +320,7 @@
   <para>
    <simplelist>
     <member><link linkend="pcre.pattern">PCRE のパターン</link></member>
+    <member><function>preg_quote</function></member>
     <member><function>preg_match_all</function></member>
     <member><function>preg_replace</function></member>
     <member><function>preg_split</function></member>

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-quote.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-quote.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-quote.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 330635 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335316 Maintainer: hirokawa Status: ready -->
 <!-- Credits: haruki -->
 <refentry xml:id="function.preg-quote" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -112,7 +112,7 @@

 $textbody = "This book is *very* difficult to find.";
 $word = "*very*";
-$textbody = preg_replace ("/" . preg_quote($word) . "/",
+$textbody = preg_replace ("/" . preg_quote($word, '/') . "/",
                           "<i>" . $word . "</i>",
                           $textbody);
 ?>

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 331556 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335337 Maintainer: takagi Status: ready -->
 <!-- Credits: hirokawa,haruki -->
 <refentry xml:id="function.preg-replace-callback" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -239,6 +239,7 @@
   <para>
    <simplelist>
     <member><link linkend="pcre.pattern">PCRE のパターン</link></member>
+    <member><function>preg_quote</function></member>
     <member><function>preg_replace</function></member>
     <member><function>preg_last_error</function></member>
     <member><link linkend="functions.anonymous">無名関数</link></member>

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-replace.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-replace.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-replace.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334592 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 335337 Maintainer: takagi Status: ready -->
 <!-- Credits: hirokawa,haruki,shimooka -->
 <refentry xml:id="function.preg-replace" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -231,7 +231,7 @@
     &example.outputs;
     <screen>
 <![CDATA[
-The bear black slow jumped over the lazy dog.
+The slow black bear jumped over the lazy dog.
 ]]>
     </screen>
     <para>
@@ -337,6 +337,7 @@
   <para>
    <simplelist>
     <member><link linkend="pcre.pattern">PCRE のパターン</link></member>
+    <member><function>preg_quote</function></member>
     <member><function>preg_filter</function></member>
     <member><function>preg_match</function></member>
     <member><function>preg_replace_callback</function></member>

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-split.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-split.xml	2014-12-25 21:38:53 UTC (rev 335367)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-split.xml	2014-12-25 22:29:31 UTC (rev 335368)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334592 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 335337 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: haruki,elf -->
 <refentry xml:id="function.preg-split" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -227,6 +227,7 @@
   <para>
    <simplelist>
     <member><link linkend="pcre.pattern">PCRE のパターン</link></member>
+    <member><function>preg_quote</function></member>
     <member><function>implode</function></member>
     <member><function>preg_match</function></member>
     <member><function>preg_match_all</function></member>