From 93c8f3c1305ca9d17a6e9f68d9e0438dec5dc165 Mon Sep 17 00:00:00 2001
From: Rui Hirokawa <hirokawa@php.net>
Date: Sun, 30 Oct 2011 08:27:49 +0000
Subject: [PATCH] added 2nd argument for escapeshellcmd().

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@318573 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/exec/constants.xml                | 45 ++++++++++++++++++++-
 reference/exec/functions/escapeshellcmd.xml | 11 +++++
 reference/mbstring/ja-basic.xml             |  9 +++++
 reference/mbstring/supported-encodings.xml  | 19 +++++++++
 4 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/reference/exec/constants.xml b/reference/exec/constants.xml
index f710ef1840..fac6054cfb 100644
--- a/reference/exec/constants.xml
+++ b/reference/exec/constants.xml
@@ -3,7 +3,50 @@
 
 <appendix xml:id="exec.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.constants;
- &no.constants;
+ &extension.constants.core;
+ <para> flags for <function>escapeshellcmd</function>:
+ <variablelist>
+  <varlistentry>
+   <term>
+    <constant>ESCAPE_CMD_PAIR</constant> 
+    (<type>integer</type>)
+   </term>
+   <listitem>
+    <simpara>
+      When <constant>ESCAPE_CMD_PAIR</constant> (default) is specified,
+      the quotation is escaped only if it is not paired.
+      (only valid for non-Win32 environment)
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>
+    <constant>ESCAPE_CMD_END</constant> 
+    (<type>integer</type>)
+   </term>
+   <listitem>
+    <simpara>
+     When <constant>ESCAPE_CMD_END</constant> is specified,
+     the quotation is escaped except for the beginning/ending of string.
+      (only valid for non-Win32 environment)
+    </simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>
+    <constant>ESCAPE_CMD_ALL</constant> 
+    (<type>integer</type>)
+   </term>
+   <listitem>
+    <simpara>
+     When <constant>ESCAPE_CMD_ALL</constant> is specified,
+     the quotation is always escaped.
+      (only valid for non-Win32 environment)
+    </simpara>
+   </listitem>
+  </varlistentry>
+ </variablelist>
+ </para>
 </appendix>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/exec/functions/escapeshellcmd.xml b/reference/exec/functions/escapeshellcmd.xml
index 9043e20cfe..cb5e876e13 100644
--- a/reference/exec/functions/escapeshellcmd.xml
+++ b/reference/exec/functions/escapeshellcmd.xml
@@ -12,6 +12,7 @@
   <methodsynopsis>
    <type>string</type><methodname>escapeshellcmd</methodname>
    <methodparam><type>string</type><parameter>command</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>flag</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>escapeshellcmd</function> escapes any characters in a
@@ -30,6 +31,16 @@
    are escaped only if they are not paired. In Windows, all these characters
    plus <literal>%</literal> are replaced by a space instead.
   </para>
+  <para>
+    As of PHP 5.5, an optional second argument is introduced for 
+    non-Win32 environment.
+    When <constant>ESCAPE_CMD_PAIR</constant> (default) is specified,
+    the quotation is escaped only if it is not paired.
+    When <constant>ESCAPE_CMD_END</constant> is specified,
+     the quotation is escaped except for the beginning/ending of string.    
+    When <constant>ESCAPE_CMD_ALL</constant> is specified,
+     the quotation is always escaped.    
+  </para>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mbstring/ja-basic.xml b/reference/mbstring/ja-basic.xml
index 4a31cb7541..725e2ecb9e 100644
--- a/reference/mbstring/ja-basic.xml
+++ b/reference/mbstring/ja-basic.xml
@@ -50,6 +50,15 @@
      are supposed to use Shift_JIS.
     </simpara>
    </listitem>
+   <listitem>
+    <simpara>
+      As of PHP 5.4.0, the pictogram characters 
+      used for mobile phone service such as 
+      <link xlink:href="&url.imode;">i-mode</link>
+      or <link xlink:href="&url.ezweb;">EZweb</link>
+      are supported.
+    </simpara>
+   </listitem>
   </itemizedlist>
  </para>
 </chapter>
diff --git a/reference/mbstring/supported-encodings.xml b/reference/mbstring/supported-encodings.xml
index fefaf614a1..54b91bfecf 100644
--- a/reference/mbstring/supported-encodings.xml
+++ b/reference/mbstring/supported-encodings.xml
@@ -35,7 +35,23 @@
   <listitem><simpara>eucJP-win*</simpara></listitem>
   <listitem><simpara>SJIS-win*</simpara></listitem>
   <listitem><simpara>ISO-2022-JP</simpara></listitem>
+  <listitem><simpara>ISO-2022-JP-MS</simpara></listitem>
+  <listitem><simpara>CP932</simpara></listitem>
+  <listitem><simpara>CP51932</simpara></listitem>
+  <listitem><simpara>SJIS-mac**</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#DOCOMO**</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#KDDI**</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#SOFTBANK**</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#DOCOMO-PUA**</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#KDDI-PUA**</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#DOCOMO-PUA-B**</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#SOFTBANK-PUA**</simpara></listitem>
   <listitem><simpara>JIS</simpara></listitem>
+  <listitem><simpara>JIS-ms</simpara></listitem>
+  <listitem><simpara>CP50220</simpara></listitem>
+  <listitem><simpara>CP50220raw</simpara></listitem>
+  <listitem><simpara>CP50221</simpara></listitem>
+  <listitem><simpara>CP50222</simpara></listitem>
   <listitem><simpara>ISO-8859-1*</simpara></listitem>
   <listitem><simpara>ISO-8859-2*</simpara></listitem>
   <listitem><simpara>ISO-8859-3*</simpara></listitem>
@@ -74,6 +90,9 @@
  <para>
   * denotes encodings usable also in regular expressions.
  </para>
+ <para>
+  ** denotes encodings available since PHP 5.4.0.
+ </para>
  <para>
   Any &php.ini; entry which accepts an encoding name
   can also use the values &quot;<literal>auto</literal>&quot; and