didou Mon May 17 15:42:15 2004 EDT
Modified files:
/phpdoc/en language-snippets.ent
/phpdoc/en/reference/filesystem/functions feof.xml fflush.xml
fgetc.xml fgets.xml
fpassthru.xml
Log:
added a new entity and use an old one
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.86&r2=1.87&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.86 phpdoc/en/language-snippets.ent:1.87
--- phpdoc/en/language-snippets.ent:1.86 Wed May 12 03:43:52 2004
+++ phpdoc/en/language-snippets.ent Mon May 17 15:42:15 2004
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.86 $ -->
+<!-- $Revision: 1.87 $ -->
<!ENTITY warn.experimental '<warning><simpara>This extension is
<emphasis>EXPERIMENTAL</emphasis>. The behaviour of this extension --
@@ -120,6 +120,12 @@
it is inserted with e.g. <link
linkend="function.dom-domnode-appendchild">DOMNode->appendChild()</link>.'>
+<!-- FileSystem entities -->
+<!ENTITY fs.validfp.all '<para>The file pointer must be valid, and must point to
+a file successfully opened by <function>fopen</function> or
+<function>fsockopen</function>.</para>'>
+
+
<!-- PCNTL Notes -->
<!ENTITY pcntl.parameter.status '<para>The parameter
<parameter>status</parameter> is the status parameter supplied to a successfull
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/feof.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/filesystem/functions/feof.xml
diff -u phpdoc/en/reference/filesystem/functions/feof.xml:1.7
phpdoc/en/reference/filesystem/functions/feof.xml:1.8
--- phpdoc/en/reference/filesystem/functions/feof.xml:1.7 Thu Dec 11 10:15:57
2003
+++ phpdoc/en/reference/filesystem/functions/feof.xml Mon May 17 15:42:15 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.feof">
<refnamediv>
@@ -25,11 +25,7 @@
<function>feof</function> will return &false; on timeout.
</simpara>
</warning>
- <para>
- The file pointer must be valid, and must point to a file
- successfully opened by <function>fopen</function>,
- <function>popen</function>, or <function>fsockopen</function>.
- </para>
+ &fs.validfp.all;
</refsect1>
</refentry>
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/fflush.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/filesystem/functions/fflush.xml
diff -u phpdoc/en/reference/filesystem/functions/fflush.xml:1.5
phpdoc/en/reference/filesystem/functions/fflush.xml:1.6
--- phpdoc/en/reference/filesystem/functions/fflush.xml:1.5 Sun Jan 12 21:54:28
2003
+++ phpdoc/en/reference/filesystem/functions/fflush.xml Mon May 17 15:42:15 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.43 -->
<refentry id="function.fflush">
<refnamediv>
@@ -15,13 +15,9 @@
<para>
This function forces a write of all buffered output to the
resource pointed to by the file handle <parameter>handle</parameter>.
- Returns &true; if successful, &false; otherwise.
- </para>
- <para>
- The file pointer must be valid, and must point to a file
- successfully opened by <function>fopen</function>,
- <function>popen</function>, or <function>fsockopen</function>.
+ &return.success;
</para>
+ &fs.validfp.all;
</refsect1>
</refentry>
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/fgetc.xml?r1=1.9&r2=1.10&ty=u
Index: phpdoc/en/reference/filesystem/functions/fgetc.xml
diff -u phpdoc/en/reference/filesystem/functions/fgetc.xml:1.9
phpdoc/en/reference/filesystem/functions/fgetc.xml:1.10
--- phpdoc/en/reference/filesystem/functions/fgetc.xml:1.9 Sun Jun 8 10:29:25
2003
+++ phpdoc/en/reference/filesystem/functions/fgetc.xml Mon May 17 15:42:15 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.fgetc">
<refnamediv>
@@ -17,12 +17,8 @@
file pointed to by <parameter>handle</parameter>.
Returns &false; on EOF.
</para>
- <para>
- The file pointer must be valid, and must point to a file
- successfully opened by <function>fopen</function>,
- <function>popen</function>, or <function>fsockopen</function>.
- </para>
-
+
+ &fs.validfp.all;
&return.falseproblem;
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/fgets.xml?r1=1.11&r2=1.12&ty=u
Index: phpdoc/en/reference/filesystem/functions/fgets.xml
diff -u phpdoc/en/reference/filesystem/functions/fgets.xml:1.11
phpdoc/en/reference/filesystem/functions/fgets.xml:1.12
--- phpdoc/en/reference/filesystem/functions/fgets.xml:1.11 Mon Dec 15 11:49:45
2003
+++ phpdoc/en/reference/filesystem/functions/fgets.xml Mon May 17 15:42:15 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.fgets">
<refnamediv>
@@ -30,12 +30,9 @@
People used to the 'C' semantics of <function>fgets</function>
should note the difference in how <literal>EOF</literal> is returned.
</simpara>
- <simpara>
- The file pointer must be valid, and must point to a file
- successfully opened by <function>fopen</function>,
- <function>popen</function>, or
- <function>fsockopen</function>.
- </simpara>
+
+ &fs.validfp.all;
+
<para>
A simple example follows:
<example>
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/fpassthru.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/filesystem/functions/fpassthru.xml
diff -u phpdoc/en/reference/filesystem/functions/fpassthru.xml:1.7
phpdoc/en/reference/filesystem/functions/fpassthru.xml:1.8
--- phpdoc/en/reference/filesystem/functions/fpassthru.xml:1.7 Thu Dec 18 12:44:03
2003
+++ phpdoc/en/reference/filesystem/functions/fpassthru.xml Mon May 17 15:42:15
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.fpassthru">
<refnamediv>
@@ -22,14 +22,12 @@
the number of characters read from <parameter>handle</parameter>
and passed through to the output.
</simpara>
+ &fs.validfp.all;
<simpara>
- The file pointer must be valid, and must point to a file successfully
- opened by <function>fopen</function>, <function>popen</function>, or
- <function>fsockopen</function>. You may need to call
- <function>rewind</function> to reset the file pointer to the beginning of
- the file if you have already written data to the file. The file is
- closed when <function>fpassthru</function> is done reading it (leaving
- <parameter>handle</parameter> useless).
+ You may need to call <function>rewind</function> to reset the file
+ pointer to the beginning of the file if you have already written data
+ to the file. The file is closed when <function>fpassthru</function>
+ is done reading it (leaving <parameter>handle</parameter> useless).
</simpara>
<simpara>
If you just want to dump the contents of a file to the output buffer,
