Modified: phpdoc/ja/trunk/language/types/float.xml
===================================================================
--- phpdoc/ja/trunk/language/types/float.xml	2011-12-03 21:24:19 UTC (rev 320321)
+++ phpdoc/ja/trunk/language/types/float.xml	2011-12-03 21:26:16 UTC (rev 320322)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 305581 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 320310 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,shimooka -->
 <sect1 xml:id="language.types.float">
  <title>浮動小数点数</title>
@@ -89,6 +89,21 @@
   </para>

  </sect2>
+
+ <sect2 xml:id="language.types.float.nan">
+  <title>NaN</title>
+  <para>
+   数値演算の結果が、定数 <constant>NAN</constant> で表される値になることがあります。
+   この定数は、浮動小数点演算における未定義の値あるいは表現不能な値を表します。
+   この値を他の値と比較した場合、たとえ自分自身との比較であっても結果は &false; になります。
+   緩やかな比較の場合も厳格な比較の場合の同様です。
+  </para>
+  <para>
+   <constant>NAN</constant> はさまざまな値の数を表すものなので、
+   <constant>NAN</constant> を他の値を比較してはいけません。たとえ自分自身とであってもです。
+   チェックをする場合には、かわりに <function>is_nan</function> を使います。
+  </para>
+ </sect2>
 </sect1>

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

Modified: phpdoc/ja/trunk/language/types/string.xml
===================================================================
--- phpdoc/ja/trunk/language/types/string.xml	2011-12-03 21:24:19 UTC (rev 320321)
+++ phpdoc/ja/trunk/language/types/string.xml	2011-12-03 21:26:16 UTC (rev 320322)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 318169 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 320209 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,shimooka -->
 <sect1 xml:id="language.types.string">
  <title>文字列</title>
@@ -148,6 +148,10 @@
        <entry>垂直タブ (VT またはアスキーの 0x0B (11)) (PHP 5.2.5 以降)</entry>
       </row>
       <row>
+       <entry><literal>\e</literal></entry>
+       <entry>エスケープ (ESC あるいはアスキーの 0x1B (27)) (PHP 5.4.0 以降)</entry>
+      </row>
+      <row>
        <entry><literal>\f</literal></entry>
        <entry>フォームフィード (FF またはアスキーの 0x0C (12)) (PHP 5.2.5 以降)</entry>
       </row>

Modified: phpdoc/ja/trunk/reference/array/functions/array-chunk.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-chunk.xml	2011-12-03 21:24:19 UTC (rev 320321)
+++ phpdoc/ja/trunk/reference/array/functions/array-chunk.xml	2011-12-03 21:26:16 UTC (rev 320322)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
-<!-- CREDITS: shimooka -->
+<!-- EN-Revision: 320302 Maintainer: takagi Status: ready -->
+<!-- CREDITS: hirokawa,shimooka -->
 <refentry xml:id="function.array-chunk" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>array_chunk</refname>
@@ -137,6 +137,16 @@
    </example>
   </para>
  </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>array_slice</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
 </refentry>

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

Modified: phpdoc/ja/trunk/reference/array/functions/array-product.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-product.xml	2011-12-03 21:24:19 UTC (rev 320321)
+++ phpdoc/ja/trunk/reference/array/functions/array-product.xml	2011-12-03 21:26:16 UTC (rev 320322)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 320293 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.array-product" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>array_product</refname>
@@ -48,6 +48,7 @@

 $a = array(2, 4, 6, 8);
 echo "product(a) = " . array_product($a) . "\n";
+echo "product(array()) = " . array_product(array()) . "\n";

 ?>
 ]]>
@@ -56,6 +57,7 @@
     <screen>
 <![CDATA[
 product(a) = 384
+product(array()) = 1
 ]]>
     </screen>
    </example>

Modified: phpdoc/ja/trunk/reference/array/functions/array-reverse.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-reverse.xml	2011-12-03 21:24:19 UTC (rev 320321)
+++ phpdoc/ja/trunk/reference/array/functions/array-reverse.xml	2011-12-03 21:26:16 UTC (rev 320322)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 320282 Maintainer: takagi Status: ready -->
+<!-- CREDITS: hirokawa -->
 <refentry xml:id="function.array-reverse" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>array_reverse</refname>
@@ -33,7 +34,8 @@
      <term><parameter>preserve_keys</parameter></term>
      <listitem>
       <para>
-       &true; の場合はキーを保持します。
+       &true; の場合は数値のキーを保持します。
+       非数値のキーは、この設定にかかわらず常に保持されます。
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/array/functions/array-slice.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-slice.xml	2011-12-03 21:24:19 UTC (rev 320321)
+++ phpdoc/ja/trunk/reference/array/functions/array-slice.xml	2011-12-03 21:26:16 UTC (rev 320322)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 319411 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 320302 Maintainer: takagi Status: ready -->
+<!-- CREDITS: hirokawa -->
 <refentry xml:id="function.array-slice" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>array_slice</refname>
@@ -146,6 +147,7 @@
    <simplelist>
     <member><function>array_splice</function></member>
     <member><function>unset</function></member>
+    <member><function>array_chunk</function></member>
    </simplelist>
   </para>
  </refsect1>

Modified: phpdoc/ja/trunk/reference/array/functions/extract.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/extract.xml	2011-12-03 21:24:19 UTC (rev 320321)
+++ phpdoc/ja/trunk/reference/array/functions/extract.xml	2011-12-03 21:26:16 UTC (rev 320322)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 310276 Maintainer: hirokawa Status: ready -->
-<!-- CREDITS: shimooka -->
+<!-- EN-Revision: 320268 Maintainer: takagi Status: ready -->
+<!-- CREDITS: hirokawa,shimooka -->
 <refentry xml:id="function.extract" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>extract</refname>
@@ -352,6 +352,7 @@
   <para>
    <simplelist>
     <member><function>compact</function></member>
+    <member><function>list</function></member>
    </simplelist>
   </para>
  </refsect1>

Modified: phpdoc/ja/trunk/reference/array/functions/sort.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/sort.xml	2011-12-03 21:24:19 UTC (rev 320321)
+++ phpdoc/ja/trunk/reference/array/functions/sort.xml	2011-12-03 21:26:16 UTC (rev 320322)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 299468 Maintainer: hirokawa Status: ready -->
-<!-- CREDITS: shimooka -->
+<!-- EN-Revision: 320067 Maintainer: takagi Status: ready -->
+<!-- CREDITS: hirokawa,shimooka -->
 <refentry xml:id="function.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>sort</refname>
@@ -52,10 +52,9 @@
          <simpara><constant>SORT_STRING</constant> - 文字列として項目を比較</simpara>
         </listitem>
         <listitem>
-         <simpara><constant>SORT_LOCALE_STRING</constant> - は、カレントのロケールに
+         <simpara><constant>SORT_LOCALE_STRING</constant> - は、現在のロケールに
           に基づき比較を行います。PHP 4.4.0 と PHP 5.0.2で追加されました。
-          システムロケールを使用します。これは
-          <function>setlocale</function> を使用して変更可能です。
+          比較に使うロケールは、<function>setlocale</function> を使って変更できます。
           <!-- FIXME PHP_6
           PHP 6 より前のバージョンではシステムロケールを使用します。これは
           <function>setlocale</function> を使用して変更可能です。