vrana           Thu Mar 31 10:01:45 2005 EDT

  Modified files:              
    /phpdoc/en  language-snippets.ent 
    /phpdoc/en/reference/filesystem/functions   file-get-contents.xml 
                                                file-put-contents.xml 
                                                fopen.xml mkdir.xml 
                                                readfile.xml rename.xml 
                                                rmdir.xml unlink.xml 
  Log:
  Context parameter (bug #32499)
  
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.141&r2=1.142&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.141 
phpdoc/en/language-snippets.ent:1.142
--- phpdoc/en/language-snippets.ent:1.141       Thu Mar 31 02:42:34 2005
+++ phpdoc/en/language-snippets.ent     Thu Mar 31 10:01:43 2005
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.141 $ -->
+<!-- $Revision: 1.142 $ -->
 <!-- Keep 'em sorted -->
 
 
@@ -12,7 +12,8 @@
 more details.</simpara></note>'>
 
 <!ENTITY note.context-support '<note><simpara>Context support was added
-with PHP 5.0.0.</simpara></note>'>
+with PHP 5.0.0. For a description of <literal>contexts</literal>, refer to
+<xref linkend="ref.stream"/>.</simpara></note>'>
 
 <!ENTITY note.exec-bg '<note><para>If you start a program using this function
 and want to leave it running in the background, you have to make sure that the
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/file-get-contents.xml?r1=1.22&r2=1.23&ty=u
Index: phpdoc/en/reference/filesystem/functions/file-get-contents.xml
diff -u phpdoc/en/reference/filesystem/functions/file-get-contents.xml:1.22 
phpdoc/en/reference/filesystem/functions/file-get-contents.xml:1.23
--- phpdoc/en/reference/filesystem/functions/file-get-contents.xml:1.22 Wed Feb 
 9 12:06:36 2005
+++ phpdoc/en/reference/filesystem/functions/file-get-contents.xml      Thu Mar 
31 10:01:43 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.130 -->
   <refentry id="function.file-get-contents">
    <refnamediv>
@@ -34,6 +34,11 @@
       need to encode the URI with <function>urlencode</function>.
      </para>
     </note>
+    <note>
+     <para>
+      <parameter>context</parameter> parameter can be skipped by &null;.
+     </para>
+    </note>
    </refsect1>
 
    <refsect1 role="changelog">
@@ -71,6 +76,7 @@
     &reftitle.notes;
     &note.bin-safe;
     &tip.fopen-wrapper;
+    &note.context-support;
     &warn.ssl-non-standard;
    </refsect1>
 
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/file-put-contents.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/filesystem/functions/file-put-contents.xml
diff -u phpdoc/en/reference/filesystem/functions/file-put-contents.xml:1.5 
phpdoc/en/reference/filesystem/functions/file-put-contents.xml:1.6
--- phpdoc/en/reference/filesystem/functions/file-put-contents.xml:1.5  Wed Feb 
 9 12:06:38 2005
+++ phpdoc/en/reference/filesystem/functions/file-put-contents.xml      Thu Mar 
31 10:01:43 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.file-put-contents">
    <refnamediv>
     <refname>file_put_contents</refname> 
@@ -29,6 +29,7 @@
      (not multi-dimension arrays). This is equivalent to
      <literal>file_put_contents($filename, join('', $array))</literal>.
     </para>
+    &note.context-support;
     <para>
      As of PHP 5.1.0, you may also pass a stream resource to the
      <parameter>data</parameter> parameter. In result, the remaining buffer of
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/fopen.xml?r1=1.26&r2=1.27&ty=u
Index: phpdoc/en/reference/filesystem/functions/fopen.xml
diff -u phpdoc/en/reference/filesystem/functions/fopen.xml:1.26 
phpdoc/en/reference/filesystem/functions/fopen.xml:1.27
--- phpdoc/en/reference/filesystem/functions/fopen.xml:1.26     Thu Mar 31 
09:41:25 2005
+++ phpdoc/en/reference/filesystem/functions/fopen.xml  Thu Mar 31 10:01:43 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.26 $ -->
+<!-- $Revision: 1.27 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.fopen">
    <refnamediv>
@@ -49,10 +49,8 @@
       Some protocols (also referred to as <literal>wrappers</literal>) support
       <literal>context</literal> and/or &php.ini; options.
       Refer to the specific page for the protocol in use for a list of options
-      which can be set. ( i.e. &php.ini; value 
+      which can be set. (e.g. &php.ini; value 
       <literal>user_agent</literal> used by the <literal>http</literal> 
wrapper).
-      For a description of <literal>contexts</literal> and the 
-      <parameter>zcontext</parameter> parameter, refer to <xref 
linkend="ref.stream"/>.
      </simpara>
     </note>
     &note.context-support;
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/mkdir.xml?r1=1.16&r2=1.17&ty=u
Index: phpdoc/en/reference/filesystem/functions/mkdir.xml
diff -u phpdoc/en/reference/filesystem/functions/mkdir.xml:1.16 
phpdoc/en/reference/filesystem/functions/mkdir.xml:1.17
--- phpdoc/en/reference/filesystem/functions/mkdir.xml:1.16     Tue Aug 10 
12:30:17 2004
+++ phpdoc/en/reference/filesystem/functions/mkdir.xml  Thu Mar 31 10:01:43 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.39 -->
   <refentry id="function.mkdir">
    <refnamediv>
@@ -56,10 +56,10 @@
       for a listing of which wrappers support <function>mkdir</function>.
      </simpara>
     </note>
+    &note.context-support;
     <note>
      <simpara>
-      The <parameter>recursive</parameter> and <parameter>context</parameter> 
parameters
-      were added as of PHP 5.0.0.
+      The <parameter>recursive</parameter> parameter was added as of PHP 5.0.0.
      </simpara>
     </note>
     &note.sm.uidcheck.dir;
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/readfile.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/reference/filesystem/functions/readfile.xml
diff -u phpdoc/en/reference/filesystem/functions/readfile.xml:1.6 
phpdoc/en/reference/filesystem/functions/readfile.xml:1.7
--- phpdoc/en/reference/filesystem/functions/readfile.xml:1.6   Tue Sep  9 
07:32:55 2003
+++ phpdoc/en/reference/filesystem/functions/readfile.xml       Thu Mar 31 
10:01:43 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.readfile">
    <refnamediv>
@@ -28,6 +28,7 @@
      you want to search for the file in the <link
      linkend="ini.include-path">include_path</link>, too.
     </para>
+    &note.context-support;
     <para>
      See also <function>fpassthru</function>,
      <function>file</function>, <function>fopen</function>,
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/rename.xml?r1=1.10&r2=1.11&ty=u
Index: phpdoc/en/reference/filesystem/functions/rename.xml
diff -u phpdoc/en/reference/filesystem/functions/rename.xml:1.10 
phpdoc/en/reference/filesystem/functions/rename.xml:1.11
--- phpdoc/en/reference/filesystem/functions/rename.xml:1.10    Tue Aug 10 
12:30:18 2004
+++ phpdoc/en/reference/filesystem/functions/rename.xml Thu Mar 31 10:01:44 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.rename">
    <refnamediv>
@@ -52,11 +52,7 @@
       match the wrapper used in <parameter>newname</parameter>.
      </simpara>
     </note>
-    <note>
-     <simpara>
-      The <parameter>context</parameter> parameter was added as of PHP 5.0.0.
-     </simpara>
-    </note>
+    &note.context-support;
     <para>
      See also <function>copy</function>, 
      <function>unlink</function>, and
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/rmdir.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/filesystem/functions/rmdir.xml
diff -u phpdoc/en/reference/filesystem/functions/rmdir.xml:1.8 
phpdoc/en/reference/filesystem/functions/rmdir.xml:1.9
--- phpdoc/en/reference/filesystem/functions/rmdir.xml:1.8      Tue Aug 10 
12:30:18 2004
+++ phpdoc/en/reference/filesystem/functions/rmdir.xml  Thu Mar 31 10:01:44 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.rmdir">
    <refnamediv>
@@ -25,11 +25,7 @@
       for a listing of which wrappers support <function>rmdir</function>.
      </simpara>
     </note>
-    <note>
-     <simpara>
-      The <parameter>context</parameter> parameter was added as of PHP 5.0.0.
-     </simpara>
-    </note>
+    &note.context-support;
     &note.sm.uidcheck.dir;
     <para>
      See also <function>mkdir</function> and <function>unlink</function>.
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/unlink.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/filesystem/functions/unlink.xml
diff -u phpdoc/en/reference/filesystem/functions/unlink.xml:1.8 
phpdoc/en/reference/filesystem/functions/unlink.xml:1.9
--- phpdoc/en/reference/filesystem/functions/unlink.xml:1.8     Tue Aug 10 
12:30:18 2004
+++ phpdoc/en/reference/filesystem/functions/unlink.xml Thu Mar 31 10:01:44 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.unlink">
    <refnamediv>
@@ -24,11 +24,7 @@
       for a listing of which wrappers support <function>unlink</function>.
      </simpara>
     </note>
-    <note>
-     <simpara>
-      The <parameter>context</parameter> parameter was added as of PHP 5.0.0.
-     </simpara>
-    </note>
+    &note.context-support;
     <para>
      See also <function>rmdir</function> for removing directories.
     </para>

Reply via email to