From 9c4ae88f499a2fcf3d4a243625705dcfb500d076 Mon Sep 17 00:00:00 2001
From: Sara Golemon <pollita@php.net>
Date: Mon, 13 Jan 2003 02:54:28 +0000
Subject: [PATCH] Use 'handle' instead of 'fp' in parameter declarations and
 examples.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@111625 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/filesystem/functions/fclose.xml    | 10 +++++-----
 reference/filesystem/functions/feof.xml      |  4 ++--
 reference/filesystem/functions/fflush.xml    |  6 +++---
 reference/filesystem/functions/fgetc.xml     |  4 ++--
 reference/filesystem/functions/fgetcsv.xml   | 12 ++++++------
 reference/filesystem/functions/fgets.xml     | 12 ++++++------
 reference/filesystem/functions/fgetss.xml    |  4 ++--
 reference/filesystem/functions/flock.xml     |  6 +++---
 reference/filesystem/functions/fopen.xml     | 12 ++++++------
 reference/filesystem/functions/fpassthru.xml |  8 ++++----
 reference/filesystem/functions/fputs.xml     |  4 ++--
 reference/filesystem/functions/fread.xml     | 18 +++++++++---------
 reference/filesystem/functions/fscanf.xml    | 12 ++++++------
 reference/filesystem/functions/fseek.xml     |  6 +++---
 reference/filesystem/functions/fstat.xml     |  4 ++--
 reference/filesystem/functions/ftell.xml     |  4 ++--
 reference/filesystem/functions/ftruncate.xml |  6 +++---
 reference/filesystem/functions/fwrite.xml    | 12 ++++++------
 reference/filesystem/functions/pclose.xml    |  4 ++--
 reference/filesystem/functions/popen.xml     | 12 ++++++------
 reference/filesystem/functions/rewind.xml    |  4 ++--
 reference/filesystem/functions/tempnam.xml   |  8 ++++----
 22 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/reference/filesystem/functions/fclose.xml b/reference/filesystem/functions/fclose.xml
index 5c8c498e3b..bcca3e869d 100644
--- a/reference/filesystem/functions/fclose.xml
+++ b/reference/filesystem/functions/fclose.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.fclose">
    <refnamediv>
@@ -10,10 +10,10 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>fclose</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
      </methodsynopsis>
     <para>
-     The file pointed to by <parameter>fp</parameter> is closed.
+     The file pointed to by <parameter>handle</parameter> is closed.
     </para>
     <para>
      &return.success;
@@ -30,9 +30,9 @@
 <![CDATA[
 <?php
 
-  $fp = fopen('somefile.txt', 'r');
+  $handle = fopen('somefile.txt', 'r');
   
-  fclose($fp);
+  fclose($handle);
   
 ?>
 ]]>
diff --git a/reference/filesystem/functions/feof.xml b/reference/filesystem/functions/feof.xml
index 5dfa7e1a83..fb1dbfdcd8 100644
--- a/reference/filesystem/functions/feof.xml
+++ b/reference/filesystem/functions/feof.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.feof">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>feof</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns &true; if the file pointer is at EOF or an error occurs;
diff --git a/reference/filesystem/functions/fflush.xml b/reference/filesystem/functions/fflush.xml
index 788d5b8cd8..f2affbd11b 100644
--- a/reference/filesystem/functions/fflush.xml
+++ b/reference/filesystem/functions/fflush.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.43 -->
   <refentry id="function.fflush">
    <refnamediv>
@@ -10,11 +10,11 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>fflush</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
      </methodsynopsis>
     <para>
      This function forces a write of all buffered output to the 
-     resource pointed to by the file handle <parameter>fp</parameter>.
+     resource pointed to by the file handle <parameter>handle</parameter>.
      Returns &true; if successful, &false; otherwise.
     </para>
     <para>
