From 29ee5173fb65ca00b797bc11023ca923a134d1d1 Mon Sep 17 00:00:00 2001
From: Christoph Michael Becker <cmb@php.net>
Date: Tue, 21 Jun 2016 17:00:00 +0000
Subject: [PATCH] Fix Windows related documentation (see #49446)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@339439 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/exec/functions/escapeshellarg.xml | 31 +++++++++++++++++++--
 reference/exec/functions/escapeshellcmd.xml | 27 +++++++++++++++++-
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/reference/exec/functions/escapeshellarg.xml b/reference/exec/functions/escapeshellarg.xml
index 43ec00bc88..31ce2060b4 100644
--- a/reference/exec/functions/escapeshellarg.xml
+++ b/reference/exec/functions/escapeshellarg.xml
@@ -23,9 +23,9 @@
    <link linkend="language.operators.execution">backtick operator</link>.
   </para>
   <para>
-   On Windows, <function>escapeshellarg</function> instead removes percent
-   signs, replaces double quotes with spaces and adds double quotes around the
-   string.
+   On Windows, <function>escapeshellarg</function> instead replaces percent
+   signs, exclamation marks (delayed variable substitution) and double quotes
+   with spaces and adds double quotes around the string.
   </para>
  </refsect1>
 
@@ -68,6 +68,31 @@ system('ls '.escapeshellarg($dir));
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      &strings.changelog.encoding;
+      <row>
+       <entry>5.4.43, 5.5.27, 5.6.11</entry>
+       <entry>
+        Exclamation marks are replaced by spaces.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/exec/functions/escapeshellcmd.xml b/reference/exec/functions/escapeshellcmd.xml
index f63f97ca27..6d00ab7f81 100644
--- a/reference/exec/functions/escapeshellcmd.xml
+++ b/reference/exec/functions/escapeshellcmd.xml
@@ -28,7 +28,7 @@
    <literal>#&amp;;`|*?~&lt;&gt;^()[]{}$\</literal>, <literal>\x0A</literal>
    and <literal>\xFF</literal>. <literal>'</literal> and <literal>"</literal>
    are escaped only if they are not paired. In Windows, all these characters
-   plus <literal>%</literal> are replaced by a space instead.
+   plus <literal>%</literal> and <literal>!</literal> are replaced by a space instead.
   </para>
  </refsect1>
 
@@ -87,6 +87,31 @@ system($escaped_command);
    </warning>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      &strings.changelog.encoding;
+      <row>
+       <entry>5.4.43, 5.5.27, 5.6.11</entry>
+       <entry>
+        Exclamation marks are replaced by spaces.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>