cvs: phpdoc /en/appendices migration.xml phpdevel.xml /en/features error-handling.xml /en/functions array.xml classobj.xml com.xml dba.xml dir.xml
errorfunc.xml exec.xml fbsql.xml filesystem.xml funchand.xml http.xml hw.xml ifx.xml image.xml imap.xml info.xml ingres_ii.xml java.xml ldap.xml
misc.xml msql.xml mssql.xml mysql.xml oracle.xml pcre.xml pdf.xml pgsql.xml printer.xml pspell.xml regex.xml satellite.xml session.xml snmp.xml
sockets.xml strings.xml uodbc.xml var.xml xml.xml /en/language basic-syntax.xml control-structures.xml expressions.xml oop.xml types.xml /en/pear
pear.xml standards.xml

From: Date: Sat, 07 Jul 2001 21:27:38 +0000
Subject: cvs: phpdoc /en/appendices migration.xml phpdevel.xml /en/features error-handling.xml /en/functions array.xml classobj.xml com.xml dba.xml dir.xml
errorfunc.xml exec.xml fbsql.xml filesystem.xml funchand.xml http.xml hw.xml ifx.xml image.xml imap.xml info.xml ingres_ii.xml java.xml ldap.xml
misc.xml msql.xml mssql.xml mysql.xml oracle.xml pcre.xml pdf.xml pgsql.xml printer.xml pspell.xml regex.xml satellite.xml session.xml snmp.xml
sockets.xml strings.xml uodbc.xml var.xml xml.xml /en/language basic-syntax.xml control-structures.xml expressions.xml oop.xml types.xml /en/pear
pear.xml standards.xml
Groups: php.doc 
Request: Send a blank email to phpdoc+get-969335929@lists.php.net to get a copy of this message
jeroen Sat Jul 7 17:27:38 2001 EDT Modified files: /phpdoc/en/appendices migration.xml phpdevel.xml /phpdoc/en/features error-handling.xml /phpdoc/en/functions array.xml classobj.xml com.xml dba.xml dir.xml errorfunc.xml exec.xml fbsql.xml filesystem.xml funchand.xml http.xml hw.xml ifx.xml image.xml imap.xml info.xml ingres_ii.xml java.xml ldap.xml misc.xml msql.xml mssql.xml mysql.xml oracle.xml pcre.xml pdf.xml pgsql.xml printer.xml pspell.xml regex.xml satellite.xml session.xml snmp.xml sockets.xml strings.xml uodbc.xml var.xml xml.xml /phpdoc/en/language basic-syntax.xml control-structures.xml expressions.xml oop.xml types.xml /phpdoc/en/pear pear.xml standards.xml Log: Processed the en-tree with the new script, which leaves text inside <programlisting> alone. I hope it's okay now...