diff --git a/reference/filesystem/functions/fgetc.xml b/reference/filesystem/functions/fgetc.xml
index 2af03bf7b5..96a04c3143 100644
--- a/reference/filesystem/functions/fgetc.xml
+++ b/reference/filesystem/functions/fgetc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.fgetc">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>string</type><methodname>fgetc</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns a string containing a single character read from the
diff --git a/reference/filesystem/functions/fgetcsv.xml b/reference/filesystem/functions/fgetcsv.xml
index ccfe960273..7de6ca4d97 100644
--- a/reference/filesystem/functions/fgetcsv.xml
+++ b/reference/filesystem/functions/fgetcsv.xml
@@ -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.fgetcsv">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>fgetcsv</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>int</type><parameter>length</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>delimiter</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>enclosure</parameter></methodparam>
@@ -31,7 +31,7 @@
      </simpara>
     </note>
     <simpara>
-     The <parameter>fp</parameter> parameter must be a valid file pointer to a file
+     The <parameter>handle</parameter> parameter must be a valid file pointer to a file
      successfully opened by <function>fopen</function>,
      <function>popen</function>, or <function>fsockopen</function>.
     </simpara>
@@ -57,8 +57,8 @@
 <![CDATA[
 <?php
 $row = 1;
-$fp = fopen ("test.csv","r");
-while ($data = fgetcsv ($fp, 1000, ",")) {
+$handle = fopen ("test.csv","r");
+while ($data = fgetcsv ($handle, 1000, ",")) {
     $num = count ($data);
     print "<p> $num fields in line $row: <br>\n";
     $row++;
@@ -66,7 +66,7 @@ while ($data = fgetcsv ($fp, 1000, ",")) {
         print $data[$c] . "<br>\n";
     }
 }
-fclose ($fp);
+fclose ($handle);
 ?>
 ]]>
       </programlisting>
diff --git a/reference/filesystem/functions/fgets.xml b/reference/filesystem/functions/fgets.xml
index 9998da3744..609abdcd17 100644
--- a/reference/filesystem/functions/fgets.xml
+++ b/reference/filesystem/functions/fgets.xml
@@ -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.2 -->
   <refentry id="function.fgets">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>string</type><methodname>fgets</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
      </methodsynopsis>
     <para>
@@ -42,12 +42,12 @@
       <title>Reading a file line by line</title>
       <programlisting role="php">
 <![CDATA[
-$fd = fopen ("/tmp/inputfile.txt", "r");
-while (!feof ($fd)) {
-    $buffer = fgets($fd, 4096);
+$handle = fopen ("/tmp/inputfile.txt", "r");
+while (!feof ($handle)) {
+    $buffer = fgets($handle, 4096);
     echo $buffer;
 }
-fclose ($fd);
+fclose ($handle);
 ]]>
       </programlisting>
      </example>
diff --git a/reference/filesystem/functions/fgetss.xml b/reference/filesystem/functions/fgetss.xml
index 92fb9ee20f..e11cc5c735 100644
--- a/reference/filesystem/functions/fgetss.xml
+++ b/reference/filesystem/functions/fgetss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.fgetss">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>string</type><methodname>fgetss</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>int</type><parameter>length</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>allowable_tags</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/filesystem/functions/flock.xml b/reference/filesystem/functions/flock.xml
index 27320f2790..e8f5bbc685 100644
--- a/reference/filesystem/functions/flock.xml
+++ b/reference/filesystem/functions/flock.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.flock">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>flock</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>int</type><parameter>operation</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>&amp;wouldblock</parameter></methodparam>
      </methodsynopsis>
@@ -20,7 +20,7 @@
      same way of locking or it will not work).
     </simpara>
     <simpara>
-     <function>flock</function> operates on <parameter>fp</parameter>
+     <function>flock</function> operates on <parameter>handle</parameter>
      which must be an open file
      pointer. <parameter>operation</parameter> is one of the following
      values:
diff --git a/reference/filesystem/functions/fopen.xml b/reference/filesystem/functions/fopen.xml
index 750773c3af..8eabaa7b09 100644
--- a/reference/filesystem/functions/fopen.xml
+++ b/reference/filesystem/functions/fopen.xml
@@ -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.fopen">
    <refnamediv>
@@ -121,10 +121,10 @@
       <programlisting role="php">
 <![CDATA[
 <?php
-$fp = fopen ("/home/rasmus/file.txt", "r");
-$fp = fopen ("/home/rasmus/file.gif", "wb");
-$fp = fopen ("http://www.example.com/", "r");
-$fp = fopen ("ftp://user:password@example.com/", "w");
+$handle = fopen ("/home/rasmus/file.txt", "r");
+$handle = fopen ("/home/rasmus/file.gif", "wb");
+$handle = fopen ("http://www.example.com/", "r");
+$handle = fopen ("ftp://user:password@example.com/", "w");
 ?>
 ]]>
       </programlisting>
@@ -143,7 +143,7 @@ $fp = fopen ("ftp://user:password@example.com/", "w");
       <programlisting role="php"> 
 <![CDATA[
 <?php
-$fp = fopen ("c:\\data\\info.txt", "r");
+$handle = fopen ("c:\\data\\info.txt", "r");
 ?>
 ]]>
       </programlisting>
diff --git a/reference/filesystem/functions/fpassthru.xml b/reference/filesystem/functions/fpassthru.xml
index 577a7f45c7..d8b3eb5259 100644
--- a/reference/filesystem/functions/fpassthru.xml
+++ b/reference/filesystem/functions/fpassthru.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.fpassthru">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>fpassthru</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      Reads to EOF on the given file pointer from the current position and
@@ -19,7 +19,7 @@
     <simpara>
      If an error occurs, <function>fpassthru</function> returns
      &false;.  Otherwise, <function>fpassthru</function> returns
-     the number of characters read from <parameter>fp</parameter>
+     the number of characters read from <parameter>handle</parameter>
      and passed through to the output.
     </simpara>
     <simpara>
@@ -29,7 +29,7 @@
      <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>fp</parameter> useless).
