jeroen Sat Jul 7 17:57:36 2001 EDT
Modified files:
/phpdoc/en/appendices migration.xml
/phpdoc/en/functions exec.xml fbsql.xml filesystem.xml hw.xml
ifx.xml ldap.xml msql.xml mssql.xml mysql.xml
oracle.xml pcre.xml pdf.xml pgsql.xml
satellite.xml snmp.xml var.xml
/phpdoc/en/language expressions.xml
Log:
Fixed (hopefully last) error in script. Damn regex.
Index: phpdoc/en/appendices/migration.xml
diff -u phpdoc/en/appendices/migration.xml:1.6 phpdoc/en/appendices/migration.xml:1.7
--- phpdoc/en/appendices/migration.xml:1.6 Sat Jul 7 17:27:00 2001
+++ phpdoc/en/appendices/migration.xml Sat Jul 7 17:57:26 2001
@@ -325,7 +325,7 @@
<sect2 id="migration-truefalse">
<title>Function &true;/false return values</title>
<simpara>
- Most internal functions have been rewritten so they return TRUE
+ Most internal functions have been rewritten so they return &true;
when successful and &false; when failing, as opposed to 0 and -1 in
PHP/FI 2.0, respectively. The new behaviour allows for more
logical code, like <literal>$fp = fopen("/your/file") or
Index: phpdoc/en/functions/exec.xml
diff -u phpdoc/en/functions/exec.xml:1.13 phpdoc/en/functions/exec.xml:1.14
--- phpdoc/en/functions/exec.xml:1.13 Sat Jul 7 17:27:07 2001
+++ phpdoc/en/functions/exec.xml Sat Jul 7 17:57:27 2001
@@ -238,7 +238,7 @@
PHP is running as a server module.
</para>
<para>
- Returns the last line of the command output on success, and false
+ Returns the last line of the command output on success, and &false;
on failure.
</para>
<para>
Index: phpdoc/en/functions/fbsql.xml
diff -u phpdoc/en/functions/fbsql.xml:1.13 phpdoc/en/functions/fbsql.xml:1.14
--- phpdoc/en/functions/fbsql.xml:1.13 Sat Jul 7 17:27:07 2001
+++ phpdoc/en/functions/fbsql.xml Sat Jul 7 17:57:27 2001
@@ -762,7 +762,7 @@
</listitem>
<listitem>
<simpara>
- not_null - 1 if the column cannot be null
+ not_null - 1 if the column cannot be &null;
</simpara>
</listitem>
<listitem>
Index: phpdoc/en/functions/filesystem.xml
diff -u phpdoc/en/functions/filesystem.xml:1.74 phpdoc/en/functions/filesystem.xml:1.75
--- phpdoc/en/functions/filesystem.xml:1.74 Sat Jul 7 17:27:07 2001
+++ phpdoc/en/functions/filesystem.xml Sat Jul 7 17:57:27 2001
@@ -434,7 +434,7 @@
<para>
This function forces a write of all buffered output to the
to the resource pointed to by the file handle
- <parameter>fp</parameter>. Returns &true; if succesful, false
+ <parameter>fp</parameter>. Returns &true; if succesful, &false;
otherwise.
</para>
<para>
@@ -1018,7 +1018,7 @@
</funcsynopsis>
<para>
Returns the type of the file. Possible values are fifo, char,
- dir, block, link, file, and unknown.</para> <para> Returns false
+ dir, block, link, file, and unknown.</para> <para> Returns &false;
if an error occurs.
</para>
<para>
Index: phpdoc/en/functions/hw.xml
diff -u phpdoc/en/functions/hw.xml:1.12 phpdoc/en/functions/hw.xml:1.13
--- phpdoc/en/functions/hw.xml:1.12 Sat Jul 7 17:27:08 2001
+++ phpdoc/en/functions/hw.xml Sat Jul 7 17:57:28 2001
@@ -740,7 +740,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns a string containing the last error message or 'No Error'. If false
+ Returns a string containing the last error message or 'No Error'. If &false;
is returned, this function failed.
The message relates to the last command.
</para>
Index: phpdoc/en/functions/ifx.xml
diff -u phpdoc/en/functions/ifx.xml:1.15 phpdoc/en/functions/ifx.xml:1.16
--- phpdoc/en/functions/ifx.xml:1.15 Sat Jul 7 17:27:09 2001
+++ phpdoc/en/functions/ifx.xml Sat Jul 7 17:57:28 2001
@@ -154,8 +154,8 @@
<title>&null; values</title>
<para>
The configuration variable ifx.nullformat (and the runtime
- function <function>ifx_nullformat</function>) when set to true
- will return &null; columns as the string "&null;", when set to false
+ function <function>ifx_nullformat</function>) when set to &true;
+ will return &null; columns as the string "&null;", when set to &false;
they return the empty string. This allows you to discriminate
between &null; columns and empty columns.
</para>
Index: phpdoc/en/functions/ldap.xml
diff -u phpdoc/en/functions/ldap.xml:1.28 phpdoc/en/functions/ldap.xml:1.29
--- phpdoc/en/functions/ldap.xml:1.28 Sat Jul 7 17:27:11 2001
+++ phpdoc/en/functions/ldap.xml Sat Jul 7 17:57:28 2001
@@ -973,7 +973,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns an array of values for the attribute on success and false
+ Returns an array of values for the attribute on success and &false;
on error.</para>
<para>
<function>ldap_get_values</function> function is used to read all
@@ -1046,7 +1046,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns an array of values for the attribute on success and false
+ Returns an array of values for the attribute on success and &false;
on error.</para>
<para>
<function>ldap_get_values_len</function> function is used to read all
@@ -1586,7 +1586,7 @@
</funcsynopsis>
<para>
Sets the value of the specified option to be
- <parameter>newval</parameter>, and returns &true; on success and false
+ <parameter>newval</parameter>, and returns &true; on success and &false;
on error.</para>
<para>
The parameter <parameter>option</parameter> can be one of:
Index: phpdoc/en/functions/msql.xml
diff -u phpdoc/en/functions/msql.xml:1.10 phpdoc/en/functions/msql.xml:1.11
--- phpdoc/en/functions/msql.xml:1.10 Sat Jul 7 17:27:12 2001
+++ phpdoc/en/functions/msql.xml Sat Jul 7 17:57:28 2001
@@ -417,7 +417,7 @@
</listitem>
<listitem>
<simpara>
- not_null - 1 if the column cannot be null
+ not_null - 1 if the column cannot be &null;
</simpara>
</listitem>
<listitem>
Index: phpdoc/en/functions/mssql.xml
diff -u phpdoc/en/functions/mssql.xml:1.14 phpdoc/en/functions/mssql.xml:1.15
--- phpdoc/en/functions/mssql.xml:1.14 Sat Jul 7 17:27:12 2001
+++ phpdoc/en/functions/mssql.xml Sat Jul 7 17:57:28 2001
@@ -64,7 +64,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns: A positive MS SQL link identifier on success, or false
+ Returns: A positive MS SQL link identifier on success, or &false;
on error.
</para>
<para>
@@ -133,7 +133,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns: An array that corresponds to the fetched row, or false
+ Returns: An array that corresponds to the fetched row, or &false;
if there are no more rows.
</para>
<para>
@@ -263,7 +263,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns: An array that corresponds to the fetched row, or false
+ Returns: An array that corresponds to the fetched row, or &false;
if there are no more rows.
</para>
<para>
@@ -608,7 +608,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns: A positive MS SQL result identifier on success, or false
+ Returns: A positive MS SQL result identifier on success, or &false;
on error.
</para>
<para>
Index: phpdoc/en/functions/mysql.xml
diff -u phpdoc/en/functions/mysql.xml:1.52 phpdoc/en/functions/mysql.xml:1.53
--- phpdoc/en/functions/mysql.xml:1.52 Sat Jul 7 17:27:12 2001
+++ phpdoc/en/functions/mysql.xml Sat Jul 7 17:57:28 2001
@@ -703,7 +703,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns an array that corresponds to the fetched row, or false
+ Returns an array that corresponds to the fetched row, or &false;
if there are no more rows.</para>
<para>
<function>mysql_fetch_array</function> is an extended version of
@@ -865,7 +865,7 @@
</listitem>
<listitem>
<simpara>
- not_null - 1 if the column cannot be null
+ not_null - 1 if the column cannot be &null;
</simpara>
</listitem>
<listitem>
@@ -1061,7 +1061,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns: An array that corresponds to the fetched row, or false
+ Returns: An array that corresponds to the fetched row, or &false;
if there are no more rows.
</para>
<para>
@@ -1766,7 +1766,7 @@
</para>
</note>
<para>
- <function>mysql_query</function> returns &true; (non-zero) or FALSE
+ <function>mysql_query</function> returns &true; (non-zero) or &false;
to indicate whether or not the query succeeded. A return value
of &true; means that the query was legal and could be executed by
the server. It does not indicate anything about the number of
@@ -1802,7 +1802,7 @@
</example>
</para>
<para>
- <function>mysql_query</function> will also fail and return FALSE
+ <function>mysql_query</function> will also fail and return &false;
if you don't have permission to access the table(s) referenced by
the query.
</para>
Index: phpdoc/en/functions/oracle.xml
diff -u phpdoc/en/functions/oracle.xml:1.16 phpdoc/en/functions/oracle.xml:1.17
--- phpdoc/en/functions/oracle.xml:1.16 Sat Jul 7 17:27:13 2001
+++ phpdoc/en/functions/oracle.xml Sat Jul 7 17:57:28 2001
@@ -446,7 +446,7 @@
<para>
Returns the column data. If an error occurs, &false; is returned
and <function>ora_errorcode</function>
- will return a non-zero value. Note, however, that a test for False
+ will return a non-zero value. Note, however, that a test for &false;
on the results from this function may be &true; in cases where there is
not error as well (&null; result, empty string, the number 0, the
string "0").
Index: phpdoc/en/functions/pcre.xml
diff -u phpdoc/en/functions/pcre.xml:1.53 phpdoc/en/functions/pcre.xml:1.54
--- phpdoc/en/functions/pcre.xml:1.53 Sat Jul 7 17:27:13 2001
+++ phpdoc/en/functions/pcre.xml Sat Jul 7 17:57:29 2001
@@ -941,7 +941,7 @@
"b", but matching "aabbaa" against /^(aa(bb)?)+$/ leaves $2
unset. However, if the pattern is changed to
/^(aa(b(b))?)+$/ then $2 (and $3) get set.
- In Perl 5.004 $2 is set in both cases, and that is also true
+ In Perl 5.004 $2 is set in both cases, and that is also &true;
of PCRE. If in the future Perl changes to a consistent state
that is different, PCRE may change to follow.
</simpara>
@@ -2113,7 +2113,7 @@
does not find an occurrence of "bar" that is preceded by
something other than "foo"; it finds any occurrence of "bar"
- whatsoever, because the assertion (?!foo) is always true
+ whatsoever, because the assertion (?!foo) is always &true;
when the next three characters are "bar". A lookbehind
assertion is needed to achieve this effect.
Index: phpdoc/en/functions/pdf.xml
diff -u phpdoc/en/functions/pdf.xml:1.60 phpdoc/en/functions/pdf.xml:1.61
--- phpdoc/en/functions/pdf.xml:1.60 Sat Jul 7 17:27:13 2001
+++ phpdoc/en/functions/pdf.xml Sat Jul 7 17:57:29 2001
@@ -1172,7 +1172,7 @@
or the name of a CMap.
</para>
<para>
- <function>pdf_findfont</function> returns a font handle or false
+ <function>pdf_findfont</function> returns a font handle or &false;
on error.
</para>
<para>
Index: phpdoc/en/functions/pgsql.xml
diff -u phpdoc/en/functions/pgsql.xml:1.36 phpdoc/en/functions/pgsql.xml:1.37
--- phpdoc/en/functions/pgsql.xml:1.36 Sat Jul 7 17:27:14 2001
+++ phpdoc/en/functions/pgsql.xml Sat Jul 7 17:57:30 2001
@@ -117,7 +117,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns &false; if connection is not a valid connection index, true
+ Returns &false; if connection is not a valid connection index, &true;
otherwise. Closes down the connection to a PostgreSQL database
associated with the given connection index.
</para>
@@ -375,7 +375,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns: An array that corresponds to the fetched row, or false
+ Returns: An array that corresponds to the fetched row, or &false;
if there are no more rows.
</para>
<para>
@@ -539,7 +539,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns: An array that corresponds to the fetched row, or false
+ Returns: An array that corresponds to the fetched row, or &false;
if there are no more rows.
</para>
<para>
@@ -875,7 +875,7 @@
The <parameter>oid</parameter> argument specifies the object id
of the large object to export and the
<parameter>filename</parameter> argument specifies the pathname
- of the file. Returns &false; if an error occurred, TRUE
+ of the file. Returns &false; if an error occurred, &true;
otherwise. Remember that handling large objects in PostgreSQL
must happen inside a transaction.
</para>
@@ -1185,7 +1185,7 @@
to the PostgreSQL backend server. This is useful for example for
very high-speed inserting of data into a table, initiated by
starting a PostgreSQL copy-operation. That final NULL-character
- is added automatically. Returns &true; if successfull, FALSE
+ is added automatically. Returns &true; if successfull, &false;
otherwise.
</para>
<note>
Index: phpdoc/en/functions/satellite.xml
diff -u phpdoc/en/functions/satellite.xml:1.9 phpdoc/en/functions/satellite.xml:1.10
--- phpdoc/en/functions/satellite.xml:1.9 Sat Jul 7 17:27:15 2001
+++ phpdoc/en/functions/satellite.xml Sat Jul 7 17:57:30 2001
@@ -1,6 +1,6 @@
<!--
- $Id: satellite.xml,v 1.9 2001/07/07 21:27:15 jeroen Exp $
+ $Id: satellite.xml,v 1.10 2001/07/07 21:57:30 jeroen Exp $
Author: David Eriksson <[EMAIL PROTECTED]>
Index: phpdoc/en/functions/snmp.xml
diff -u phpdoc/en/functions/snmp.xml:1.10 phpdoc/en/functions/snmp.xml:1.11
--- phpdoc/en/functions/snmp.xml:1.10 Sat Jul 7 17:27:15 2001
+++ phpdoc/en/functions/snmp.xml Sat Jul 7 17:57:30 2001
@@ -128,7 +128,7 @@
<function>snmpwalk</function> function is used to read all the
values from an SNMP agent specified by the
<parameter>hostname</parameter>. <parameter>Community</parameter>
- specifies the read community for that agent. A null
+ specifies the read community for that agent. A &null;
<parameter>object_id</parameter> is taken as the root of the SNMP
objects tree and all objects under that tree are returned as an
array. If <parameter>object_id</parameter> is specified, all the
@@ -188,7 +188,7 @@
<function>snmpwalkoid</function> function is used to read all
object ids and their respective values from an SNMP agent
specified by the hostname. Community specifies the read
- <parameter>community</parameter> for that agent. A null
+ <parameter>community</parameter> for that agent. A &null;
<parameter>object_id</parameter> is taken as the root of the SNMP
objects tree and all objects under that tree are returned as an
array. If <parameter>object_id</parameter> is specified, all the
Index: phpdoc/en/functions/var.xml
diff -u phpdoc/en/functions/var.xml:1.60 phpdoc/en/functions/var.xml:1.61
--- phpdoc/en/functions/var.xml:1.60 Sat Jul 7 17:27:17 2001
+++ phpdoc/en/functions/var.xml Sat Jul 7 17:57:30 2001
@@ -324,7 +324,7 @@
</funcprototype>
</funcsynopsis>
<para>
- Returns &true; if <parameter>var</parameter> is an <type>array</type>, false
+ Returns &true; if <parameter>var</parameter> is an <type>array</type>, &false;
otherwise.
</para>
<para>
@@ -535,7 +535,7 @@
<refnamediv>
<refname>is_null</refname>
<refpurpose>
- Finds whether a variable is null
+ Finds whether a variable is &null;
</refpurpose>
</refnamediv>
<refsect1>
@@ -1159,7 +1159,7 @@
</funcsynopsis>
<para>
<function>unset</function> destroys the specified variables. Note
- that in PHP 3, <function>unset</function> will always return true
+ that in PHP 3, <function>unset</function> will always return &true;
(actually, the integer value 1). In PHP 4, however,
<function>unset</function> is no longer a &true; function: it is
now a statement. As such no value is returned, and attempting to
Index: phpdoc/en/language/expressions.xml
diff -u phpdoc/en/language/expressions.xml:1.7 phpdoc/en/language/expressions.xml:1.8
--- phpdoc/en/language/expressions.xml:1.7 Sat Jul 7 17:27:19 2001
+++ phpdoc/en/language/expressions.xml Sat Jul 7 17:57:31 2001
@@ -89,7 +89,7 @@
<simpara>
A very common type of expressions are comparison expressions.
- These expressions evaluate to either 0 or 1, meaning &false; or TRUE
+ These expressions evaluate to either 0 or 1, meaning &false; or &true;
(respectively). PHP supports > (bigger than), >= (bigger than
or equal to), == (equal), != (not equal), < (smaller than) and <=
(smaller than or equal to). These expressions are most commonly used
