Modified: phpdoc/ja/trunk/reference/pdo_sqlite/PDO/sqliteCreateFunction.xml
===================================================================
--- phpdoc/ja/trunk/reference/pdo_sqlite/PDO/sqliteCreateFunction.xml	2017-04-21 11:42:49 UTC (rev 342410)
+++ phpdoc/ja/trunk/reference/pdo_sqlite/PDO/sqliteCreateFunction.xml	2017-04-22 14:55:52 UTC (rev 342411)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 342156 Maintainer: takagi Status: working -->
 <refentry xml:id="pdo.sqlitecreatefunction" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>PDO::sqliteCreateFunction</refname>
@@ -15,7 +15,8 @@
    <modifier>public</modifier> <type>bool</type><methodname>PDO::sqliteCreateFunction</methodname>
    <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
    <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>num_args</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>num_args</parameter><initializer>-1</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   &warn.experimental.func;

@@ -62,11 +63,23 @@
      <term><parameter>num_args</parameter></term>
      <listitem>
       <para>
-       コールバック関数があらかじめ定義済みの引数を受け取る場合に、
-       SQLite のパーサに渡すヒント。
+       The number of arguments that the SQL function takes. If
+       this parameter is <literal>-1</literal>, then the SQL function may take
+       any number of arguments.
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term><parameter>flags</parameter></term>
+     <listitem>
+      <para>
+       A bitwise conjunction of flags. Currently, only
+       <constant>PDO::SQLITE_DETERMINISTIC</constant> is supported, which specifies
+       that the function always returns the same result given the same inputs
+       within a single SQL statement.
+      </para>
+     </listitem>
+    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
@@ -78,6 +91,28 @@
   </para>
  </refsect1>

+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>PHP 7.1.4</entry>
+      <entry>
+       <parameter>flags</parameter> が追加されました。
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>

Modified: phpdoc/ja/trunk/reference/reflection/reflectionclass/construct.xml
===================================================================
--- phpdoc/ja/trunk/reference/reflection/reflectionclass/construct.xml	2017-04-21 11:42:49 UTC (rev 342410)
+++ phpdoc/ja/trunk/reference/reflection/reflectionclass/construct.xml	2017-04-22 14:55:52 UTC (rev 342411)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 330543 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 340325 Maintainer: takagi Status: working -->

 <refentry xml:id="reflectionclass.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -17,9 +17,6 @@
   <para>
    新しい <classname>ReflectionClass</classname> オブジェクトを作成します。
   </para>
-
-  &warn.undocumented.func;
-
  </refsect1>

  <refsect1 role="parameters">
@@ -41,10 +38,17 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.void;
+   Returns constructed <classname>ReflectionClass</classname> instance.
   </para>
  </refsect1>

+ <refsect1 role="errors">
+  &reftitle.errors;
+  <para>
+   Throws <classname>ReflectionException</classname> if the class to reflect does not exist.
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>

Modified: phpdoc/ja/trunk/reference/url/functions/base64-decode.xml
===================================================================
--- phpdoc/ja/trunk/reference/url/functions/base64-decode.xml	2017-04-21 11:42:49 UTC (rev 342410)
+++ phpdoc/ja/trunk/reference/url/functions/base64-decode.xml	2017-04-22 14:55:52 UTC (rev 342411)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 342160 Maintainer: hirokawa Status: working -->
 <refentry xml:id="function.base64-decode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>base64_decode</refname>
@@ -36,7 +36,10 @@
      <term><parameter>strict</parameter></term>
      <listitem>
       <para>
-       入力に base64 アルファベットの範囲外の文字が含まれる場合に &false; を返す。
+       If the <parameter>strict</parameter> parameter is set to &true; then
+       <function>base64_decode</function> 関数は、
+       入力に base64 アルファベットの範囲外の文字が含まれる場合に &false; を返します。
+       Otherwise invalid characters will be silently discarded.
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/xml/functions/utf8-decode.xml
===================================================================
--- phpdoc/ja/trunk/reference/xml/functions/utf8-decode.xml	2017-04-21 11:42:49 UTC (rev 342410)
+++ phpdoc/ja/trunk/reference/xml/functions/utf8-decode.xml	2017-04-22 14:55:52 UTC (rev 342411)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 340506 Maintainer: hirokawa Status: working -->
 <refentry xml:id="function.utf8-decode" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>utf8_decode</refname>
@@ -16,10 +16,27 @@
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
-   この関数は、<parameter>data</parameter> が
-   <literal>UTF-8</literal> エンコードされているものとみなして
-   <literal>ISO-8859-1</literal> に変換します。
+   この関数は、文字列 <parameter>data</parameter> を <literal>UTF-8</literal>
+   エンコードから <literal>ISO-8859-1</literal> へ変換します。
+   Bytes in the string which are not valid <literal>UTF-8</literal>, and
+   <literal>UTF-8</literal> characters which do not exist in
+   <literal>ISO-8859-1</literal> (that is, characters above
+   <literal>U+00FF</literal>) are replaced with <literal>?</literal>.
   </para>
