Sync with en

git-svn-id: https://svn.php.net/repository/phpdoc/ja/trunk@332791 c90b9560-bf6c-de11-be94-00142212c4b1

Author: TAKAGI Masahiro

appendices/ini.list.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 6a3ec52642e4d91484b61e2740e93c5fa42e3633 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: f23fa0e5e7373b0cce93525f471555e1918f8b0f Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,shimooka -->
 
  <section xml:id="ini.list" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -1622,7 +1622,7 @@
        <entry>mbstring.script_encoding</entry>
        <entry>NULL</entry>
        <entry>PHP_INI_ALL</entry>
-       <entry>PHP 4.3.0 以降で利用可能。</entry>
+       <entry>PHP 4.3.0 以降で利用可能。PHP 5.4.0 で削除。代わりに <link linkend="ini.zend.script-encoding">zend.script_encoding</link> を使うこと。</entry>
       </row>
       <row>
        <entry>mbstring.http_output_conv_mimetypes</entry>

appendices/migration54.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 358c45a01371c6d22272d36f166f13f76556210f Maintainer: takagi Status: ready -->
+<!-- EN-Revision: f23fa0e5e7373b0cce93525f471555e1918f8b0f Maintainer: takagi Status: ready -->
 <appendix xml:id="migration54" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>PHP 5.3.x から PHP 5.4.x への移行</title>
  <simpara>
@@ -81,6 +81,11 @@
      が削除されました。
     </simpara>
    </listitem>
+   <listitem>
+    <simpara>
+     mbstring.script_encoding が削除されました。代わりに <link linkend="ini.zend.script-encoding">zend.script_encoding</link> を使いましょう。
+    </simpara>
+   </listitem>
    <listitem>
     <simpara>
      <link linkend="language.references.pass">呼び出し時の参照渡し</link>をサポートしなくなりました。
@@ -1283,6 +1288,11 @@
      <link linkend="ini.session.bug-compat-warn">session.bug_compat_warn</link>
     </simpara>
    </listitem>
+   <listitem>
+    <simpara>
+     mbstring.script_encoding
+    </simpara>
+   </listitem>
    <listitem>
     <simpara>
      <link linkend="ini.y2k-compliance">y2k_compliance</link>

appendices/migration56.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 42b0867578fb3b220a0dc8d4c7f5f22eb8196d30 Maintainer: takagi Status: working -->
+<!-- EN-Revision: ea39f9a011f4a2accfe8cf014a9819a0a84578b6 Maintainer: takagi Status: working -->
 <!--
  Based on UPGRADING from PHP-5.6 circa alpha 1. Work in progress!
 
@@ -35,8 +35,8 @@
   </warning>
   <simpara>
    Most improvements in PHP 5.6.x have no impact on existing code. There are
-   a <link linkend="migration55.incompatible">few incompatibilities</link>
-   and <link linkend="migration55.new-features">new features</link> that should
+   a <link linkend="migration56.incompatible">few incompatibilities</link>
+   and <link linkend="migration56.new-features">new features</link> that should
    be considered, and code should be tested before switching PHP
    versions in production environments.
   </simpara>
@@ -139,7 +139,7 @@ const TWO = ONE * 2;
 class C {
     const THREE = TWO + 1;
     const ONE_THIRD = ONE / self::THREE;
-    const SENTENCE = 'The value of '.THREE.' is 3';
+    const SENTENCE = 'The value of THREE is '.self::THREE;
 
     public function f($a = ONE + self::THREE) {
         return $a;

language/oop5/abstract.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ac5ed968ff8350fd736e38af04587180e1059a3d Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: b7031192a2b7d97257d3e303b8eb0f4692819fee Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 
 <sect1 xml:id="language.oop5.abstract" xmlns="http://docbook.org/ns/docbook">

reference/mbstring/ini.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 57ec267b58419f3a4af243b43aa59235ce7bdd96 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: f23fa0e5e7373b0cce93525f471555e1918f8b0f Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa -->
 <section xml:id="mbstring.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
@@ -52,7 +52,7 @@
      <entry>mbstring.script_encoding</entry>
      <entry>NULL</entry>
      <entry>PHP_INI_ALL</entry>
-     <entry>PHP 4.3.0 から利用可能です。</entry>
+     <entry>PHP 4.3.0 から利用可能です。PHP 5.4.0 で削除されました。代わりに <link linkend="ini.zend.script-encoding">zend.script_encoding</link> を使いましょう。</entry>
     </row>
     <row>
       <entry><link linkend="ini.mbstring.substitute-character">mbstring.substitute_character</link></entry>

reference/misc/functions/uniqid.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1de1537fed0c2d84bb29e209c21c32c799b20800 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: d55539cc0cc5a858fae5242a02cded46baaa2ac7 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa -->
 <refentry xml:id="function.uniqid" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -18,6 +18,13 @@
   <para>
    マイクロ秒単位の現在時刻にもとづいた、接頭辞つきの一意な ID を取得します。
   </para>
+  <warning>
+   <para>
+    この関数は、ランダムな値を作るわけでもなければ予測不能な文字列を作るわけでもありません。
+    セキュリティを確保するためにこの関数を使ってはいけません。
+    予測不能でセキュアな ID を作りたい場合は、暗号学的にセキュアな乱数やハッシュを作る関数を利用しましょう。
+   </para>
+  </warning>
  </refsect1>
 
  <refsect1 role="parameters">