From 02a9205752f08bd901a87006cab7cb37e9cf2e85 Mon Sep 17 00:00:00 2001
From: jim winstead <jimw@php.net>
Date: Fri, 14 Dec 2001 20:44:06 +0000
Subject: [PATCH] disabling shell_exec also disables

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@65057 c90b9560-bf6c-de11-be94-00142212c4b1
---
 language/operators.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/language/operators.xml b/language/operators.xml
index a9beb37b1a..bcd83d323f 100644
--- a/language/operators.xml
+++ b/language/operators.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.30 $ -->
+<!-- $Revision: 1.31 $ -->
  <chapter id="language.operators">
   <title>Operators</title>
   <simpara>
@@ -339,14 +339,14 @@ echo "<pre>$output</pre>";
    <note>
     <para>
      The backtick operator is disabled when <link
-     linkend="ini.safe-mode">safe mode</link> is enabled.
+     linkend="ini.safe-mode">safe mode</link> is enabled
+     or <function>shell_exec</function> is disabled.
     </para>
    </note>
    <para>
-    See also <function>system</function>,
-    <function>passthru</function>, <function>exec</function>,
-    <function>popen</function>, and
-    <function>escapeshellcmd</function>.
+    See also <function>escapeshellcmd</function>, <function>exec</function>,
+    <function>passthru</function>, <function>popen</function>,
+    <function>shell_exec</function>, and <function>system</function>.
    </para>
   </sect1>