+  <note>
+   <para>
+    Many web pages marked as using the <literal>ISO-8859-1</literal> character
+    encoding actually use the similar <literal>Windows-1252</literal> encoding,
+    and web browsers will interpret <literal>ISO-8859-1</literal> web pages as
+    <literal>Windows-1252</literal>. <literal>Windows-1252</literal> features
+    additional printable characters, such as the Euro sign
+    (<literal>?</literal>) and curly quotes (<literal>“</literal>
+    <literal>”</literal>), instead of certain <literal>ISO-8859-1</literal>
+    control characters. This function will not convert such
+    <literal>Windows-1252</literal> characters correctly. Use a different
+    function if <literal>Windows-1252</literal> conversion is required.
+   </para>
+  </note>
  </refsect1>

  <refsect1 role="parameters">
@@ -49,7 +66,10 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>utf8_encode</function> (UTF-8 エンコーディングについての説明があります)</member>
+    <member><function>utf8_encode</function> - Performs the reverse conversion</member>
+    <member><function>mb_convert_encoding</function> - Converts between various character encodings, including UTF-8, ISO-8859-1 and Windows-1252</member>
+    <member><function>iconv</function> - Converts between various character encodings</member>
+    <member><function>recode_string</function> - Converts between various character encodings</member>
    </simplelist>
   </para>
  </refsect1>

Modified: phpdoc/ja/trunk/reference/xml/functions/utf8-encode.xml
===================================================================
--- phpdoc/ja/trunk/reference/xml/functions/utf8-encode.xml	2017-04-21 11:42:49 UTC (rev 342410)
+++ phpdoc/ja/trunk/reference/xml/functions/utf8-encode.xml	2017-04-22 14:55:52 UTC (rev 342411)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 333158 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 340507 Maintainer: hirokawa Status: working -->
 <refentry xml:id="function.utf8-encode" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>utf8_encode</refname>
@@ -14,53 +14,23 @@
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
-   この関数は、文字列 <parameter>data</parameter> を
-   <literal>UTF-8</literal> にエンコードし、エンコードされた文字列を
-   返します。<literal>UTF-8</literal> は、
-   <glossterm>wide character</glossterm> の値をバイトストリームに
-   エンコードするために <acronym>Unicode</acronym> で使用される
-   標準的な仕組みです。<literal>UTF-8</literal> は、プレーンな
-   <abbrev>ASCII</abbrev>文字を通し、自己同期(これは、バイトストリームの
-   開始地点をプログラムが見積もることが可能であることを意味します)
-   します。また、ソートのような標準的な文字列比較関数を使用可能です。
-   PHP は、<literal>UTF-8</literal> 文字を次のように最大 4 バイトで
-   エンコードします。
-   <table>
-    <title>UTF-8 エンコーディング</title>
-    <tgroup cols="3">
-     <thead>
-      <row>
-       <entry>バイト</entry>
-       <entry>ビット</entry>
-       <entry>表現形式</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>1</entry>
-       <entry>7</entry>
-       <entry>0bbbbbbb</entry>
-      </row>
-      <row>
-       <entry>2</entry>
-       <entry>11</entry>
-       <entry>110bbbbb 10bbbbbb</entry>
-      </row>
-      <row>
-       <entry>3</entry>
-       <entry>16</entry>
-       <entry>1110bbbb 10bbbbbb 10bbbbbb</entry>
-      </row>
-      <row>
-       <entry>4</entry>
-       <entry>21</entry>
-       <entry>11110bbb 10bbbbbb 10bbbbbb 10bbbbbb</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-   各 <replaceable>b</replaceable> は、文字列データを保存可能なビットを示します。
+   この関数は、文字列 <parameter>data</parameter> を <literal>ISO-8859-1</literal>
+   エンコードから <literal>UTF-8</literal> へ変換します。
   </para>
+  <note>
+   <para>
+    Many web pages marked as using the <literal>ISO-8859-1</literal> character
+    encoding actually use the similar <literal>Windows-1252</literal> encoding,
+    and web browsers will interpret <literal>ISO-8859-1</literal> web pages as
+    <literal>Windows-1252</literal>. <literal>Windows-1252</literal> features
+    additional printable characters, such as the Euro sign
+    (<literal>?</literal>) and curly quotes (<literal>“</literal>
+    <literal>”</literal>), instead of certain <literal>ISO-8859-1</literal>
+    control characters. This function will not convert such
+    <literal>Windows-1252</literal> characters correctly. Use a different
+    function if <literal>Windows-1252</literal> conversion is required.
+   </para>
+  </note>
  </refsect1>

  <refsect1 role="parameters">
@@ -90,7 +60,10 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><function>utf8_decode</function></member>
+    <member><function>utf8_decode</function> - Performs the reverse conversion</member>
+    <member><function>mb_convert_encoding</function> - Converts between various character encodings, including UTF-8, ISO-8859-1 and Windows-1252</member>
+    <member><function>iconv</function> - Converts between various character encodings</member>
+    <member><function>recode_string</function> - Converts between various character encodings</member>
    </simplelist>
   </para>
  </refsect1>