+     <parameter>handle</parameter> useless).
     </simpara>
     <simpara>
      If you just want to dump the contents of a file to the output buffer,
diff --git a/reference/filesystem/functions/fputs.xml b/reference/filesystem/functions/fputs.xml
index 8c6dcb3ff9..8c15e73d99 100644
--- a/reference/filesystem/functions/fputs.xml
+++ b/reference/filesystem/functions/fputs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.fputs">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>fputs</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>string</type><parameter>str</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
      </methodsynopsis>
diff --git a/reference/filesystem/functions/fread.xml b/reference/filesystem/functions/fread.xml
index 9eb41f3483..3c284e2efe 100644
--- a/reference/filesystem/functions/fread.xml
+++ b/reference/filesystem/functions/fread.xml
@@ -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.25 -->
   <refentry id="function.fread">
    <refnamediv>
@@ -10,13 +10,13 @@
     <title>Description</title>
      <methodsynopsis>
       <type>string</type><methodname>fread</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>int</type><parameter>length</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      <function>fread</function> reads up to
      <parameter>length</parameter> bytes from the file pointer
-     referenced by <parameter>fp</parameter>. Reading stops when
+     referenced by <parameter>handle</parameter>. Reading stops when
      <parameter>length</parameter> bytes have been read or EOF 
      (end of file) reached, whichever comes first. 
     </simpara> 
@@ -27,9 +27,9 @@
 <?php
 // get contents of a file into a string
 $filename = "/usr/local/something.txt";
-$fd = fopen ($filename, "r");
-$contents = fread ($fd, filesize ($filename));
-fclose ($fd);
+$handle = fopen ($filename, "r");
+$contents = fread ($handle, filesize ($filename));
+fclose ($handle);
 ?>
 ]]>
       </programlisting>
@@ -48,9 +48,9 @@ fclose ($fd);
 <![CDATA[
 <?php
 $filename = "c:\\files\\somepic.gif";
-$fd = fopen ($filename, "rb");
-$contents = fread ($fd, filesize ($filename));
-fclose ($fd);
+$handle = fopen ($filename, "rb");
+$contents = fread ($handle, filesize ($filename));
+fclose ($handle);
 ?>
 ]]>
       </programlisting>
