jeroen Sat Jul 7 15:36:47 2001 EDT
Modified files:
/phpdoc/en/appendices phpdevel.xml
/phpdoc/en/functions array.xml ifx.xml image.xml oci8.xml
satellite.xml
Log:
Modified script, it is now preserving case for true/false/null's that
do NOT get replaced.
Index: phpdoc/en/appendices/phpdevel.xml
diff -u phpdoc/en/appendices/phpdevel.xml:1.6 phpdoc/en/appendices/phpdevel.xml:1.7
--- phpdoc/en/appendices/phpdevel.xml:1.6 Sat Jul 7 14:42:12 2001
+++ phpdoc/en/appendices/phpdevel.xml Sat Jul 7 15:36:44 2001
@@ -348,8 +348,8 @@
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 @@
<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 @@
<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 @@
resource = php3_list_find(resource_id->value.lval, &type);
if (type != LE_RESOURCE_TYPE) {
php3_error(E_WARNING,"resource index %d has the wrong
type",resource_id->value.lval);
- RETURN_false;
+ RETURN_FALSE;
}
/* ...use resource... */
</programlisting>
Index: phpdoc/en/functions/array.xml
diff -u phpdoc/en/functions/array.xml:1.75 phpdoc/en/functions/array.xml:1.76
--- phpdoc/en/functions/array.xml:1.75 Sat Jul 7 14:42:20 2001
+++ phpdoc/en/functions/array.xml Sat Jul 7 15:36:44 2001
@@ -879,7 +879,7 @@
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 @@
<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>
Index: phpdoc/en/functions/ifx.xml
diff -u phpdoc/en/functions/ifx.xml:1.13 phpdoc/en/functions/ifx.xml:1.14
--- phpdoc/en/functions/ifx.xml:1.13 Sat Jul 7 14:42:29 2001
+++ phpdoc/en/functions/ifx.xml Sat Jul 7 15:36:44 2001
@@ -919,8 +919,8 @@
<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>
Index: phpdoc/en/functions/image.xml
diff -u phpdoc/en/functions/image.xml:1.45 phpdoc/en/functions/image.xml:1.46
--- phpdoc/en/functions/image.xml:1.45 Sat Jul 7 14:42:29 2001
+++ phpdoc/en/functions/image.xml Sat Jul 7 15:36:45 2001
@@ -1069,7 +1069,7 @@
<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 @@
</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 @@
<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 @@
</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
Index: phpdoc/en/functions/oci8.xml
diff -u phpdoc/en/functions/oci8.xml:1.26 phpdoc/en/functions/oci8.xml:1.27
--- phpdoc/en/functions/oci8.xml:1.26 Sat Jul 7 14:42:34 2001
+++ phpdoc/en/functions/oci8.xml Sat Jul 7 15:36:45 2001
@@ -948,7 +948,7 @@
<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 @@
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 @@
<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
Index: phpdoc/en/functions/satellite.xml
diff -u phpdoc/en/functions/satellite.xml:1.7 phpdoc/en/functions/satellite.xml:1.8
--- phpdoc/en/functions/satellite.xml:1.7 Sat Jul 7 14:42:38 2001
+++ phpdoc/en/functions/satellite.xml Sat Jul 7 15:36:45 2001
@@ -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 <[EMAIL PROTECTED]>