Index: phpdoc/en/appendices/migration.xml diff -u phpdoc/en/appendices/migration.xml:1.5 phpdoc/en/appendices/migration.xml:1.6 --- phpdoc/en/appendices/migration.xml:1.5 Sat Jul 7 14:42:11 2001 +++ phpdoc/en/appendices/migration.xml Sat Jul 7 17:27:00 2001 @@ -323,9 +323,9 @@ <sect2 id="migration-truefalse"> - <title>Function &true;/&false; return values</title> + <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/appendices/phpdevel.xml diff -u phpdoc/en/appendices/phpdevel.xml:1.7 phpdoc/en/appendices/phpdevel.xml:1.8 --- phpdoc/en/appendices/phpdevel.xml:1.7 Sat Jul 7 15:36:44 2001 +++ phpdoc/en/appendices/phpdevel.xml Sat Jul 7 17:27:01 2001 @@ -258,7 +258,7 @@ pval arr; if (array_init(&amp;arr) == FAILURE) { failed... }; -hash_update(active_symbol_table,"foo",sizeof("foo"),&amp;arr,sizeof(pval),&null;); +hash_update(active_symbol_table,"foo",sizeof("foo"),&amp;arr,sizeof(pval),NULL); </programlisting> </example> @@ -278,15 +278,15 @@ entry.value.lval = 5; /* defines $foo["bar"] = 5 */ -hash_update(arr.value.ht,"bar",sizeof("bar"),&amp;entry,sizeof(pval),&null;); +hash_update(arr.value.ht,"bar",sizeof("bar"),&amp;entry,sizeof(pval),NULL); /* defines $foo[7] = 5 */ -hash_index_update(arr.value.ht,7,&amp;entry,sizeof(pval),&null;); +hash_index_update(arr.value.ht,7,&amp;entry,sizeof(pval),NULL); /* defines the next free place in $foo[], * $foo[8], to be 5 (works like php2) */ -hash_next_index_insert(arr.value.ht,&amp;entry,sizeof(pval),&null;); +hash_next_index_insert(arr.value.ht,&amp;entry,sizeof(pval),NULL); </programlisting> </example> Index: phpdoc/en/features/error-handling.xml diff -u phpdoc/en/features/error-handling.xml:1.15 phpdoc/en/features/error-handling.xml:1.16 --- phpdoc/en/features/error-handling.xml:1.15 Sat Jul 7 14:42:17 2001 +++ phpdoc/en/features/error-handling.xml Sat Jul 7 17:27:02 2001 @@ -231,12 +231,12 @@ function distance ($vect1, $vect2) { if (!is_array($vect1) || !is_array($vect2)) { trigger_error(&quot;Incorrect parameters, arrays expected&quot;, E_USER_ERROR); - return &null;; + return NULL; } if (count($vect1) != count($vect2)) { trigger_error(&quot;Vectors need to be of the same size&quot;, E_USER_ERROR); - return &null;; + return NULL; } for ($i=0; $i&lt;count($vect1); $i++) { Index: phpdoc/en/functions/array.xml diff -u phpdoc/en/functions/array.xml:1.76 phpdoc/en/functions/array.xml:1.77 --- phpdoc/en/functions/array.xml:1.76 Sat Jul 7 15:36:44 2001 +++ phpdoc/en/functions/array.xml Sat Jul 7 17:27:04 2001 @@ -553,7 +553,7 @@ $b = array("one", "two", "three", "four", "five"); $c = array("uno", "dos", "tres", "cuatro", "cinco"); -$d = array_map(&null;, $a, $b, $c); +$d = array_map(null, $a, $b, $c); print_r($d); // will output: @@ -1035,7 +1035,7 @@ <programlisting role="php"> $input = array ("php", 4.0, array ("green", "red")); $result = array_reverse ($input); -$result_keyed = array_reverse ($input, &true;); +$result_keyed = array_reverse ($input, TRUE); </programlisting> </example> </para> @@ -2199,9 +2199,9 @@ <?php $a = array('1.10', 12.4, 1.13); -if (in_array('12.4', $a, &true;)) +if (in_array('12.4', $a, TRUE)) echo &quot;'12.4' found with strict check\n&quot;; -if (in_array(1.13, $a, &true;)) +if (in_array(1.13, $a, TRUE)) echo &quot;1.13 found with strict check\n&quot;; ?> Index: phpdoc/en/functions/classobj.xml diff -u phpdoc/en/functions/classobj.xml:1.21 phpdoc/en/functions/classobj.xml:1.22 --- phpdoc/en/functions/classobj.xml:1.21 Sat Jul 7 14:42:22 2001 +++ phpdoc/en/functions/classobj.xml Sat Jul 7 17:27:05 2001 @@ -56,14 +56,14 @@ // extends the base class class Spinach extends Vegetable { - var $cooked = &false;; + var $cooked = false; function Spinach() { - $this-&gt;Vegetable( &true;, &quot;green&quot; ); + $this-&gt;Vegetable( true, &quot;green&quot; ); } function cook_it() { - $this-&gt;cooked = &true;; + $this-&gt;cooked = true; } function is_cooked() { @@ -117,7 +117,7 @@ // instantiate 2 objects -$veggie = new Vegetable(&true;,&quot;blue&quot;); +$veggie = new Vegetable(true,&quot;blue&quot;); $leafy = new Spinach(); // print out information about objects @@ -365,17 +365,17 @@ class myclass { // constructor function myclass() { - return(&true;); + return(true); } // method 1 function myfunc1() { - return(&true;); + return(true); } // method 2 function myfunc2() { - return(&true;); + return(true); } } @@ -448,7 +448,7 @@ // constructor function myclass() { - return(&true;); + return(true); } } Index: phpdoc/en/functions/com.xml diff -u phpdoc/en/functions/com.xml:1.16 phpdoc/en/functions/com.xml:1.17 --- phpdoc/en/functions/com.xml:1.16 Sat Jul 7 14:42:22 2001 +++ phpdoc/en/functions/com.xml Sat Jul 7 17:27:05 2001 @@ -91,7 +91,7 @@ //free the object $word->Release(); -$word = &null;; +$word = null; </programlisting> </example> </para> @@ -131,8 +131,8 @@ $rs->Release(); $conn->Release(); -$rs = &null;; -$conn = &null;; +$rs = null; +$conn = null; </programlisting> </example> </para> Index: phpdoc/en/functions/dba.xml diff -u phpdoc/en/functions/dba.xml:1.10 phpdoc/en/functions/dba.xml:1.11 --- phpdoc/en/functions/dba.xml:1.10 Sat Jul 7 14:42:24 2001 +++ phpdoc/en/functions/dba.xml Sat Jul 7 17:27:05 2001 @@ -151,7 +151,7 @@ $key = dba_firstkey ($id); -while ($key != &false;) { +while ($key != false) { if (...) { # remember the key to perform some action later $handle_later[] = $key; } Index: phpdoc/en/functions/dir.xml diff -u phpdoc/en/functions/dir.xml:1.16 phpdoc/en/functions/dir.xml:1.17 --- phpdoc/en/functions/dir.xml:1.16 Sat Jul 7 14:42:25 2001 +++ phpdoc/en/functions/dir.xml Sat Jul 7 17:27:06 2001 @@ -200,7 +200,7 @@ $handle=opendir('.'); echo "Directory handle: $handle\n"; echo "Files:\n"; -while (($file = readdir($handle))!==&false;) { +while (($file = readdir($handle))!==false) { echo "$file\n"; } closedir($handle); @@ -221,7 +221,7 @@ <programlisting role="php"> &lt;?php $handle=opendir('.'); -while (&false;!==($file = readdir($handle))) { +while (false!==($file = readdir($handle))) { if ($file != "." &amp;&amp; $file != "..") { echo "$file\n"; } Index: phpdoc/en/functions/errorfunc.xml diff -u phpdoc/en/functions/errorfunc.xml:1.13 phpdoc/en/functions/errorfunc.xml:1.14 --- phpdoc/en/functions/errorfunc.xml:1.13 Sat Jul 7 14:42:25 2001 +++ phpdoc/en/functions/errorfunc.xml Sat Jul 7 17:27:06 2001 @@ -378,7 +378,7 @@ FATAL); if (!is_array($vect)) { trigger_error(&quot;Incorrect input vector, array of values expected&quot;, ERROR); - return &null;; + return null; } for ($i=0; $i&lt;count($vect); $i++) { if (!is_numeric($vect[$i])) @@ -442,7 +442,7 @@ ---- vector c - an error &lt;b&gt;ERROR&lt;/b&gt; [512] Incorrect input vector, array of values expected&lt;br&gt; -&null; +NULL ---- vector d - fatal error &lt;b&gt;FATAL&lt;/b&gt; [256] log(x) for x &lt;= 0 is undefined, you used: scale = -2.5&lt;br&gt; Index: phpdoc/en/functions/exec.xml diff -u phpdoc/en/functions/exec.xml:1.12 phpdoc/en/functions/exec.xml:1.13 --- phpdoc/en/functions/exec.xml:1.12 Sat Jul 7 14:42:25 2001 +++ phpdoc/en/functions/exec.xml Sat Jul 7 17:27:07 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.12 phpdoc/en/functions/fbsql.xml:1.13 --- phpdoc/en/functions/fbsql.xml:1.12 Sat Jul 7 14:42:26 2001 +++ phpdoc/en/functions/fbsql.xml Sat Jul 7 17:27:07 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.73 phpdoc/en/functions/filesystem.xml:1.74 --- phpdoc/en/functions/filesystem.xml:1.73 Sat Jul 7 14:42:26 2001 +++ phpdoc/en/functions/filesystem.xml Sat Jul 7 17:27:07 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/funchand.xml diff -u phpdoc/en/functions/funchand.xml:1.14 phpdoc/en/functions/funchand.xml:1.15 --- phpdoc/en/functions/funchand.xml:1.14 Sat Jul 7 14:42:27 2001 +++ phpdoc/en/functions/funchand.xml Sat Jul 7 17:27:08 2001 @@ -173,9 +173,9 @@ } // create a bunch of math functions -$f1 = 'if ($a &gt;=0) {return "b*a^2 = ".$b*sqrt($a);} else {return &false;;}'; +$f1 = 'if ($a &gt;=0) {return "b*a^2 = ".$b*sqrt($a);} else {return false;}'; $f2 = "return \"min(b^2+a, a^2,b) = \".min(\$a*\$a+\$b,\$b*\$b+\$a);"; -$f3 = 'if ($a &gt; 0 &amp;&amp; $b != 0) {return "ln(a)/b = ".log($a)/$b;} else {return &false;;}'; +$f3 = 'if ($a &gt; 0 &amp;&amp; $b != 0) {return "ln(a)/b = ".log($a)/$b;} else {return false;}'; $farr = array( create_function('$x,$y', 'return "some trig: ".(sin($x) + $x*cos($y));'), create_function('$x,$y', 'return "a hypotenuse: ".sqrt($x*$x + $y*$y);'), Index: phpdoc/en/functions/http.xml diff -u phpdoc/en/functions/http.xml:1.20 phpdoc/en/functions/http.xml:1.21 --- phpdoc/en/functions/http.xml:1.20 Sat Jul 7 14:42:28 2001 +++ phpdoc/en/functions/http.xml Sat Jul 7 17:27:08 2001 @@ -38,7 +38,7 @@ <informalexample> <programlisting role="php"> header('www-authenticate: Negociate'); -header('www-authenticate: NTLM',&false;); +header('www-authenticate: NTLM',false); </programlisting> </informalexample> </para> Index: phpdoc/en/functions/hw.xml diff -u phpdoc/en/functions/hw.xml:1.11 phpdoc/en/functions/hw.xml:1.12 --- phpdoc/en/functions/hw.xml:1.11 Sat Jul 7 14:42:28 2001 +++ phpdoc/en/functions/hw.xml Sat Jul 7 17:27:08 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.14 phpdoc/en/functions/ifx.xml:1.15 --- phpdoc/en/functions/ifx.xml:1.14 Sat Jul 7 15:36:44 2001 +++ phpdoc/en/functions/ifx.xml Sat Jul 7 17:27:09 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> @@ -1288,7 +1288,7 @@ </funcprototype> </funcsynopsis> <para> - Sets the default return value of a &null;-value on a fetch row. + Sets the default return value of a NULL-value on a fetch row. Mode "0" returns "", and mode "1" returns "&null;". </para> </refsect1> Index: phpdoc/en/functions/image.xml diff -u phpdoc/en/functions/image.xml:1.46 phpdoc/en/functions/image.xml:1.47 --- phpdoc/en/functions/image.xml:1.46 Sat Jul 7 15:36:45 2001 +++ phpdoc/en/functions/image.xml Sat Jul 7 17:27:09 2001 @@ -143,7 +143,7 @@ </funcsynopsis> <para> <function>ImageAlphaBlending</function> allows for two different - modes of drawing on &true;color images. In blending mode, the + modes of drawing on truecolor images. In blending mode, the alpha channel component of the color supplied to all drawing function, such as <function>ImageSetPixel</function> determines how much of the underlying color shouldbe allowed to shine through. As a result, gd @@ -1105,13 +1105,13 @@ </funcprototype> </funcsynopsis> <para> - <function>ImageTrueColorToPalette</function> converts a &true;color image + <function>ImageTrueColorToPalette</function> converts a truecolor 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 possible in the resulting palette, in addition to preserving colors as well as possible. This does not work as well as might be hoped. It is - usually best to simply produce a &true;color output image instead, which + usually best to simply produce a truecolor output image instead, which guarantees the highest output quality. </para> <para> @@ -2688,7 +2688,7 @@ </funcsynopsis> <para> This function calculates and returns the bounding box in pixels - for a &true;Type text. + for a TrueType text. <variablelist> <varlistentry> <term> @@ -2712,7 +2712,7 @@ </term> <listitem> <simpara> - The name of the &true;Type font file. (Can also be an URL.) + The name of the TrueType font file. (Can also be an URL.) </simpara> </listitem> </varlistentry> @@ -2787,7 +2787,7 @@ <refnamediv> <refname>ImageTTFText</refname> <refpurpose> - Write text to the image using &true;Type fonts + Write text to the image using TrueType fonts </refpurpose> </refnamediv> <refsect1> @@ -2811,7 +2811,7 @@ <parameter>im</parameter>, starting at coordinates <parameter>x</parameter>, <parameter>y</parameter> (top left is 0, 0), at an angle of <parameter>angle</parameter> in color - <parameter>col</parameter>, using the &true;Type font file + <parameter>col</parameter>, using the TrueType font file identified by <parameter>fontfile</parameter>. </para> <para> @@ -2828,7 +2828,7 @@ of 90 would result in bottom-to-top reading text). </para> <para> - <parameter>Fontfile</parameter> is the path to the &true;Type font + <parameter>Fontfile</parameter> is the path to the TrueType font you wish to use. </para> <para> Index: phpdoc/en/functions/imap.xml diff -u phpdoc/en/functions/imap.xml:1.44 phpdoc/en/functions/imap.xml:1.45 --- phpdoc/en/functions/imap.xml:1.44 Sat Jul 7 14:42:29 2001 +++ phpdoc/en/functions/imap.xml Sat Jul 7 17:27:09 2001 @@ -1993,7 +1993,7 @@ echo "&lt;p>&lt;h1>Mailboxes&lt;/h1>\n"; $folders = imap_listmailbox ($mbox, "{your.imap.host:143}", "*"); -if ($folders == &false;) { +if ($folders == false) { echo "Call failed&lt;br>\n"; } else { while (list ($key, $val) = each ($folders)) { @@ -2004,7 +2004,7 @@ echo "&lt;p>&lt;h1>Headers in INBOX&lt;/h1>\n"; $headers = imap_headers ($mbox); -if ($headers == &false;) { +if ($headers == false) { echo "Call failed&lt;br>\n"; } else { while (list ($key,$val) = each ($headers)) { Index: phpdoc/en/functions/info.xml diff -u phpdoc/en/functions/info.xml:1.54 phpdoc/en/functions/info.xml:1.55 --- phpdoc/en/functions/info.xml:1.54 Sat Jul 7 14:42:30 2001 +++ phpdoc/en/functions/info.xml Sat Jul 7 17:27:10 2001 @@ -1493,7 +1493,7 @@ [E_USER_WARNING] =&gt; 512 [E_USER_NOTICE] =&gt; 1024 [E_ALL] =&gt; 2047 - [&true;] =&gt; 1 + [TRUE] =&gt; 1 ) </programlisting> </informalexample> Index: phpdoc/en/functions/ingres_ii.xml diff -u phpdoc/en/functions/ingres_ii.xml:1.3 phpdoc/en/functions/ingres_ii.xml:1.4 --- phpdoc/en/functions/ingres_ii.xml:1.3 Sat Jul 7 14:42:30 2001 +++ phpdoc/en/functions/ingres_ii.xml Sat Jul 7 17:27:10 2001 @@ -462,7 +462,7 @@ <refentry id="function.ingres-field-nullable"> <refnamediv> <refname>ingres_field_nullable</refname> - <refpurpose>Test if a field is &null;able.</refpurpose> + <refpurpose>Test if a field is nullable.</refpurpose> </refnamediv> <refsect1> <title>Description</title> Index: phpdoc/en/functions/java.xml diff -u phpdoc/en/functions/java.xml:1.6 phpdoc/en/functions/java.xml:1.7 --- phpdoc/en/functions/java.xml:1.6 Sat Jul 7 14:42:31 2001 +++ phpdoc/en/functions/java.xml Sat Jul 7 17:27:11 2001 @@ -49,7 +49,7 @@ $frame-&gt;add("North", $button); $frame-&gt;validate(); $frame-&gt;pack(); - $frame-&gt;visible = &true;; + $frame-&gt;visible = True; $thread = new Java("java.lang.Thread"); $thread-&gt;sleep(10000); Index: phpdoc/en/functions/ldap.xml diff -u phpdoc/en/functions/ldap.xml:1.27 phpdoc/en/functions/ldap.xml:1.28 --- phpdoc/en/functions/ldap.xml:1.27 Sat Jul 7 14:42:31 2001 +++ phpdoc/en/functions/ldap.xml Sat Jul 7 17:27:11 2001 @@ -366,9 +366,9 @@ if ($r === -1) { echo "Error: ".ldap_error($ds); - } elseif ($r === &true;) { + } elseif ($r === TRUE) { echo "Password correct."; - } elseif ($r === &false;) { + } elseif ($r === FALSE) { echo "Wrong guess! Password incorrect."; } @@ -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: @@ -1633,8 +1633,8 @@ <programlisting role="php"> // $ds is a valid link identifier for a directory server // control with no value -$ctrl1 = array("oid" => "1.2.752.58.10.1", "iscritical" => &true;); -// iscritical defaults to &false; +$ctrl1 = array("oid" => "1.2.752.58.10.1", "iscritical" => TRUE); +// iscritical defaults to FALSE $ctrl2 = array("oid" => "1.2.752.58.1.10", "value" => "magic"); // try to set both controls if (!ldap_set_option($ds, LDAP_OPT_SERVER_CONTROLS, array($ctrl1, $ctrl2))) Index: phpdoc/en/functions/misc.xml diff -u phpdoc/en/functions/misc.xml:1.49 phpdoc/en/functions/misc.xml:1.50 --- phpdoc/en/functions/misc.xml:1.49 Sat Jul 7 14:42:32 2001 +++ phpdoc/en/functions/misc.xml Sat Jul 7 17:27:11 2001 @@ -178,7 +178,7 @@ echo CONSTANT; // outputs "Hello world." echo Constant; // outputs "Constant" and issues a notice. -define ("GREETING", "Hello you.",&true;); +define ("GREETING", "Hello you.",TRUE); echo GREETING; // outputs "Hello you." echo Greeting; // outputs "Hello you." @@ -424,7 +424,7 @@ <simpara> The information is returned in an object, which will contain various data elements representing, for instance, the browser's - major and minor version numbers and ID string; &true;/&false; values + major and minor version numbers and ID string; &true;/false values for features such as frames, JavaScript, and cookies; and so forth. </simpara> Index: phpdoc/en/functions/msql.xml diff -u phpdoc/en/functions/msql.xml:1.9 phpdoc/en/functions/msql.xml:1.10 --- phpdoc/en/functions/msql.xml:1.9 Sat Jul 7 14:42:33 2001 +++ phpdoc/en/functions/msql.xml Sat Jul 7 17:27:12 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.13 phpdoc/en/functions/mssql.xml:1.14 --- phpdoc/en/functions/mssql.xml:1.13 Sat Jul 7 14:42:33 2001 +++ phpdoc/en/functions/mssql.xml Sat Jul 7 17:27:12 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.51 phpdoc/en/functions/mysql.xml:1.52 --- phpdoc/en/functions/mysql.xml:1.51 Sat Jul 7 14:42:33 2001 +++ phpdoc/en/functions/mysql.xml Sat Jul 7 17:27:12 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.15 phpdoc/en/functions/oracle.xml:1.16 --- phpdoc/en/functions/oracle.xml:1.15 Sat Jul 7 14:42:34 2001 +++ phpdoc/en/functions/oracle.xml Sat Jul 7 17:27:13 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.52 phpdoc/en/functions/pcre.xml:1.53 --- phpdoc/en/functions/pcre.xml:1.52 Sat Jul 7 14:42:35 2001 +++ phpdoc/en/functions/pcre.xml Sat Jul 7 17:27:13 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.59 phpdoc/en/functions/pdf.xml:1.60 --- phpdoc/en/functions/pdf.xml:1.59 Sat Jul 7 14:42:35 2001 +++ phpdoc/en/functions/pdf.xml Sat Jul 7 17:27:13 2001 @@ -315,7 +315,7 @@ exit; }; -pdf_set_parameter($pdf, "warning", "&true;"); +pdf_set_parameter($pdf, "warning", "true"); pdf_set_info($pdf, "Creator", "pdf_clock.php"); pdf_set_info($pdf, "Author", "Uwe Steinmann"); @@ -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.35 phpdoc/en/functions/pgsql.xml:1.36 --- phpdoc/en/functions/pgsql.xml:1.35 Sat Jul 7 14:42:36 2001 +++ phpdoc/en/functions/pgsql.xml Sat Jul 7 17:27:14 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> @@ -1167,7 +1167,7 @@ <refentry id="function.pg-put-line"> <refnamediv> <refname>pg_put_line</refname> - <refpurpose>Send a &null;-terminated string to PostgreSQL backend</refpurpose> + <refpurpose>Send a NULL-terminated string to PostgreSQL backend</refpurpose> </refnamediv> <refsect1> <title>Description</title> @@ -1181,11 +1181,11 @@ </funcprototype> </funcsynopsis> <para> - <function>pg_put_line</function> sends a &null;-terminated string + <function>pg_put_line</function> sends a NULL-terminated string 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; + starting a PostgreSQL copy-operation. That final NULL-character + is added automatically. Returns &true; if successfull, FALSE otherwise. </para> <note> Index: phpdoc/en/functions/printer.xml diff -u phpdoc/en/functions/printer.xml:1.4 phpdoc/en/functions/printer.xml:1.5 --- phpdoc/en/functions/printer.xml:1.4 Sat Jul 7 14:42:37 2001 +++ phpdoc/en/functions/printer.xml Sat Jul 7 17:27:14 2001 @@ -1120,7 +1120,7 @@ printer_start_doc($handle, "My Document"); printer_start_page($handle); -$font = printer_create_font("Arial", 148, 76, PRINTER_FW_MEDIUM, &false;, &false;, &false;, -50); +$font = printer_create_font("Arial", 148, 76, PRINTER_FW_MEDIUM, false, false, false, -50); printer_select_font($handle, $font); printer_draw_text($handle, "PHP is simply cool", 40, 40); printer_delete_font($font); @@ -1393,7 +1393,7 @@ printer_start_doc($handle, "My Document"); printer_start_page($handle); -$font = printer_create_font("Arial",72,48,400,&false;,&false;,&false;,0); +$font = printer_create_font("Arial",72,48,400,false,false,false,0); printer_select_font($handle, $font); printer_draw_text($handle, "test", 10, 10); printer_delete_font($font); Index: phpdoc/en/functions/pspell.xml diff -u phpdoc/en/functions/pspell.xml:1.13 phpdoc/en/functions/pspell.xml:1.14 --- phpdoc/en/functions/pspell.xml:1.13 Sat Jul 7 14:42:37 2001 +++ phpdoc/en/functions/pspell.xml Sat Jul 7 17:27:14 2001 @@ -444,7 +444,7 @@ <title><function>pspell_config_runtogether</function></title> <programlisting role="php"> $pspell_config = pspell_config_create ("en"); -pspell_config_runtogether ($pspell_config, &true;); +pspell_config_runtogether ($pspell_config, true); $pspell_link = pspell_new_config ($pspell_config); pspell_check ($pspell_link, "thecat"); </programlisting> Index: phpdoc/en/functions/regex.xml diff -u phpdoc/en/functions/regex.xml:1.21 phpdoc/en/functions/regex.xml:1.22 --- phpdoc/en/functions/regex.xml:1.21 Sat Jul 7 14:42:38 2001 +++ phpdoc/en/functions/regex.xml Sat Jul 7 17:27:14 2001 @@ -42,19 +42,19 @@ <title>Regular Expression Examples</title> <programlisting role="php"> ereg (&quot;abc&quot;, $string); -/* Returns &true; if &quot;abc&quot; +/* Returns true if &quot;abc&quot; is found anywhere in $string. */ ereg (&quot;^abc&quot;, $string); -/* Returns &true; if &quot;abc&quot; +/* Returns true if &quot;abc&quot; is found at the beginning of $string. */ ereg ("abc$", $string); -/* Returns &true; if &quot;abc&quot; +/* Returns true if &quot;abc&quot; is found at the end of $string. */ eregi ("(ozilla.[23]|MSIE.3)", $HTTP_USER_AGENT); -/* Returns &true; if client browser +/* Returns true if client browser is Netscape 2, 3 or MSIE 3. */ ereg ("([[:alnum:]]+) ([[:alnum:]]+) ([[:alnum:]]+)", $string,$regs); Index: phpdoc/en/functions/satellite.xml diff -u phpdoc/en/functions/satellite.xml:1.8 phpdoc/en/functions/satellite.xml:1.9 --- phpdoc/en/functions/satellite.xml:1.8 Sat Jul 7 15:36:45 2001 +++ phpdoc/en/functions/satellite.xml Sat Jul 7 17:27:15 2001 @@ -1,6 +1,6 @@ <!-- - $Id: satellite.xml,v 1.8 2001/07/07 19:36:45 jeroen Exp $ + $Id: satellite.xml,v 1.9 2001/07/07 21:27:15 jeroen Exp $ Author: David Eriksson <david@2good.com> Index: phpdoc/en/functions/session.xml diff -u phpdoc/en/functions/session.xml:1.45 phpdoc/en/functions/session.xml:1.46 --- phpdoc/en/functions/session.xml:1.45 Sat Jul 7 14:42:39 2001 +++ phpdoc/en/functions/session.xml Sat Jul 7 17:27:15 2001 @@ -851,11 +851,11 @@ $sess_save_path = $save_path; $sess_session_name = $session_name; - return(&true;); + return(true); } function close() { - return(&true;); + return(true); } function read ($id) { @@ -878,7 +878,7 @@ if ($fp = @fopen($sess_file, "w")) { return(fwrite($fp, $sess_data)); } else { - return(&false;); + return(false); } } @@ -895,7 +895,7 @@ * sort of garbage collection routine here. * *********************************************/ function gc ($maxlifetime) { - return &true;; + return true; } session_set_save_handler ("open", "close", "read", "write", "destroy", "gc"); Index: phpdoc/en/functions/snmp.xml diff -u phpdoc/en/functions/snmp.xml:1.9 phpdoc/en/functions/snmp.xml:1.10 --- phpdoc/en/functions/snmp.xml:1.9 Sat Jul 7 14:42:40 2001 +++ phpdoc/en/functions/snmp.xml Sat Jul 7 17:27:15 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/sockets.xml diff -u phpdoc/en/functions/sockets.xml:1.14 phpdoc/en/functions/sockets.xml:1.15 --- phpdoc/en/functions/sockets.xml:1.14 Sat Jul 7 14:42:40 2001 +++ phpdoc/en/functions/sockets.xml Sat Jul 7 17:27:16 2001 @@ -90,9 +90,9 @@ $talkback = "PHP: You said '$buf'.\n"; write ($msgsock, $talkback, strlen ($talkback)); echo "$buf\n"; - } while (&true;); + } while (true); close ($msgsock); -} while (&true;); +} while (true); close ($sock); ?> Index: phpdoc/en/functions/strings.xml diff -u phpdoc/en/functions/strings.xml:1.97 phpdoc/en/functions/strings.xml:1.98 --- phpdoc/en/functions/strings.xml:1.97 Sat Jul 7 14:42:40 2001 +++ phpdoc/en/functions/strings.xml Sat Jul 7 17:27:16 2001 @@ -555,11 +555,11 @@ echo $foo,$bar; // foobarbarbaz // because echo is not a function, following code is invalid. -($some_var) ? echo('&true;'): echo('&false;'); +($some_var) ? echo('true'): echo('false'); // However, the following examples will work: -($some_var) ? print('&true;'): print('&false;'); // print is a function -echo ($some_var) ? '&true;': '&false;'; // changing the statement around +($some_var) ? print('true'): print('false'); // print is a function +echo ($some_var) ? 'true': 'false'; // changing the statement around ?> </programlisting> </example> @@ -2655,7 +2655,7 @@ <programlisting role="php"> // in PHP 4.0b3 and newer: $pos = strpos ($mystring, "b"); -if ($pos === &false;) { // note: three equal signs +if ($pos === false) { // note: three equal signs // not found... } @@ -2828,7 +2828,7 @@ <programlisting role="php"> // in PHP 4.0b3 and newer: $pos = strrpos ($mystring, "b"); -if ($pos === &false;) { // note: three equal signs +if ($pos === false) { // note: three equal signs // not found... } Index: phpdoc/en/functions/uodbc.xml diff -u phpdoc/en/functions/uodbc.xml:1.21 phpdoc/en/functions/uodbc.xml:1.22 --- phpdoc/en/functions/uodbc.xml:1.21 Sat Jul 7 14:42:40 2001 +++ phpdoc/en/functions/uodbc.xml Sat Jul 7 17:27:17 2001 @@ -1106,7 +1106,7 @@ // 1. Option 102 of SQLSetConnectOption() is SQL_AUTOCOMMIT. // Value 1 of SQL_AUTOCOMMIT is SQL_AUTOCOMMIT_ON. // This example has the same effect as -// odbc_autocommit($conn, &true;); +// odbc_autocommit($conn, true); odbc_setoption ($conn, 1, 102, 1); @@ -1180,7 +1180,7 @@ <parameter>name</parameter> are empty strings, then the result set contains a list of valid qualifiers for the data source. (All columns except the TABLE_QUALIFIER column contain - &null;s.) + NULLs.) </simpara> </listitem> <listitem> @@ -1190,7 +1190,7 @@ <parameter>name</parameter> are empty strings, then the result set contains a list of valid owners for the data source. (All columns except the TABLE_OWNER column contain - &null;s.) + NULLs.) </simpara> </listitem> <listitem> @@ -1200,7 +1200,7 @@ <parameter>owner</parameter> and <parameter>name</parameter> are empty strings, then the result set contains a list of valid table types for the data source. (All columns except the - TABLE_TYPE column contain &null;s.) + TABLE_TYPE column contain NULLs.) </simpara> </listitem> </itemizedlist> @@ -1305,7 +1305,7 @@ <listitem><simpara>LENGTH</simpara></listitem> <listitem><simpara>SCALE</simpara></listitem> <listitem><simpara>RADIX</simpara></listitem> - <listitem><simpara>&null;ABLE</simpara></listitem> + <listitem><simpara>NULLABLE</simpara></listitem> <listitem><simpara>REMARKS</simpara></listitem> </itemizedlist> </para> @@ -1409,7 +1409,7 @@ <listitem><simpara>LITERAL_PREFIX</simpara></listitem> <listitem><simpara>LITERAL_SUFFIX</simpara></listitem> <listitem><simpara>CREATE_PARAMS</simpara></listitem> - <listitem><simpara>&null;ABLE</simpara></listitem> + <listitem><simpara>NULLABLE</simpara></listitem> <listitem><simpara>CASE_SENSITIVE</simpara></listitem> <listitem><simpara>SEARCHABLE</simpara></listitem> <listitem><simpara>UNSIGNED_ATTRIBUTE</simpara></listitem> @@ -1614,7 +1614,7 @@ <listitem><simpara>LENGTH</simpara></listitem> <listitem><simpara>SCALE</simpara></listitem> <listitem><simpara>RADIX</simpara></listitem> - <listitem><simpara>&null;ABLE</simpara></listitem> + <listitem><simpara>NULLABLE</simpara></listitem> <listitem><simpara>REMARKS</simpara></listitem> </itemizedlist> </para> @@ -1650,7 +1650,7 @@ <paramdef>string <parameter>owner</parameter></paramdef> <paramdef>string <parameter>table</parameter></paramdef> <paramdef>int <parameter>scope</parameter></paramdef> - <paramdef>int <parameter>&null;able</parameter></paramdef> + <paramdef>int <parameter>nullable</parameter></paramdef> </funcprototype> </funcsynopsis> <simpara> Index: phpdoc/en/functions/var.xml diff -u phpdoc/en/functions/var.xml:1.59 phpdoc/en/functions/var.xml:1.60 --- phpdoc/en/functions/var.xml:1.59 Sat Jul 7 14:42:41 2001 +++ phpdoc/en/functions/var.xml Sat Jul 7 17:27:17 2001 @@ -72,11 +72,11 @@ <programlisting role="php"> $var = 0; -if (empty($var)) { // evaluates &true; +if (empty($var)) { // evaluates true echo '$var is either 0 or not set at all'; } -if (!isset($var)) { // evaluates &false; +if (!isset($var)) { // evaluates false echo '$var is not set at all'; } </programlisting> @@ -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> @@ -836,13 +836,13 @@ <informalexample> <programlisting role="php"> $a = "test"; -echo isset ($a); // &true; +echo isset ($a); // TRUE unset ($a); -echo isset ($a); // &false; +echo isset ($a); // FALSE -$foo = &null;; -print isset ($foo); // &false; +$foo = NULL; +print isset ($foo); // FALSE </programlisting> </informalexample> </para> @@ -1031,7 +1031,7 @@ <title><function>settype</function> example</title> <programlisting role="php"> $foo = "5bar"; // string -$bar = &true;; // boolean +$bar = true; // boolean settype($foo, "integer"); // $foo is now 5 (integer) settype($bar, "string"); // $bar is now "1" (string) @@ -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 @@ -1343,12 +1343,12 @@ */ -$b = 3.1; $c = &true;; +$b = 3.1; $c = TRUE; var_dump($b,$c); /* output: float(3.1) -bool(&true;) +bool(true) */ ?&gt; Index: phpdoc/en/functions/xml.xml diff -u phpdoc/en/functions/xml.xml:1.15 phpdoc/en/functions/xml.xml:1.16 --- phpdoc/en/functions/xml.xml:1.15 Sat Jul 7 14:42:41 2001 +++ phpdoc/en/functions/xml.xml Sat Jul 7 17:27:17 2001 @@ -345,7 +345,7 @@ $xml_parser = xml_parser_create(); // use case-folding so we are sure to find the tag in $map_array -xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, &true;); +xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, true); xml_set_element_handler($xml_parser, "startElement", "endElement"); xml_set_character_data_handler($xml_parser, "characterData"); if (!($fp = fopen($file, "r"))) { @@ -389,9 +389,9 @@ // only trust local files owned by ourselves if (!eregi("^([a-z]+)://", $file) &amp;&amp; fileowner($file) == getmyuid()) { - return &true;; + return true; } - return &false;; + return false; } function startElement($parser, $name, $attribs) { @@ -446,7 +446,7 @@ if (!list($parser, $fp) = new_xml_parser($systemId)) { printf("Could not open entity %s at %s\n", $openEntityNames, $systemId); - return &false;; + return false; } while ($data = fread($fp, 4096)) { if (!xml_parse($parser, $data, feof($fp))) { @@ -454,13 +454,13 @@ xml_error_string(xml_get_error_code($parser)), xml_get_current_line_number($parser), $openEntityNames); xml_parser_free($parser); - return &false;; + return false; } } xml_parser_free($parser); - return &true;; + return true; } - return &false;; + return false; } @@ -476,7 +476,7 @@ xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler"); if (!($fp = @fopen($file, "r"))) { - return &false;; + return false; } if (!is_array($parser_file)) { settype($parser_file, "array"); Index: phpdoc/en/language/basic-syntax.xml diff -u phpdoc/en/language/basic-syntax.xml:1.8 phpdoc/en/language/basic-syntax.xml:1.9 --- phpdoc/en/language/basic-syntax.xml:1.8 Sat Jul 7 14:42:43 2001 +++ phpdoc/en/language/basic-syntax.xml Sat Jul 7 17:27:18 2001 @@ -116,13 +116,13 @@ if ( boolean-expression ) { ?&gt; -&lt;strong&gt;This is &true;.&lt;/strong&gt; +&lt;strong&gt;This is true.&lt;/strong&gt; &lt;?php } else { ?&gt; -&lt;strong&gt;This is &false;.&lt;/strong&gt; +&lt;strong&gt;This is false.&lt;/strong&gt; &lt;?php } </programlisting></example> Index: phpdoc/en/language/control-structures.xml diff -u phpdoc/en/language/control-structures.xml:1.32 phpdoc/en/language/control-structures.xml:1.33 --- phpdoc/en/language/control-structures.xml:1.32 Sat Jul 7 14:42:44 2001 +++ phpdoc/en/language/control-structures.xml Sat Jul 7 17:27:19 2001 @@ -877,7 +877,7 @@ &lt;pre&gt; &lt;?php // A function that records the time when it is called -function profile ($dump = &false;) +function profile ($dump = FALSE) { static $profile; @@ -905,7 +905,7 @@ } // Display the data stored in the profiler -print_r (profile (&true;)); +print_r (profile (TRUE)); ?&gt; &lt;/pre&gt; </programlisting> Index: phpdoc/en/language/expressions.xml diff -u phpdoc/en/language/expressions.xml:1.6 phpdoc/en/language/expressions.xml:1.7 --- phpdoc/en/language/expressions.xml:1.6 Sat Jul 7 14:42:44 2001 +++ phpdoc/en/language/expressions.xml Sat Jul 7 17:27:19 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 &gt; (bigger than), &gt;= (bigger than or equal to), == (equal), != (not equal), &lt; (smaller than) and &lt;= (smaller than or equal to). These expressions are most commonly used Index: phpdoc/en/language/oop.xml diff -u phpdoc/en/language/oop.xml:1.16 phpdoc/en/language/oop.xml:1.17 --- phpdoc/en/language/oop.xml:1.16 Sat Jul 7 14:42:44 2001 +++ phpdoc/en/language/oop.xml Sat Jul 7 17:27:20 2001 @@ -24,9 +24,9 @@ function remove_item ($artnr, $num) { if ($this->items[$artnr] > $num) { $this->items[$artnr] -= $num; - return &true;; + return true; } else { - return &false;; + return false; } } } Index: phpdoc/en/language/types.xml diff -u phpdoc/en/language/types.xml:1.34 phpdoc/en/language/types.xml:1.35 --- phpdoc/en/language/types.xml:1.34 Sat Jul 7 14:42:45 2001 +++ phpdoc/en/language/types.xml Sat Jul 7 17:27:20 2001 @@ -141,7 +141,7 @@ <!-- technically they are just constants --> <informalexample> <programlisting role="php"> -$foo = &true;; // assign the value &true; to $foo +$foo = True; // assign the value TRUE to $foo </programlisting> </informalexample> </para> @@ -159,7 +159,7 @@ } // this is not necessary: -if ($show_separators == &true;) +if ($show_separators == true) { echo "&lt;hr&gt;\n"; } @@ -1146,7 +1146,7 @@ That means that you can write things like this: <informalexample> <programlisting role="php"> -echo $arr[ foo(&true;) ]; +echo $arr[ foo(true) ]; </programlisting> </informalexample> This is an example of using function-output as the array index. @@ -1258,7 +1258,7 @@ $map = array( 'version' =&gt; 4 , 'OS' =&gt; 'Linux' , 'lang' =&gt; 'english' - , 'short_tags' =&gt; &true; + , 'short_tags' =&gt; true ); // strictly numerical keys @@ -1714,7 +1714,7 @@ </para> <note> <simpara> - The &null;-type was introduced in PHP 4 + The null-type was introduced in PHP 4 </simpara> </note> @@ -1726,7 +1726,7 @@ &null;. <informalexample> <programlisting role="php"> -$var = &null;; +$var = Null; </programlisting> </informalexample> </para> Index: phpdoc/en/pear/pear.xml diff -u phpdoc/en/pear/pear.xml:1.4 phpdoc/en/pear/pear.xml:1.5 --- phpdoc/en/pear/pear.xml:1.4 Sat Jul 7 14:42:46 2001 +++ phpdoc/en/pear/pear.xml Sat Jul 7 17:27:20 2001 @@ -54,7 +54,7 @@ <title>PEAR Error Handling</title> <simpara> PEAR's base class also provides a way of passing around more - complex errors than a &true;/&false; value or a numeric code. A + complex errors than a &true;/false value or a numeric code. A PEAR error is an object that is either an instance of the class <classname>PEAR_Error</classname>, or some class inheriting <classname>PEAR_Error</classname>. Index: phpdoc/en/pear/standards.xml diff -u phpdoc/en/pear/standards.xml:1.5 phpdoc/en/pear/standards.xml:1.6 --- phpdoc/en/pear/standards.xml:1.5 Sat Jul 7 14:42:46 2001 +++ phpdoc/en/pear/standards.xml Sat Jul 7 17:27:21 2001 @@ -123,7 +123,7 @@ Always attempt to return a meaningful value from a function if one is appropriate. Here is a slightly longer example: <programlisting role="php"> -function connect(&amp;$dsn, $persistent = &false;) +function connect(&amp;$dsn, $persistent = false) { if (is_array($dsn)) { $dsninfo = &amp;$dsn; @@ -135,7 +135,7 @@ return $this->raiseError(); } - return &true;; + return true; } </programlisting> </para>
« previous php.doc (#969335929) next »