diff --git a/appendices/phpdevel.xml b/appendices/phpdevel.xml
index 51c577db1e..de97ebdbc3 100644
--- a/appendices/phpdevel.xml
+++ b/appendices/phpdevel.xml
@@ -348,8 +348,8 @@ else { use arr->value.ht... }
     function:
     <itemizedlist>
      <listitem><simpara>RETURN</simpara></listitem>
-     <listitem><simpara>RETURN_false</simpara></listitem>
-     <listitem><simpara>RETURN_true</simpara></listitem>
+     <listitem><simpara>RETURN_FALSE</simpara></listitem>
+     <listitem><simpara>RETURN_TRUE</simpara></listitem>
      <listitem><simpara>RETURN_LONG(l)</simpara></listitem>
      <listitem><simpara>RETURN_STRING(s,dup)   If dup is &true;, duplicates the string</simpara></listitem>
      <listitem><simpara>RETURN_STRINGL(s,l,dup)   Return string (s) specifying length (l).</simpara></listitem>
@@ -359,8 +359,8 @@ else { use arr-&gt;value.ht... }
    <para>
     The RETVAL_* macros set the return value, but do not return.
     <itemizedlist>
-     <listitem><simpara>RETVAL_false</simpara></listitem>
-     <listitem><simpara>RETVAL_true</simpara></listitem>
+     <listitem><simpara>RETVAL_FALSE</simpara></listitem>
+     <listitem><simpara>RETVAL_TRUE</simpara></listitem>
      <listitem><simpara>RETVAL_LONG(l)</simpara></listitem>
      <listitem><simpara>RETVAL_STRING(s,dup)   If dup is &true;, duplicates the string</simpara></listitem>
      <listitem><simpara>RETVAL_STRINGL(s,l,dup)   Return string (s) specifying length (l).</simpara></listitem>
@@ -374,7 +374,7 @@ else { use arr-&gt;value.ht... }
 
    <simpara>
     If your function returns boolean success/error responses, always
-    use RETURN_true and RETURN_false respectively.</simpara></sect2>
+    use RETURN_TRUE and RETURN_FALSE respectively.</simpara></sect2>
     
   <sect2 id="phpdevel-addfunc-retcomplex">
    <title>Returning complex values</title>
@@ -496,7 +496,7 @@ convert_to_long(resource_id);
 resource = php3_list_find(resource_id-&gt;value.lval, &amp;type);
 if (type != LE_RESOURCE_TYPE) {
 	php3_error(E_WARNING,"resource index %d has the wrong type",resource_id-&gt;value.lval);
-	RETURN_false;
+	RETURN_FALSE;
 }
 /* ...use resource... */
      </programlisting>
diff --git a/functions/array.xml b/functions/array.xml
index d8f22e4d45..86e7830434 100644
--- a/functions/array.xml
+++ b/functions/array.xml
@@ -879,7 +879,7 @@ $result = array_pad ($input, 2, "noop");
      the <parameter>array</parameter>, shortening the
      <parameter>array</parameter> by one element. 
      If <parameter>array</parameter> is empty (or is not an array), 
-     &null; will be returned.
+     <varname>&null;</varname> will be returned.
     </para>
     <para>
      <example>
@@ -1136,7 +1136,7 @@ $d = array_reduce($x, "rsum", 1);
      <parameter>array</parameter> by one element and moving everything
      down.
      If <parameter>array</parameter> is empty (or is not an array), 
-     &null; will be returned.
+     <varname>&null;</varname> will be returned.
     </para>
     <para>
      <example>