diff --git a/reference/filesystem/functions/fscanf.xml b/reference/filesystem/functions/fscanf.xml
index 8e1cf0bcff..a7e1b4594d 100644
--- a/reference/filesystem/functions/fscanf.xml
+++ b/reference/filesystem/functions/fscanf.xml
@@ -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.fscanf">
    <refnamediv>
@@ -10,14 +10,14 @@
     <title>Description</title>
      <methodsynopsis>
       <type>mixed</type><methodname>fscanf</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>string</type><parameter>format</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>var1</parameter></methodparam>
      </methodsynopsis>
     <para>
      The function <function>fscanf</function> is similar to
      <function>sscanf</function>, but it takes its input from a file
-     associated with <parameter>fp</parameter> and interprets the
+     associated with <parameter>handle</parameter> and interprets the
      input according to the specified
      <parameter>format</parameter>. If only two parameters were passed
      to this function, the values parsed will be returned as an array.
@@ -35,12 +35,12 @@
       <title><function>fscanf</function> Example</title>
       <programlisting role="php">
 	<![CDATA[
-$fp = fopen ("users.txt","r");
-while ($userinfo = fscanf ($fp, "%s\t%s\t%s\n")) {
+$handle = fopen ("users.txt","r");
+while ($userinfo = fscanf ($handle, "%s\t%s\t%s\n")) {
     list ($name, $profession, $countrycode) = $userinfo;
     //... do something with the values
 }
-fclose($fp);
+fclose($handle);
 ]]>
       </programlisting>
      </example>
diff --git a/reference/filesystem/functions/fseek.xml b/reference/filesystem/functions/fseek.xml
index 0cd9d53dc2..f122753d3b 100644
--- a/reference/filesystem/functions/fseek.xml
+++ b/reference/filesystem/functions/fseek.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.fseek">
    <refnamediv>
@@ -10,13 +10,13 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>fseek</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>int</type><parameter>offset</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>whence</parameter></methodparam>
      </methodsynopsis>
     <para>
      Sets the file position indicator for the file referenced by
-     <parameter>fp</parameter>.The new position, measured in bytes
+     <parameter>handle</parameter>.The new position, measured in bytes
      from the beginning of the file, is obtained by adding
      <parameter>offset</parameter> to the position specified by
      <parameter>whence</parameter>, whose values are defined as
diff --git a/reference/filesystem/functions/fstat.xml b/reference/filesystem/functions/fstat.xml
index d7fc37d691..764a3e96de 100644
--- a/reference/filesystem/functions/fstat.xml
+++ b/reference/filesystem/functions/fstat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.24 -->
   <refentry id="function.fstat">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>fstat</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
      </methodsynopsis>
     <para>
      Gathers the statistics of the file opened by the file
diff --git a/reference/filesystem/functions/ftell.xml b/reference/filesystem/functions/ftell.xml
index 70864aabef..58f1cc1e2b 100644
--- a/reference/filesystem/functions/ftell.xml
+++ b/reference/filesystem/functions/ftell.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.ftell">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>ftell</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the position of the file pointer referenced by fp; i.e.,
diff --git a/reference/filesystem/functions/ftruncate.xml b/reference/filesystem/functions/ftruncate.xml
index a744b919d5..f8ae8c4f8c 100644
--- a/reference/filesystem/functions/ftruncate.xml
+++ b/reference/filesystem/functions/ftruncate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.14 -->
   <refentry id="function.ftruncate">
    <refnamediv>
@@ -10,11 +10,11 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>ftruncate</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>int</type><parameter>size</parameter></methodparam>
      </methodsynopsis>
     <para>
-     Takes the filepointer, <parameter>fp</parameter>, and truncates the file to 
+     Takes the filepointer, <parameter>handle</parameter>, and truncates the file to 
      length, <parameter>size</parameter>. This function returns &true; on 
      success and &false; on failure.
     </para>
diff --git a/reference/filesystem/functions/fwrite.xml b/reference/filesystem/functions/fwrite.xml
index 6134f8ffea..2bff297e96 100644
--- a/reference/filesystem/functions/fwrite.xml
+++ b/reference/filesystem/functions/fwrite.xml
@@ -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.fwrite">
    <refnamediv>
@@ -10,14 +10,14 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>fwrite</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
       <methodparam><type>string</type><parameter>string</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      <function>fwrite</function> writes the contents of
      <parameter>string</parameter> to the file stream pointed to by
-     <parameter>fp</parameter>. If the <parameter>length</parameter>
+     <parameter>handle</parameter>. If the <parameter>length</parameter>
      argument is given, writing will stop after
      <parameter>length</parameter> bytes have been written or the end
      of <parameter>string</parameter> is reached, whichever comes
@@ -56,20 +56,20 @@ if (is_writable($filename)) {
     // In our example we're opening $filename in append mode.
     // The file pointer is at the bottom of the file hence 
     // that's where $somecontent will go when we fwrite() it.
-    if (!$fp = fopen($filename, 'a')) {
+    if (!$handle = fopen($filename, 'a')) {
          print "Cannot open file ($filename)";
          exit;
     }
 
     // Write $somecontent to our opened file.
-    if (!fwrite($fp, $somecontent)) {
+    if (!fwrite($handle, $somecontent)) {
         print "Cannot write to file ($filename)";
         exit;
     }
     
     print "Success, wrote ($somecontent) to file ($filename)";
     
-    fclose($fp);
+    fclose($handle);
 					
 } else {
     print "The file $filename is not writable";
diff --git a/reference/filesystem/functions/pclose.xml b/reference/filesystem/functions/pclose.xml
index 1f49024423..ddc1072fbd 100644
--- a/reference/filesystem/functions/pclose.xml
+++ b/reference/filesystem/functions/pclose.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.pclose">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>pclose</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
      </methodsynopsis>
     <para> 
      Closes a file pointer to a pipe opened by
diff --git a/reference/filesystem/functions/popen.xml b/reference/filesystem/functions/popen.xml
index b4c98f896e..28475bcd17 100644
--- a/reference/filesystem/functions/popen.xml
+++ b/reference/filesystem/functions/popen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.popen">
    <refnamediv>
@@ -39,7 +39,7 @@
       <programlisting role="php">
 <![CDATA[
 <?php
-$fp = popen ("/bin/ls", "r");
+$handle = popen ("/bin/ls", "r");
 ?>
 ]]>
       </programlisting>
@@ -57,11 +57,11 @@ $fp = popen ("/bin/ls", "r");
 error_reporting(E_ALL);
 
 /* Add redirection so we can get stderr. */
-$fp = popen('/path/to/spooge 2>&1', 'r');
-echo "'$fp'; " . gettype($fp) . "\n";
-$read = fread($fp, 2096);
+$handle = popen('/path/to/spooge 2>&1', 'r');
+echo "'$handle'; " . gettype($handle) . "\n";
+$read = fread($handle, 2096);
 echo $read;
-pclose($fp);
+pclose($handle);
 ?>
 ]]>
        </programlisting>
diff --git a/reference/filesystem/functions/rewind.xml b/reference/filesystem/functions/rewind.xml
index c45b9922e2..cf08f3e43e 100644
--- a/reference/filesystem/functions/rewind.xml
+++ b/reference/filesystem/functions/rewind.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.rewind">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>rewind</methodname>
-      <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
      </methodsynopsis>
     <para>    
      Sets the file position indicator for fp to the beginning of the
diff --git a/reference/filesystem/functions/tempnam.xml b/reference/filesystem/functions/tempnam.xml
index 5ba8412bc6..43055c9c46 100644
--- a/reference/filesystem/functions/tempnam.xml
+++ b/reference/filesystem/functions/tempnam.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.tempnam">
    <refnamediv>
@@ -38,9 +38,9 @@
 <![CDATA[
 $tmpfname = tempnam ("/tmp", "FOO");
 
-$fp = fopen($tmpfname, "w");
-fwrite($fp, "writing to tempfile");
-fclose($fp);
+$handle = fopen($tmpfname, "w");
+fwrite($handle, "writing to tempfile");
+fclose($handle);
 
 // do here something