cvs: phpdoc /en/reference/exec/functions escapeshellarg.xml escapeshellcmd.xml proc-get-status.xml proc-open.xml proc-terminate.xml

derick Mon Jun 16 15:43:41 2003 EDT Modified files: /phpdoc/en/reference/exec/functions escapeshellarg.xml escapeshellcmd.xml proc-get-status.xml proc-open.xml proc-terminate.xml Log: - Whitespace Index: phpdoc/en/reference/exec/functions/escapeshellarg.xml diff -u phpdoc/en/reference/exec/functions/escapeshellarg.xml:1.3 phpdoc/en/reference/exec/functions/escapeshellarg.xml:1.4 --- phpdoc/en/reference/exec/functions/escapeshellarg.xml:1.3 Wed Mar 19 12:04:18 2003 +++ phpdoc/en/reference/exec/functions/escapeshellarg.xml Mon Jun 16 15:43:40 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- splitted from ./en/functions/exec.xml, last change in rev 1.8 --> <refentry id="function.escapeshellarg"> <refnamediv> @@ -25,15 +25,16 @@ <informalexample> <programlisting role="php"> <![CDATA[ -system("ls ".escapeshellarg($dir)); +<?php +system('ls '.escapeshellarg($dir)); +?> ]]> </programlisting> </informalexample> </para> <para> - See also <function>escshellcmd</function>, - <function>exec</function>, <function>popen</function>, - <function>system</function>, and the <link + See also <function>escshellcmd</function>, <function>exec</function>, + <function>popen</function>, <function>system</function>, and the <link linkend="language.operators.execution">backtick operator</link>. </para> Index: phpdoc/en/reference/exec/functions/escapeshellcmd.xml diff -u phpdoc/en/reference/exec/functions/escapeshellcmd.xml:1.2 phpdoc/en/reference/exec/functions/escapeshellcmd.xml:1.3 --- phpdoc/en/reference/exec/functions/escapeshellcmd.xml:1.2 Wed Apr 17 02:37:47 2002 +++ phpdoc/en/reference/exec/functions/escapeshellcmd.xml Mon Jun 16 15:43:40 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- splitted from ./en/functions/exec.xml, last change in rev 1.2 --> <refentry id="function.escapeshellcmd"> <refnamediv> @@ -25,10 +25,16 @@ <informalexample> <programlisting role="php"> <![CDATA[ +<?php $e = escapeshellcmd($userinput); -system("echo $e"); // here we don't care if $e has spaces + +// here we don't care if $e has spaces +system("echo $e"); $f = escapeshellcmd($filename); -system("touch \"/tmp/$f\"; ls -l \"/tmp/$f\""); // and here we do, so we use quotes + +// and here we do, so we use quotes +system("touch \"/tmp/$f\"; ls -l \"/tmp/$f\""); +?> ]]> </programlisting> </informalexample> Index: phpdoc/en/reference/exec/functions/proc-get-status.xml diff -u phpdoc/en/reference/exec/functions/proc-get-status.xml:1.2 phpdoc/en/reference/exec/functions/proc-get-status.xml:1.3 --- phpdoc/en/reference/exec/functions/proc-get-status.xml:1.2 Fri May 9 09:14:06 2003 +++ phpdoc/en/reference/exec/functions/proc-get-status.xml Mon Jun 16 15:43:40 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <refentry id='function.proc-get-status'> <refnamediv> <refname>proc_get_status</refname> @@ -86,6 +86,9 @@ </tbody> </tgroup> </informaltable> + <para> + See also <function>proc_open</function>. + </para> </refsect1> </refentry> Index: phpdoc/en/reference/exec/functions/proc-open.xml diff -u phpdoc/en/reference/exec/functions/proc-open.xml:1.4 phpdoc/en/reference/exec/functions/proc-open.xml:1.5 --- phpdoc/en/reference/exec/functions/proc-open.xml:1.4 Sat May 24 16:43:53 2003 +++ phpdoc/en/reference/exec/functions/proc-open.xml Mon Jun 16 15:43:41 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/exec.xml, last change in rev 1.28 --> <refentry id='function.proc-open'> <refnamediv> @@ -81,11 +81,6 @@ the Windows architecture does not associate file descriptor numbers with low-level handles, the child process does not (yet) have a means of accessing those handles. Stdin, stdout and stderr work as expected. - </para> - </note> - <note> - <para> - This function was introduced in PHP 4.3.0. </para> </note> <note> Index: phpdoc/en/reference/exec/functions/proc-terminate.xml diff -u phpdoc/en/reference/exec/functions/proc-terminate.xml:1.1 phpdoc/en/reference/exec/functions/proc-terminate.xml:1.2 --- phpdoc/en/reference/exec/functions/proc-terminate.xml:1.1 Thu May 29 15:14:12 2003 +++ phpdoc/en/reference/exec/functions/proc-terminate.xml Mon Jun 16 15:43:41 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <refentry id='function.proc-terminate'> <refnamediv> <refname>proc_terminate</refname> @@ -18,9 +18,8 @@ &warn.undocumented.func; <para> - See also <function>proc_open</function>, - <function>proc_close</function>, and - <function>proc_nice</function>. + See also <function>proc_open</function>, <function>proc_close</function>, + and <function>proc_nice</function>. </para> </refsect1> </refentry>