diff --git a/functions/ifx.xml b/functions/ifx.xml
index 2b1e0ca595..9a18ea72f5 100644
--- a/functions/ifx.xml
+++ b/functions/ifx.xml
@@ -919,8 +919,8 @@ for ($i = 0; $i &lt; count($types); $i++) {
     <para>
      Returns the Informix SQL fieldproperies of every field in the
      query as an associative array.  Properties are encoded as:
-     "SQLTYPE;length;precision;scale;ISnullABLE" where SQLTYPE = the
-     Informix type like "SQLVCHAR" etc. and ISnullABLE = "Y" or "N".
+     "SQLTYPE;length;precision;scale;ISNULLABLE" where SQLTYPE = the
+     Informix type like "SQLVCHAR" etc. and ISNULLABLE = "Y" or "N".
     </para>
     <example>
      <title>Informix SQL fieldproperties</title>
diff --git a/functions/image.xml b/functions/image.xml
index 52324795a2..0c5306a2e5 100644
--- a/functions/image.xml
+++ b/functions/image.xml
@@ -1069,7 +1069,7 @@ ImagePng ($im);
  
  <refentry id="function.imagecreatetruecolor">
   <refnamediv>
-   <refname>ImageCreatetrueColor</refname>
+   <refname>ImageCreateTrueColor</refname>
    <refpurpose>Create a new &true; color image</refpurpose>
   </refnamediv>
   <refsect1>
@@ -1082,7 +1082,7 @@ ImagePng ($im);
     </funcprototype>
    </funcsynopsis>
    <para>
-    <function>ImageCreatetrueColor</function> returns an image identifier
+    <function>ImageCreateTrueColor</function> returns an image identifier
     representing a black image of size <parameter>x_size</parameter>
     by <parameter>y_size</parameter>.
    </para>
@@ -1091,7 +1091,7 @@ ImagePng ($im);
   
   <refentry id="function.imagetruecolortopalette">
    <refnamediv>
-    <refname>ImagetrueColorToPalette</refname>
+    <refname>ImageTrueColorToPalette</refname>
     <refpurpose>Convert a &true; color image to a palette image</refpurpose>
    </refnamediv>
    <refsect1>
@@ -1105,7 +1105,7 @@ ImagePng ($im);
      </funcprototype>
     </funcsynopsis>
     <para>
-     <function>ImagetrueColorToPalette</function> converts a &true;color image
+     <function>ImageTrueColorToPalette</function> converts a &true;color image
      to a palette image. The code for this function was originally drawn from
      the Independent JPEG Group library code, which is excellent. The code
      has been modified to preserve as much alpha channel information as
diff --git a/functions/oci8.xml b/functions/oci8.xml
index 9ba3b6cba3..37c9728bdf 100644
--- a/functions/oci8.xml
+++ b/functions/oci8.xml
@@ -948,7 +948,7 @@ Upload file: &lt;input type="file" name="lob_upload">&lt;br>
 	<para>
 	 The <parameter>mode</parameter> parameter allows you to change the
 	 default behaviour. You can specify more than one flag by simply
-	 adding them up (eg OCI_ASSOC+OCI_RETURN_nullS). The known flags
+	 adding them up (eg OCI_ASSOC+OCI_RETURN_NULLS). The known flags
 	 are:
      <simplelist>
       <member>
@@ -959,7 +959,7 @@ Upload file: &lt;input type="file" name="lob_upload">&lt;br>
        zero. (DEFAULT)
       </member>
       <member>
-       <literal>OCI_RETURN_nullS</literal> Return empty columns.
+       <literal>OCI_RETURN_NULLS</literal> Return empty columns.
       </member>
       <member>
        <literal>OCI_RETURN_LOBS</literal> Return the value of a LOB
@@ -1036,20 +1036,20 @@ OCILogoff($conn);
   
   <refentry id="function.ocicolumnisnull">
    <refnamediv>
-    <refname>OCIColumnIsnull</refname>
+    <refname>OCIColumnIsNULL</refname>
     <refpurpose>test whether a result column is &null;</refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
     <funcsynopsis>
      <funcprototype>
-      <funcdef>int <function>OCIColumnIsnull</function></funcdef>
+      <funcdef>int <function>OCIColumnIsNULL</function></funcdef>
       <paramdef>int <parameter>stmt</parameter></paramdef>
       <paramdef>mixed <parameter>column</parameter></paramdef>
      </funcprototype>
     </funcsynopsis>
     <para>
-     <function>OCIColumnIsnull</function> returns &true; if the returned
+     <function>OCIColumnIsNULL</function> returns &true; if the returned
      column <parameter>column</parameter> in the result from the
      statement <parameter>stmt</parameter> is &null;. You can either use
 	 the column-number (1-Based) or the column-name for the
diff --git a/functions/satellite.xml b/functions/satellite.xml
index d9943054fc..ad380cdc8a 100644
--- a/functions/satellite.xml
+++ b/functions/satellite.xml
@@ -1,6 +1,6 @@
 <!-- 
 
-	$Id: satellite.xml,v 1.7 2001-07-07 18:42:38 jeroen Exp $
+	$Id: satellite.xml,v 1.8 2001-07-07 19:36:45 jeroen Exp $
 
 	Author: David Eriksson <david@2good.com>