cvs: phpdoc(dev_docbook4) /en/functions array.xml aspell.xml ccvs.xml domxml.xml image.xml java.xml ming.xml misc.xml msql.xml mysql.xml nis.xml
pgsql.xml pspell.xml session.xml shmop.xml strings.xml uodbc.xml var.xml yaz.xml /en/pear about.xml pear.xml standards.xml
| From: | Hartmut Holzgraefe | Date: | Mon, 12 Nov 2001 02:04:40 +0000 |
| Subject: | cvs: phpdoc(dev_docbook4) /en/functions array.xml aspell.xml ccvs.xml domxml.xml image.xml java.xml ming.xml misc.xml msql.xml mysql.xml nis.xml pgsql.xml pspell.xml session.xml shmop.xml strings.xml uodbc.xml var.xml yaz.xml /en/pear about.xml pear.xml standards.xml |
||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969338745@lists.php.net to get a copy of this message | ||
hholzgra Sun Nov 11 21:04:40 2001 EDT
Modified files: (Branch: dev_docbook4)
/phpdoc/en/functions array.xml aspell.xml ccvs.xml domxml.xml
image.xml java.xml ming.xml misc.xml msql.xml
mysql.xml nis.xml pgsql.xml pspell.xml
session.xml shmop.xml strings.xml uodbc.xml
var.xml yaz.xml
/phpdoc/en/pear about.xml pear.xml standards.xml
Log:
improved auto-conversion results
Index: phpdoc/en/functions/array.xml diff -u phpdoc/en/functions/array.xml:1.112.2.1 phpdoc/en/functions/array.xml:1.112.2.2 --- phpdoc/en/functions/array.xml:1.112.2.1 Sun Nov 11 20:08:47 2001 +++ phpdoc/en/functions/array.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.112.2.1 $ --> +<!-- $Revision: 1.112.2.2 $ --> <reference id="ref.array"> <title>Array Functions</title> <titleabbrev>Arrays</titleabbrev> @@ -292,16 +292,20 @@ <literal>(string) $elem1 === (string) $elem2</literal>. In words: when the string representation is the same. + <!-- TODO: example of it... --> + </simpara> </note> <warning> <simpara> This was broken in PHP 4.0.4! + <!-- TODO: when exactly was this broken?... --> + </simpara> </warning> <para> @@ -505,16 +509,20 @@ <literal>(string) $elem1 === (string) $elem2</literal>. In words: when the string representation is the same. + <!-- TODO: example of it... --> + </simpara> </note> <warning> <simpara> This was broken in PHP 4.0.4! + <!-- TODO: when exactly was this broken?... --> + </simpara> </warning> <para> @@ -1535,8 +1543,10 @@ <literal>(string) $elem1 === (string) $elem2</literal>. In words: when the string representation is the same. + <!-- TODO: example of it... --> + </simpara> <simpara> The first element will be used. @@ -1546,8 +1556,10 @@ <simpara> This was broken in PHP 4.0.4! + <!-- TODO: when exactly was this broken?... --> + </simpara> </warning> <para> @@ -1997,7 +2009,9 @@ <title><function>count</function> example</title> <programlisting role="php"> + <!-- TODO: examples about count(null), count(false), count(object).. --> + $a[0] = 1; $a[1] = 3; Index: phpdoc/en/functions/aspell.xml diff -u phpdoc/en/functions/aspell.xml:1.17.2.1 phpdoc/en/functions/aspell.xml:1.17.2.2 --- phpdoc/en/functions/aspell.xml:1.17.2.1 Sun Nov 11 20:08:48 2001 +++ phpdoc/en/functions/aspell.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.17.2.1 $ --> +<!-- $Revision: 1.17.2.2 $ --> <reference id="ref.aspell"> <title>Aspell functions [deprecated]</title> <titleabbrev>Aspell</titleabbrev> @@ -38,7 +38,9 @@ </methodsynopsis> + <!-- TODO: personal??? --> + <simpara> <function>aspell_new</function> opens up a new dictionary and Index: phpdoc/en/functions/ccvs.xml diff -u phpdoc/en/functions/ccvs.xml:1.7.2.1 phpdoc/en/functions/ccvs.xml:1.7.2.2 --- phpdoc/en/functions/ccvs.xml:1.7.2.1 Sun Nov 11 20:08:48 2001 +++ phpdoc/en/functions/ccvs.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.7.2.1 $ --> +<!-- $Revision: 1.7.2.2 $ --> <!-- CCVS Documentation by Brendan W. McAdams <brendan@plexmedia.com> @@ -62,8 +62,8 @@ <title/> <methodsynopsis> - <type></type><methodname/> - <methodparam><type></type><parameter/></methodparam> + <type/><methodname/> + <methodparam><type/><parameter/></methodparam> </methodsynopsis> </refsect1> Index: phpdoc/en/functions/domxml.xml diff -u phpdoc/en/functions/domxml.xml:1.24.2.1 phpdoc/en/functions/domxml.xml:1.24.2.2 --- phpdoc/en/functions/domxml.xml:1.24.2.1 Sun Nov 11 20:08:48 2001 +++ phpdoc/en/functions/domxml.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.24.2.1 $ --> +<!-- $Revision: 1.24.2.2 $ --> <reference id="ref.domxml"> <title>DOM XML functions</title> <titleabbrev>DOM XML</titleabbrev> @@ -349,9 +349,12 @@ </partintro> + <!-- class Dom document --> + + <!-- has member functions array root([int doc_handle]) returns array of root nodes of this document. Array @@ -384,7 +387,9 @@ --> + + <!-- class Dom node object lastchild([int node]) returns Dom node object @@ -412,20 +417,27 @@ --> + + <!-- class Dom Attribute name --> + + <!-- class Dom Namespace --> + + <!-- class Dtd --> + <refentry id="function.xmldoc"> Index: phpdoc/en/functions/image.xml diff -u phpdoc/en/functions/image.xml:1.60.2.1 phpdoc/en/functions/image.xml:1.60.2.2 --- phpdoc/en/functions/image.xml:1.60.2.1 Sun Nov 11 20:08:50 2001 +++ phpdoc/en/functions/image.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.60.2.1 $ --> +<!-- $Revision: 1.60.2.2 $ --> <reference id="ref.image"> <title>Image functions</title> <titleabbrev>Image</titleabbrev> @@ -1992,6 +1992,7 @@ </refentry> + <!-- The function in t1lib which this function uses seems to be buggy... Currently, just comment out everywhere in the docs and source until time permits to find a solution. @@ -2037,6 +2038,7 @@ </refsect1> </refentry> --> + <refentry id="function.imagepsencodefont"> Index: phpdoc/en/functions/java.xml diff -u phpdoc/en/functions/java.xml:1.13.2.1 phpdoc/en/functions/java.xml:1.13.2.2 --- phpdoc/en/functions/java.xml:1.13.2.1 Sun Nov 11 20:08:51 2001 +++ phpdoc/en/functions/java.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.13.2.1 $ --> +<!-- $Revision: 1.13.2.2 $ --> <reference id="ref.java"> <title>Java</title> <titleabbrev>PHP / Java Integration</titleabbrev> @@ -118,8 +118,10 @@ possibly with a loss of data (example: double precision floating point numbers will be converted to boolean). + <!-- FIXME Why aren't java-doubles converted to PHP-floats? Is this correct? --> + </simpara> </listitem> Index: phpdoc/en/functions/ming.xml diff -u phpdoc/en/functions/ming.xml:1.26.2.1 phpdoc/en/functions/ming.xml:1.26.2.2 --- phpdoc/en/functions/ming.xml:1.26.2.1 Sun Nov 11 20:08:52 2001 +++ phpdoc/en/functions/ming.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.26.2.1 $ --> +<!-- $Revision: 1.26.2.2 $ --> <reference id="ref.ming"> <title>Ming functions for Flash</title> <titleabbrev>Ming (flash)</titleabbrev> @@ -164,9 +164,11 @@ </partintro> + <!-- SWFMovie --> + <refentry id="function.swfmovie"> <refnamediv> <refname>SWFMovie</refname> @@ -494,9 +496,11 @@ </refentry> + <!-- SWFDisplayItem --> + <refentry id="function.swfdisplayitem"> <refnamediv> <refname>SWFDisplayItem</refname> @@ -1222,9 +1226,11 @@ </refentry> + <!-- SWFShape --> + <refentry id="function.swfshape"> <refnamediv> <refname>SWFShape</refname> @@ -1779,8 +1785,10 @@ </refentry> + <!-- SWFGradient --> + <refentry id="function.swfgradient"> <refnamediv> @@ -1893,8 +1901,10 @@ </refentry> + <!-- SWFBitmap --> + <refentry id="function.swfbitmap"> <refnamediv> @@ -2062,8 +2072,10 @@ </refentry> + <!-- SWFFill --> + <refentry id="function.swffill"> <refnamediv> @@ -2196,8 +2208,10 @@ </refentry> + <!-- SWFMorph --> + <refentry id="function.swfmorph"> <refnamediv> @@ -2330,8 +2344,10 @@ </refentry> + <!-- SWFText --> + <refentry id="function.swftext"> <refnamediv> @@ -2548,8 +2564,10 @@ </refentry> + <!-- SWFFont --> + <refentry id="function.swffont"> <refnamediv> @@ -2624,8 +2642,10 @@ </refentry> + <!-- SWFTextField --> + <refentry id="function.swftextfield"> <refnamediv> @@ -2967,8 +2987,10 @@ </refentry> + <!-- SWFSprite --> + <refentry id="function.swfsprite"> <refnamediv> @@ -3134,8 +3156,10 @@ </refentry> + <!-- SWFButton --> + <refentry id="function.swfbutton"> <refnamediv> @@ -3486,7 +3510,9 @@ </refentry> + <!-- SWFAction --> + <refentry id="function.swfaction"> Index: phpdoc/en/functions/misc.xml diff -u phpdoc/en/functions/misc.xml:1.59.2.1 phpdoc/en/functions/misc.xml:1.59.2.2 --- phpdoc/en/functions/misc.xml:1.59.2.1 Sun Nov 11 20:08:52 2001 +++ phpdoc/en/functions/misc.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.59.2.1 $ --> +<!-- $Revision: 1.59.2.2 $ --> <reference id="ref.misc"> <title>Miscellaneous functions</title> <titleabbrev>Misc.</titleabbrev> @@ -76,10 +76,12 @@ as of 4.0.5. </simpara> + <!-- so it's quite late to declare it 'deprecated' by now :) TODO: correct connection handling. Any volunteers? --> + </warning> <simpara> @@ -362,7 +364,9 @@ ?> </programlisting> + <!-- TODO: example with integer exit-statis --> + </example> </para> Index: phpdoc/en/functions/msql.xml diff -u phpdoc/en/functions/msql.xml:1.16.2.1 phpdoc/en/functions/msql.xml:1.16.2.2 --- phpdoc/en/functions/msql.xml:1.16.2.1 Sun Nov 11 20:08:53 2001 +++ phpdoc/en/functions/msql.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.16.2.1 $ --> +<!-- $Revision: 1.16.2.2 $ --> <reference id="ref.msql"> <title>mSQL functions</title> <titleabbrev>mSQL</titleabbrev> @@ -308,7 +308,7 @@ <methodsynopsis> <type>string</type><methodname>msql_error</methodname> - <methodparam><type></type><parameter/></methodparam> + <methodparam><type/><parameter/></methodparam> </methodsynopsis> <para> Index: phpdoc/en/functions/mysql.xml diff -u phpdoc/en/functions/mysql.xml:1.67.2.1 phpdoc/en/functions/mysql.xml:1.67.2.2 --- phpdoc/en/functions/mysql.xml:1.67.2.1 Sun Nov 11 20:08:53 2001 +++ phpdoc/en/functions/mysql.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.67.2.1 $ --> +<!-- $Revision: 1.67.2.2 $ --> <reference id="ref.mysql"> <title>MySQL Functions</title> <titleabbrev>MySQL</titleabbrev> @@ -151,12 +151,16 @@ </para> + <!-- what is returned? bool -> succes/failure i suppose? --> + + <!-- in PHP 3 int and in PHP 4 bool --> + <note> <para> This function was introduced in PHP 3.0.13 and requires MySQL @@ -324,8 +328,10 @@ identifier. </para> + <!-- returns?? bool -> succes? --> + <example> <title>MySQL create database example</title> <programlisting role="php"> @@ -1329,12 +1335,16 @@ that return large result sets. All associated result memory is automatically freed at the end of the script's execution. + <!-- TODO and as of PHP4 before, see freeing resources --> + </para> + <!-- returns?? --> + <para> For downward compatibility <function>mysql_freeresult</function> can also be used. @@ -1485,6 +1495,7 @@ <function>mysql_field_type</function>. </para> + <!-- this is very outdated, and now incorrect <para> @@ -1495,6 +1506,7 @@ will also be printed out. </para> --> + <para> <example> <title><function>mysql_list_fields</function> example</title> @@ -1526,11 +1538,13 @@ can also be used. </para> + <!-- TODO: this is equiv. with 'select * from $table where &false;,' which implies you can better use the field-research functions on a real query, that saves you one mysql-query. --> + </refsect1> </refentry> @@ -1693,7 +1707,9 @@ </para> + <!-- TODO move the story to features.persistent, and refer to that --> + <para> <function>mysql_pconnect</function> acts very much like Index: phpdoc/en/functions/nis.xml diff -u phpdoc/en/functions/nis.xml:1.17.2.1 phpdoc/en/functions/nis.xml:1.17.2.2 --- phpdoc/en/functions/nis.xml:1.17.2.1 Sun Nov 11 20:08:53 2001 +++ phpdoc/en/functions/nis.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.17.2.1 $ --> +<!-- $Revision: 1.17.2.2 $ --> <reference id="ref.nis"> <title>YP/NIS Functions</title> <titleabbrev>YP/NIS</titleabbrev> @@ -54,6 +54,7 @@ </example> </para> + <!-- <para> See also: <link linkend="function.yp-errno">yp_errno</link> and @@ -61,6 +62,7 @@ </para> --> + </refsect1> </refentry> @@ -96,11 +98,13 @@ <para> See also <function>yp-get-default-domain</function>. + <!-- linkend="function.yp-errno">yp_errno</link> and <link linkend="function.yp-err-string">yp_err_string</link> --> + </para> </refsect1> </refentry> @@ -139,11 +143,13 @@ <para> See also <function>yp-get-default-domain</function>. + <!-- linkend="function.yp-errno">yp_errno</link> and <link linkend="function.yp-err-string">yp_err_string</link> --> + </para> </refsect1> </refentry> @@ -185,11 +191,13 @@ <para> See also <function>yp-get-default-domain</function> + <!-- linkend="function.yp-errno">yp_errno</link> and <link linkend="function.yp-err-string">yp_err_string</link> --> + </para> </refsect1> </refentry> @@ -230,11 +238,13 @@ <para> See also <function>yp-get-default-domain</function> + <!-- <link linkend="function.yp-errno">yp_errno</link> and <link linkend="function.yp-err-string">yp_err_string</link> --> + </para> </refsect1> </refentry> @@ -269,8 +279,10 @@ if (!$entry) { echo "No more entries found\n"; + <!-- echo yp_errno() . ": " . yp_err_string(); --> + } $key = key ($entry); @@ -284,16 +296,19 @@ <para> See also <function>yp-get-default-domain</function>. + <!-- <link linkend="function.yp-errno">yp_errno</link> and <link linkend="function.yp-err-string">yp_err_string</link> --> + </para> </refsect1> </refentry> + <!-- Function doesn't exist <refentry id="function.yp-errno"> @@ -348,6 +363,8 @@ + + <!-- Function doesn't exist <refentry id="function.yp-err-string"> @@ -387,6 +404,7 @@ </refentry> --> + </reference> Index: phpdoc/en/functions/pgsql.xml diff -u phpdoc/en/functions/pgsql.xml:1.47.2.1 phpdoc/en/functions/pgsql.xml:1.47.2.2 --- phpdoc/en/functions/pgsql.xml:1.47.2.1 Sun Nov 11 20:08:54 2001 +++ phpdoc/en/functions/pgsql.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.47.2.1 $ --> +<!-- $Revision: 1.47.2.2 $ --> <reference id="ref.pgsql"> <title>PostgreSQL functions</title> <titleabbrev>PostgreSQL</titleabbrev> @@ -43,8 +43,10 @@ <row> <entry>postmaster -i &</entry> + <!-- <entry>pg_connect("", "", "", "", "dbname");</entry> --> + <entry>pg_connect("dbname=MyDbName");</entry> <entry>OK</entry> </row> @@ -1231,7 +1233,9 @@ directly supported here. All forms of <type>integer</type>, <type>boolean</type> and void + <!-- FIXME: is that still true? PHP supports boolean&null now... --> + types are returned as <type>integer</type> values. All forms of float, and Index: phpdoc/en/functions/pspell.xml diff -u phpdoc/en/functions/pspell.xml:1.20.2.1 phpdoc/en/functions/pspell.xml:1.20.2.2 --- phpdoc/en/functions/pspell.xml:1.20.2.1 Sun Nov 11 20:08:54 2001 +++ phpdoc/en/functions/pspell.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.20.2.1 $ --> +<!-- $Revision: 1.20.2.2 $ --> <!-- pspell currently (2001-08-14) doesn't use resources --> <reference id="ref.pspell"> @@ -494,7 +494,9 @@ <type>int</type><methodname>pspell_new</methodname> + <!-- not yet resource... --> + <methodparam><type>string</type><parameter>language</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter> Index: phpdoc/en/functions/session.xml diff -u phpdoc/en/functions/session.xml:1.55.2.1 phpdoc/en/functions/session.xml:1.55.2.2 --- phpdoc/en/functions/session.xml:1.55.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/session.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.55.2.1 $ --> +<!-- $Revision: 1.55.2.2 $ --> <reference id="ref.session"> <title>Session handling functions</title> <titleabbrev>Sessions</titleabbrev> @@ -975,16 +975,19 @@ to session variables are done. </para> + <!-- commented out until final decision on implementation <para> See also: <function>session_readonly</function>. </para> --> + </refsect1> </refentry> + <!-- commented out until final decision on implementation <refentry id="function.session-readonly"> <refnamediv> @@ -1006,6 +1009,7 @@ </refsect1> </refentry> --> + </reference> <!-- Keep this comment at the end of the file Index: phpdoc/en/functions/shmop.xml diff -u phpdoc/en/functions/shmop.xml:1.9.2.1 phpdoc/en/functions/shmop.xml:1.9.2.2 --- phpdoc/en/functions/shmop.xml:1.9.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/shmop.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.9.2.1 $ --> +<!-- $Revision: 1.9.2.2 $ --> <reference id="ref.shmop"> <title>Shared Memory Functions</title> <titleabbrev>shmop</titleabbrev> @@ -17,8 +17,10 @@ In PHP 4.0.3, there functions were prefixed by <literal>shm</literal> rather than <literal>shmop</literal>. + <!-- TODO: do the old shm_* funcs still work, i.e. are they still aliased? --> + </simpara> </note> Index: phpdoc/en/functions/strings.xml diff -u phpdoc/en/functions/strings.xml:1.122.2.1 phpdoc/en/functions/strings.xml:1.122.2.2 --- phpdoc/en/functions/strings.xml:1.122.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/strings.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.122.2.1 $ --> +<!-- $Revision: 1.122.2.2 $ --> <reference id="ref.strings"> <title>String functions</title> <titleabbrev>Strings</titleabbrev> @@ -324,7 +324,7 @@ <type>mixed</type><methodname>count_chars</methodname> <methodparam><type>string</type><parameter>string</parameter></methodparam> - <methodparam choice="opt"><type></type><parameter> + <methodparam choice="opt"><type/><parameter> mode </parameter></methodparam> @@ -1347,8 +1347,10 @@ </refentry> + <!-- this section is nearly-identical to trim, ltrim and rtrim --> + <refentry id="function.ltrim"> <refnamediv> <refname>ltrim</refname> @@ -1376,8 +1378,10 @@ Without the second parameter, <function>ltrim</function> will strip these characters: + <!-- sorted by importance. Printed 3 times: trim, ltrim, rtrim --> + <itemizedlist> <listitem> <simpara> @@ -1411,8 +1415,10 @@ </listitem> <listitem> <simpara> + <!-- not \v, since not supported by PHP --> + "\x0B" (<acronym>ASCII</acronym> <literal>11</literal> (<literal>0x0B</literal>)), a vertical tab. </simpara> @@ -1721,8 +1727,10 @@ </refentry> + <!-- this section is nearly-identical to trim, ltrim and rtrim --> + <refentry id="function.rtrim"> <refnamediv> <refname>rtrim</refname> @@ -1750,8 +1758,10 @@ Without the second parameter, <function>rtrim</function> will strip these characters: + <!-- sorted by importance. Printed 3 times: trim, ltrim, rtrim --> + <itemizedlist> <listitem> <simpara> @@ -1785,8 +1795,10 @@ </listitem> <listitem> <simpara> + <!-- not \v, since not supported by PHP --> + "\x0B" (<acronym>ASCII</acronym> <literal>11</literal> (<literal>0x0B</literal>)), a vertical tab. </simpara> @@ -3603,8 +3615,10 @@ </refentry> + <!-- this section is nearly-identical to trim, ltrim and rtrim --> + <refentry id="function.trim"> <refnamediv> <refname>trim</refname> @@ -3632,8 +3646,10 @@ Without the second parameter, <function>trim</function> will strip these characters: + <!-- sorted by importance. Printed 3 times: trim, ltrim, rtrim --> + <itemizedlist> <listitem> <simpara> @@ -3667,7 +3683,9 @@ </listitem> <listitem> <simpara> + <!-- not \v, since not supported by PHP --> + "\x0B" (<acronym>ASCII</acronym> <literal>11</literal> (<literal>0x0B</literal>)), a vertical tab. Index: phpdoc/en/functions/uodbc.xml diff -u phpdoc/en/functions/uodbc.xml:1.26.2.1 phpdoc/en/functions/uodbc.xml:1.26.2.2 --- phpdoc/en/functions/uodbc.xml:1.26.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/uodbc.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.26.2.1 $ --> +<!-- $Revision: 1.26.2.2 $ --> <reference id="ref.odbc"> <title>Unified ODBC functions</title> <titleabbrev>ODBC</titleabbrev> @@ -17,6 +17,7 @@ functions: <ulink url="&url.adabas;">Adabas D</ulink>, <ulink url="&url.ibmdb2;">IBM DB2</ulink>, <ulink url="&url.iodbc;">iODBC</ulink>, <ulink url="&url.solid;">Solid</ulink>, and <ulink url="&url.sybase;">Sybase SQL Anywhere</ulink>. </simpara> + <!-- install.xml has changed, so this link is no longer working <simpara> Please see the <link @@ -26,6 +27,7 @@ </simpara> --> + <note> <simpara> There is no ODBC involved when connecting to the above @@ -980,6 +982,7 @@ <function>odbc_longreadlen</function>. + <!-- If the requested field contains @@ -990,6 +993,7 @@ retrieve the field in hexadecimal notation. E.g. "SELECT HEX(binary_col) FROM mytable" --> + </para> Index: phpdoc/en/functions/var.xml diff -u phpdoc/en/functions/var.xml:1.74.2.1 phpdoc/en/functions/var.xml:1.74.2.2 --- phpdoc/en/functions/var.xml:1.74.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/var.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.74.2.1 $ --> +<!-- $Revision: 1.74.2.2 $ --> <reference id="ref.var"> <title>Variable Functions</title> <titleabbrev>Variables</titleabbrev> @@ -52,10 +52,12 @@ </para> + <!-- Returns &false; if <parameter>var</parameter> is set and has a non-empty or non-zero value; &true; otherwise. --> + <informalexample> <programlisting role="php"> $var = 0; @@ -76,8 +78,10 @@ no meaning since it would be checking whether something which isn't a variable is a variable with a &false; value. + <!-- will even result in parse error (at least in PHP 4) --> + </simpara> <simpara> See also <function>isset</function> and @@ -144,8 +148,10 @@ Never use <function>gettype</function> to test for a certain type, since the returned string may be subject to change in a future version. In addition, it is slow too, as it involves string comparision + <!-- where's my dictionary? --> + . </simpara> <simpara> @@ -186,7 +192,9 @@ </listitem> <listitem> <simpara>"unknown type" + <!-- someone's joking? --> + </simpara> </listitem> </itemizedlist> @@ -653,9 +661,11 @@ <informalexample> <programlisting role="php"> + <!-- TODO: better example, this one can be quite misleading for unexperienced programmers --> + function show_var($var) { if (is_scalar($var)) echo $var; @@ -874,6 +884,7 @@ are <function>serialize</function>ing will also be stored. </simpara> + <!-- TODO in 4.0.4pl1 this didn't work properly, however, there been some fixes. I don't know whether this all @@ -886,6 +897,7 @@ </note> </simpara> --> + <note> <para> Index: phpdoc/en/functions/yaz.xml diff -u phpdoc/en/functions/yaz.xml:1.21.2.1 phpdoc/en/functions/yaz.xml:1.21.2.2 --- phpdoc/en/functions/yaz.xml:1.21.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/yaz.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.21.2.1 $ --> +<!-- $Revision: 1.21.2.2 $ --> <reference id="ref.yaz"> <title>YAZ functions</title> <titleabbrev>YAZ</titleabbrev> @@ -923,7 +923,7 @@ <methodsynopsis> <type>int</type><methodname>yaz_wait</methodname> - <methodparam choice="opt"><type></type><parameter>array options</parameter></methodparam> + <methodparam choice="opt"><type/><parameter>array options</parameter></methodparam> </methodsynopsis> <para> Index: phpdoc/en/pear/about.xml diff -u phpdoc/en/pear/about.xml:1.6 phpdoc/en/pear/about.xml:1.6.2.1 --- phpdoc/en/pear/about.xml:1.6 Sat Nov 10 16:49:43 2001 +++ phpdoc/en/pear/about.xml Sun Nov 11 21:04:38 2001 @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> - <chapter id="pear.about"> +<?xml version="1.0" encoding="UTF-8"?> +<!-- $Revision: 1.6.2.1 $ --> +<chapter id="pear.about"> <title>About PEAR</title> <simpara> PEAR is dedicated to Malin Bakken, Index: phpdoc/en/pear/pear.xml diff -u phpdoc/en/pear/pear.xml:1.11 phpdoc/en/pear/pear.xml:1.11.2.1 --- phpdoc/en/pear/pear.xml:1.11 Sat Nov 10 16:49:43 2001 +++ phpdoc/en/pear/pear.xml Sun Nov 11 21:04:38 2001 @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> - <reference id="pear.reference"> +<?xml version="1.0" encoding="UTF-8"?> +<!-- $Revision: 1.11.2.1 $ --> +<reference id="pear.reference"> <title>PEAR Reference Manual</title> <titleabbrev>PEAR</titleabbrev> @@ -50,8 +50,7 @@ when the request is over. This is not a destructor in the sense that you can "delete" an object and have the destructor called, but in the sense that PHP gives you a callback in the object - when PHP is done executing. See <link - linkend="example.pear.destructors">the example</link> below. + when PHP is done executing. See <link linkend="example.pear.destructors">the example</link> below. </simpara> <para> <warning id="pear.destructors.warning"> @@ -99,8 +98,7 @@ <classname>PEAR_Error</classname>'s constructor, but all of the parameters are optional, and you can set up defaults for errors generated from each object based on the - <classname>PEAR</classname> class. See the <link - linkend="example.pear.error1">PEAR error examples</link> for how + <classname>PEAR</classname> class. See the <link linkend="example.pear.error1">PEAR error examples</link> for how to use it and the <classname>PEAR_Error</classname> reference for the full details. </simpara> @@ -174,8 +172,7 @@ when PHP is used in command-line mode. Bummer. </simpara> <simpara> - Also, see the <link - linkend="pear.destructors.warning">warning</link> about how to + Also, see the <link linkend="pear.destructors.warning">warning</link> about how to instantiate objects if you want to use the destructor. </simpara> </note> @@ -359,12 +356,12 @@ <title>Methods</title> <refsect2 id="function.pear.pear"> <title>PEAR::PEAR</title> - <funcsynopsis> - <funcprototype> - <funcdef>PEAR()</funcdef> + + <methodsynopsis> + <type>PEAR()</type> <void/> - </funcprototype> - </funcsynopsis> + </methodsynopsis> + <para> This is the PEAR class constructor. Call it from the constructor of every class inheriting the PEAR class. @@ -387,12 +384,12 @@ </refsect2> <refsect2 id="function.pear.-pear"> <title>PEAR::_PEAR</title> - <funcsynopsis> - <funcprototype> - <funcdef>_PEAR()</funcdef> + + <methodsynopsis> + <type>_PEAR()</type> <void/> - </funcprototype> - </funcsynopsis> + </methodsynopsis> + <para> This is the PEAR class destructor. It is called during request shutdown. @@ -466,22 +463,16 @@ </refsect1> <refsect1> <title>Properties</title> - <simpara></simpara> + <simpara/> </refsect1> <refsect1> <title>Methods</title> - <funcsynopsis> - <funcprototype> - <funcdef><function>PEAR_Error::PEAR_Error</function></funcdef> - <paramdef> - <parameter><optional>message</optional></parameter> - <parameter><optional>code</optional></parameter> - <parameter><optional>mode</optional></parameter> - <parameter><optional>options</optional></parameter> - <parameter><optional>userinfo</optional></parameter> - </paramdef> - </funcprototype> - </funcsynopsis> + + <methodsynopsis> + <methodname>PEAR_Error::PEAR_Error</methodname> + <methodparam choice="opt"><type></type><parameter>message</parameter><parameter>code</parameter><parameter>mode</parameter><parameter>options</parameter><parameter>userinfo</parameter></methodparam> + </methodsynopsis> + <refsect2> <title>Description</title> <para> @@ -507,8 +498,7 @@ <term>mode</term> <listitem> <simpara> - Mode of operation. See the <link - linkend="pear.error-modes">error modes</link> section for + Mode of operation. See the <link linkend="pear.error-modes">error modes</link> section for details. </simpara> </listitem> Index: phpdoc/en/pear/standards.xml diff -u phpdoc/en/pear/standards.xml:1.14 phpdoc/en/pear/standards.xml:1.14.2.1 --- phpdoc/en/pear/standards.xml:1.14 Sat Nov 10 16:49:43 2001 +++ phpdoc/en/pear/standards.xml Sun Nov 11 21:04:39 2001 @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.14 $ --> - <chapter id="pear.standards"> +<?xml version="1.0" encoding="UTF-8"?> +<!-- $Revision: 1.14.2.1 $ --> +<chapter id="pear.standards"> <title>PEAR Coding Standards</title> <note> <simpara> @@ -249,6 +249,7 @@ Include the $Id$ CVS keyword in each file. As each file is edited, add this tag if it's not yet present (or replace existing forms such as "Last Modified:", etc.). + <!-- <note> <simpara> @@ -259,6 +260,7 @@ </simpara> </note> --> + </para> <para> The rest of this section assumes that you have basic knowledge
Index: phpdoc/en/functions/array.xml diff -u phpdoc/en/functions/array.xml:1.112.2.1 phpdoc/en/functions/array.xml:1.112.2.2 --- phpdoc/en/functions/array.xml:1.112.2.1 Sun Nov 11 20:08:47 2001 +++ phpdoc/en/functions/array.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.112.2.1 $ --> +<!-- $Revision: 1.112.2.2 $ --> <reference id="ref.array"> <title>Array Functions</title> <titleabbrev>Arrays</titleabbrev> @@ -292,16 +292,20 @@ <literal>(string) $elem1 === (string) $elem2</literal>. In words: when the string representation is the same. + <!-- TODO: example of it... --> + </simpara> </note> <warning> <simpara> This was broken in PHP 4.0.4! + <!-- TODO: when exactly was this broken?... --> + </simpara> </warning> <para> @@ -505,16 +509,20 @@ <literal>(string) $elem1 === (string) $elem2</literal>. In words: when the string representation is the same. + <!-- TODO: example of it... --> + </simpara> </note> <warning> <simpara> This was broken in PHP 4.0.4! + <!-- TODO: when exactly was this broken?... --> + </simpara> </warning> <para> @@ -1535,8 +1543,10 @@ <literal>(string) $elem1 === (string) $elem2</literal>. In words: when the string representation is the same. + <!-- TODO: example of it... --> + </simpara> <simpara> The first element will be used. @@ -1546,8 +1556,10 @@ <simpara> This was broken in PHP 4.0.4! + <!-- TODO: when exactly was this broken?... --> + </simpara> </warning> <para> @@ -1997,7 +2009,9 @@ <title><function>count</function> example</title> <programlisting role="php"> + <!-- TODO: examples about count(null), count(false), count(object).. --> + $a[0] = 1; $a[1] = 3; Index: phpdoc/en/functions/aspell.xml diff -u phpdoc/en/functions/aspell.xml:1.17.2.1 phpdoc/en/functions/aspell.xml:1.17.2.2 --- phpdoc/en/functions/aspell.xml:1.17.2.1 Sun Nov 11 20:08:48 2001 +++ phpdoc/en/functions/aspell.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.17.2.1 $ --> +<!-- $Revision: 1.17.2.2 $ --> <reference id="ref.aspell"> <title>Aspell functions [deprecated]</title> <titleabbrev>Aspell</titleabbrev> @@ -38,7 +38,9 @@ </methodsynopsis> + <!-- TODO: personal??? --> + <simpara> <function>aspell_new</function> opens up a new dictionary and Index: phpdoc/en/functions/ccvs.xml diff -u phpdoc/en/functions/ccvs.xml:1.7.2.1 phpdoc/en/functions/ccvs.xml:1.7.2.2 --- phpdoc/en/functions/ccvs.xml:1.7.2.1 Sun Nov 11 20:08:48 2001 +++ phpdoc/en/functions/ccvs.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.7.2.1 $ --> +<!-- $Revision: 1.7.2.2 $ --> <!-- CCVS Documentation by Brendan W. McAdams <brendan@plexmedia.com> @@ -62,8 +62,8 @@ <title/> <methodsynopsis> - <type></type><methodname/> - <methodparam><type></type><parameter/></methodparam> + <type/><methodname/> + <methodparam><type/><parameter/></methodparam> </methodsynopsis> </refsect1> Index: phpdoc/en/functions/domxml.xml diff -u phpdoc/en/functions/domxml.xml:1.24.2.1 phpdoc/en/functions/domxml.xml:1.24.2.2 --- phpdoc/en/functions/domxml.xml:1.24.2.1 Sun Nov 11 20:08:48 2001 +++ phpdoc/en/functions/domxml.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.24.2.1 $ --> +<!-- $Revision: 1.24.2.2 $ --> <reference id="ref.domxml"> <title>DOM XML functions</title> <titleabbrev>DOM XML</titleabbrev> @@ -349,9 +349,12 @@ </partintro> + <!-- class Dom document --> + + <!-- has member functions array root([int doc_handle]) returns array of root nodes of this document. Array @@ -384,7 +387,9 @@ --> + + <!-- class Dom node object lastchild([int node]) returns Dom node object @@ -412,20 +417,27 @@ --> + + <!-- class Dom Attribute name --> + + <!-- class Dom Namespace --> + + <!-- class Dtd --> + <refentry id="function.xmldoc"> Index: phpdoc/en/functions/image.xml diff -u phpdoc/en/functions/image.xml:1.60.2.1 phpdoc/en/functions/image.xml:1.60.2.2 --- phpdoc/en/functions/image.xml:1.60.2.1 Sun Nov 11 20:08:50 2001 +++ phpdoc/en/functions/image.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.60.2.1 $ --> +<!-- $Revision: 1.60.2.2 $ --> <reference id="ref.image"> <title>Image functions</title> <titleabbrev>Image</titleabbrev> @@ -1992,6 +1992,7 @@ </refentry> + <!-- The function in t1lib which this function uses seems to be buggy... Currently, just comment out everywhere in the docs and source until time permits to find a solution. @@ -2037,6 +2038,7 @@ </refsect1> </refentry> --> + <refentry id="function.imagepsencodefont"> Index: phpdoc/en/functions/java.xml diff -u phpdoc/en/functions/java.xml:1.13.2.1 phpdoc/en/functions/java.xml:1.13.2.2 --- phpdoc/en/functions/java.xml:1.13.2.1 Sun Nov 11 20:08:51 2001 +++ phpdoc/en/functions/java.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.13.2.1 $ --> +<!-- $Revision: 1.13.2.2 $ --> <reference id="ref.java"> <title>Java</title> <titleabbrev>PHP / Java Integration</titleabbrev> @@ -118,8 +118,10 @@ possibly with a loss of data (example: double precision floating point numbers will be converted to boolean). + <!-- FIXME Why aren't java-doubles converted to PHP-floats? Is this correct? --> + </simpara> </listitem> Index: phpdoc/en/functions/ming.xml diff -u phpdoc/en/functions/ming.xml:1.26.2.1 phpdoc/en/functions/ming.xml:1.26.2.2 --- phpdoc/en/functions/ming.xml:1.26.2.1 Sun Nov 11 20:08:52 2001 +++ phpdoc/en/functions/ming.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.26.2.1 $ --> +<!-- $Revision: 1.26.2.2 $ --> <reference id="ref.ming"> <title>Ming functions for Flash</title> <titleabbrev>Ming (flash)</titleabbrev> @@ -164,9 +164,11 @@ </partintro> + <!-- SWFMovie --> + <refentry id="function.swfmovie"> <refnamediv> <refname>SWFMovie</refname> @@ -494,9 +496,11 @@ </refentry> + <!-- SWFDisplayItem --> + <refentry id="function.swfdisplayitem"> <refnamediv> <refname>SWFDisplayItem</refname> @@ -1222,9 +1226,11 @@ </refentry> + <!-- SWFShape --> + <refentry id="function.swfshape"> <refnamediv> <refname>SWFShape</refname> @@ -1779,8 +1785,10 @@ </refentry> + <!-- SWFGradient --> + <refentry id="function.swfgradient"> <refnamediv> @@ -1893,8 +1901,10 @@ </refentry> + <!-- SWFBitmap --> + <refentry id="function.swfbitmap"> <refnamediv> @@ -2062,8 +2072,10 @@ </refentry> + <!-- SWFFill --> + <refentry id="function.swffill"> <refnamediv> @@ -2196,8 +2208,10 @@ </refentry> + <!-- SWFMorph --> + <refentry id="function.swfmorph"> <refnamediv> @@ -2330,8 +2344,10 @@ </refentry> + <!-- SWFText --> + <refentry id="function.swftext"> <refnamediv> @@ -2548,8 +2564,10 @@ </refentry> + <!-- SWFFont --> + <refentry id="function.swffont"> <refnamediv> @@ -2624,8 +2642,10 @@ </refentry> + <!-- SWFTextField --> + <refentry id="function.swftextfield"> <refnamediv> @@ -2967,8 +2987,10 @@ </refentry> + <!-- SWFSprite --> + <refentry id="function.swfsprite"> <refnamediv> @@ -3134,8 +3156,10 @@ </refentry> + <!-- SWFButton --> + <refentry id="function.swfbutton"> <refnamediv> @@ -3486,7 +3510,9 @@ </refentry> + <!-- SWFAction --> + <refentry id="function.swfaction"> Index: phpdoc/en/functions/misc.xml diff -u phpdoc/en/functions/misc.xml:1.59.2.1 phpdoc/en/functions/misc.xml:1.59.2.2 --- phpdoc/en/functions/misc.xml:1.59.2.1 Sun Nov 11 20:08:52 2001 +++ phpdoc/en/functions/misc.xml Sun Nov 11 21:04:37 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.59.2.1 $ --> +<!-- $Revision: 1.59.2.2 $ --> <reference id="ref.misc"> <title>Miscellaneous functions</title> <titleabbrev>Misc.</titleabbrev> @@ -76,10 +76,12 @@ as of 4.0.5. </simpara> + <!-- so it's quite late to declare it 'deprecated' by now :) TODO: correct connection handling. Any volunteers? --> + </warning> <simpara> @@ -362,7 +364,9 @@ ?> </programlisting> + <!-- TODO: example with integer exit-statis --> + </example> </para> Index: phpdoc/en/functions/msql.xml diff -u phpdoc/en/functions/msql.xml:1.16.2.1 phpdoc/en/functions/msql.xml:1.16.2.2 --- phpdoc/en/functions/msql.xml:1.16.2.1 Sun Nov 11 20:08:53 2001 +++ phpdoc/en/functions/msql.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.16.2.1 $ --> +<!-- $Revision: 1.16.2.2 $ --> <reference id="ref.msql"> <title>mSQL functions</title> <titleabbrev>mSQL</titleabbrev> @@ -308,7 +308,7 @@ <methodsynopsis> <type>string</type><methodname>msql_error</methodname> - <methodparam><type></type><parameter/></methodparam> + <methodparam><type/><parameter/></methodparam> </methodsynopsis> <para> Index: phpdoc/en/functions/mysql.xml diff -u phpdoc/en/functions/mysql.xml:1.67.2.1 phpdoc/en/functions/mysql.xml:1.67.2.2 --- phpdoc/en/functions/mysql.xml:1.67.2.1 Sun Nov 11 20:08:53 2001 +++ phpdoc/en/functions/mysql.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.67.2.1 $ --> +<!-- $Revision: 1.67.2.2 $ --> <reference id="ref.mysql"> <title>MySQL Functions</title> <titleabbrev>MySQL</titleabbrev> @@ -151,12 +151,16 @@ </para> + <!-- what is returned? bool -> succes/failure i suppose? --> + + <!-- in PHP 3 int and in PHP 4 bool --> + <note> <para> This function was introduced in PHP 3.0.13 and requires MySQL @@ -324,8 +328,10 @@ identifier. </para> + <!-- returns?? bool -> succes? --> + <example> <title>MySQL create database example</title> <programlisting role="php"> @@ -1329,12 +1335,16 @@ that return large result sets. All associated result memory is automatically freed at the end of the script's execution. + <!-- TODO and as of PHP4 before, see freeing resources --> + </para> + <!-- returns?? --> + <para> For downward compatibility <function>mysql_freeresult</function> can also be used. @@ -1485,6 +1495,7 @@ <function>mysql_field_type</function>. </para> + <!-- this is very outdated, and now incorrect <para> @@ -1495,6 +1506,7 @@ will also be printed out. </para> --> + <para> <example> <title><function>mysql_list_fields</function> example</title> @@ -1526,11 +1538,13 @@ can also be used. </para> + <!-- TODO: this is equiv. with 'select * from $table where &false;,' which implies you can better use the field-research functions on a real query, that saves you one mysql-query. --> + </refsect1> </refentry> @@ -1693,7 +1707,9 @@ </para> + <!-- TODO move the story to features.persistent, and refer to that --> + <para> <function>mysql_pconnect</function> acts very much like Index: phpdoc/en/functions/nis.xml diff -u phpdoc/en/functions/nis.xml:1.17.2.1 phpdoc/en/functions/nis.xml:1.17.2.2 --- phpdoc/en/functions/nis.xml:1.17.2.1 Sun Nov 11 20:08:53 2001 +++ phpdoc/en/functions/nis.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.17.2.1 $ --> +<!-- $Revision: 1.17.2.2 $ --> <reference id="ref.nis"> <title>YP/NIS Functions</title> <titleabbrev>YP/NIS</titleabbrev> @@ -54,6 +54,7 @@ </example> </para> + <!-- <para> See also: <link linkend="function.yp-errno">yp_errno</link> and @@ -61,6 +62,7 @@ </para> --> + </refsect1> </refentry> @@ -96,11 +98,13 @@ <para> See also <function>yp-get-default-domain</function>. + <!-- linkend="function.yp-errno">yp_errno</link> and <link linkend="function.yp-err-string">yp_err_string</link> --> + </para> </refsect1> </refentry> @@ -139,11 +143,13 @@ <para> See also <function>yp-get-default-domain</function>. + <!-- linkend="function.yp-errno">yp_errno</link> and <link linkend="function.yp-err-string">yp_err_string</link> --> + </para> </refsect1> </refentry> @@ -185,11 +191,13 @@ <para> See also <function>yp-get-default-domain</function> + <!-- linkend="function.yp-errno">yp_errno</link> and <link linkend="function.yp-err-string">yp_err_string</link> --> + </para> </refsect1> </refentry> @@ -230,11 +238,13 @@ <para> See also <function>yp-get-default-domain</function> + <!-- <link linkend="function.yp-errno">yp_errno</link> and <link linkend="function.yp-err-string">yp_err_string</link> --> + </para> </refsect1> </refentry> @@ -269,8 +279,10 @@ if (!$entry) { echo "No more entries found\n"; + <!-- echo yp_errno() . ": " . yp_err_string(); --> + } $key = key ($entry); @@ -284,16 +296,19 @@ <para> See also <function>yp-get-default-domain</function>. + <!-- <link linkend="function.yp-errno">yp_errno</link> and <link linkend="function.yp-err-string">yp_err_string</link> --> + </para> </refsect1> </refentry> + <!-- Function doesn't exist <refentry id="function.yp-errno"> @@ -348,6 +363,8 @@ + + <!-- Function doesn't exist <refentry id="function.yp-err-string"> @@ -387,6 +404,7 @@ </refentry> --> + </reference> Index: phpdoc/en/functions/pgsql.xml diff -u phpdoc/en/functions/pgsql.xml:1.47.2.1 phpdoc/en/functions/pgsql.xml:1.47.2.2 --- phpdoc/en/functions/pgsql.xml:1.47.2.1 Sun Nov 11 20:08:54 2001 +++ phpdoc/en/functions/pgsql.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.47.2.1 $ --> +<!-- $Revision: 1.47.2.2 $ --> <reference id="ref.pgsql"> <title>PostgreSQL functions</title> <titleabbrev>PostgreSQL</titleabbrev> @@ -43,8 +43,10 @@ <row> <entry>postmaster -i &</entry> + <!-- <entry>pg_connect("", "", "", "", "dbname");</entry> --> + <entry>pg_connect("dbname=MyDbName");</entry> <entry>OK</entry> </row> @@ -1231,7 +1233,9 @@ directly supported here. All forms of <type>integer</type>, <type>boolean</type> and void + <!-- FIXME: is that still true? PHP supports boolean&null now... --> + types are returned as <type>integer</type> values. All forms of float, and Index: phpdoc/en/functions/pspell.xml diff -u phpdoc/en/functions/pspell.xml:1.20.2.1 phpdoc/en/functions/pspell.xml:1.20.2.2 --- phpdoc/en/functions/pspell.xml:1.20.2.1 Sun Nov 11 20:08:54 2001 +++ phpdoc/en/functions/pspell.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.20.2.1 $ --> +<!-- $Revision: 1.20.2.2 $ --> <!-- pspell currently (2001-08-14) doesn't use resources --> <reference id="ref.pspell"> @@ -494,7 +494,9 @@ <type>int</type><methodname>pspell_new</methodname> + <!-- not yet resource... --> + <methodparam><type>string</type><parameter>language</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter> Index: phpdoc/en/functions/session.xml diff -u phpdoc/en/functions/session.xml:1.55.2.1 phpdoc/en/functions/session.xml:1.55.2.2 --- phpdoc/en/functions/session.xml:1.55.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/session.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.55.2.1 $ --> +<!-- $Revision: 1.55.2.2 $ --> <reference id="ref.session"> <title>Session handling functions</title> <titleabbrev>Sessions</titleabbrev> @@ -975,16 +975,19 @@ to session variables are done. </para> + <!-- commented out until final decision on implementation <para> See also: <function>session_readonly</function>. </para> --> + </refsect1> </refentry> + <!-- commented out until final decision on implementation <refentry id="function.session-readonly"> <refnamediv> @@ -1006,6 +1009,7 @@ </refsect1> </refentry> --> + </reference> <!-- Keep this comment at the end of the file Index: phpdoc/en/functions/shmop.xml diff -u phpdoc/en/functions/shmop.xml:1.9.2.1 phpdoc/en/functions/shmop.xml:1.9.2.2 --- phpdoc/en/functions/shmop.xml:1.9.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/shmop.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.9.2.1 $ --> +<!-- $Revision: 1.9.2.2 $ --> <reference id="ref.shmop"> <title>Shared Memory Functions</title> <titleabbrev>shmop</titleabbrev> @@ -17,8 +17,10 @@ In PHP 4.0.3, there functions were prefixed by <literal>shm</literal> rather than <literal>shmop</literal>. + <!-- TODO: do the old shm_* funcs still work, i.e. are they still aliased? --> + </simpara> </note> Index: phpdoc/en/functions/strings.xml diff -u phpdoc/en/functions/strings.xml:1.122.2.1 phpdoc/en/functions/strings.xml:1.122.2.2 --- phpdoc/en/functions/strings.xml:1.122.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/strings.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.122.2.1 $ --> +<!-- $Revision: 1.122.2.2 $ --> <reference id="ref.strings"> <title>String functions</title> <titleabbrev>Strings</titleabbrev> @@ -324,7 +324,7 @@ <type>mixed</type><methodname>count_chars</methodname> <methodparam><type>string</type><parameter>string</parameter></methodparam> - <methodparam choice="opt"><type></type><parameter> + <methodparam choice="opt"><type/><parameter> mode </parameter></methodparam> @@ -1347,8 +1347,10 @@ </refentry> + <!-- this section is nearly-identical to trim, ltrim and rtrim --> + <refentry id="function.ltrim"> <refnamediv> <refname>ltrim</refname> @@ -1376,8 +1378,10 @@ Without the second parameter, <function>ltrim</function> will strip these characters: + <!-- sorted by importance. Printed 3 times: trim, ltrim, rtrim --> + <itemizedlist> <listitem> <simpara> @@ -1411,8 +1415,10 @@ </listitem> <listitem> <simpara> + <!-- not \v, since not supported by PHP --> + "\x0B" (<acronym>ASCII</acronym> <literal>11</literal> (<literal>0x0B</literal>)), a vertical tab. </simpara> @@ -1721,8 +1727,10 @@ </refentry> + <!-- this section is nearly-identical to trim, ltrim and rtrim --> + <refentry id="function.rtrim"> <refnamediv> <refname>rtrim</refname> @@ -1750,8 +1758,10 @@ Without the second parameter, <function>rtrim</function> will strip these characters: + <!-- sorted by importance. Printed 3 times: trim, ltrim, rtrim --> + <itemizedlist> <listitem> <simpara> @@ -1785,8 +1795,10 @@ </listitem> <listitem> <simpara> + <!-- not \v, since not supported by PHP --> + "\x0B" (<acronym>ASCII</acronym> <literal>11</literal> (<literal>0x0B</literal>)), a vertical tab. </simpara> @@ -3603,8 +3615,10 @@ </refentry> + <!-- this section is nearly-identical to trim, ltrim and rtrim --> + <refentry id="function.trim"> <refnamediv> <refname>trim</refname> @@ -3632,8 +3646,10 @@ Without the second parameter, <function>trim</function> will strip these characters: + <!-- sorted by importance. Printed 3 times: trim, ltrim, rtrim --> + <itemizedlist> <listitem> <simpara> @@ -3667,7 +3683,9 @@ </listitem> <listitem> <simpara> + <!-- not \v, since not supported by PHP --> + "\x0B" (<acronym>ASCII</acronym> <literal>11</literal> (<literal>0x0B</literal>)), a vertical tab. Index: phpdoc/en/functions/uodbc.xml diff -u phpdoc/en/functions/uodbc.xml:1.26.2.1 phpdoc/en/functions/uodbc.xml:1.26.2.2 --- phpdoc/en/functions/uodbc.xml:1.26.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/uodbc.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.26.2.1 $ --> +<!-- $Revision: 1.26.2.2 $ --> <reference id="ref.odbc"> <title>Unified ODBC functions</title> <titleabbrev>ODBC</titleabbrev> @@ -17,6 +17,7 @@ functions: <ulink url="&url.adabas;">Adabas D</ulink>, <ulink url="&url.ibmdb2;">IBM DB2</ulink>, <ulink url="&url.iodbc;">iODBC</ulink>, <ulink url="&url.solid;">Solid</ulink>, and <ulink url="&url.sybase;">Sybase SQL Anywhere</ulink>. </simpara> + <!-- install.xml has changed, so this link is no longer working <simpara> Please see the <link @@ -26,6 +27,7 @@ </simpara> --> + <note> <simpara> There is no ODBC involved when connecting to the above @@ -980,6 +982,7 @@ <function>odbc_longreadlen</function>. + <!-- If the requested field contains @@ -990,6 +993,7 @@ retrieve the field in hexadecimal notation. E.g. "SELECT HEX(binary_col) FROM mytable" --> + </para> Index: phpdoc/en/functions/var.xml diff -u phpdoc/en/functions/var.xml:1.74.2.1 phpdoc/en/functions/var.xml:1.74.2.2 --- phpdoc/en/functions/var.xml:1.74.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/var.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.74.2.1 $ --> +<!-- $Revision: 1.74.2.2 $ --> <reference id="ref.var"> <title>Variable Functions</title> <titleabbrev>Variables</titleabbrev> @@ -52,10 +52,12 @@ </para> + <!-- Returns &false; if <parameter>var</parameter> is set and has a non-empty or non-zero value; &true; otherwise. --> + <informalexample> <programlisting role="php"> $var = 0; @@ -76,8 +78,10 @@ no meaning since it would be checking whether something which isn't a variable is a variable with a &false; value. + <!-- will even result in parse error (at least in PHP 4) --> + </simpara> <simpara> See also <function>isset</function> and @@ -144,8 +148,10 @@ Never use <function>gettype</function> to test for a certain type, since the returned string may be subject to change in a future version. In addition, it is slow too, as it involves string comparision + <!-- where's my dictionary? --> + . </simpara> <simpara> @@ -186,7 +192,9 @@ </listitem> <listitem> <simpara>"unknown type" + <!-- someone's joking? --> + </simpara> </listitem> </itemizedlist> @@ -653,9 +661,11 @@ <informalexample> <programlisting role="php"> + <!-- TODO: better example, this one can be quite misleading for unexperienced programmers --> + function show_var($var) { if (is_scalar($var)) echo $var; @@ -874,6 +884,7 @@ are <function>serialize</function>ing will also be stored. </simpara> + <!-- TODO in 4.0.4pl1 this didn't work properly, however, there been some fixes. I don't know whether this all @@ -886,6 +897,7 @@ </note> </simpara> --> + <note> <para> Index: phpdoc/en/functions/yaz.xml diff -u phpdoc/en/functions/yaz.xml:1.21.2.1 phpdoc/en/functions/yaz.xml:1.21.2.2 --- phpdoc/en/functions/yaz.xml:1.21.2.1 Sun Nov 11 20:08:55 2001 +++ phpdoc/en/functions/yaz.xml Sun Nov 11 21:04:38 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Revision: 1.21.2.1 $ --> +<!-- $Revision: 1.21.2.2 $ --> <reference id="ref.yaz"> <title>YAZ functions</title> <titleabbrev>YAZ</titleabbrev> @@ -923,7 +923,7 @@ <methodsynopsis> <type>int</type><methodname>yaz_wait</methodname> - <methodparam choice="opt"><type></type><parameter>array options</parameter></methodparam> + <methodparam choice="opt"><type/><parameter>array options</parameter></methodparam> </methodsynopsis> <para> Index: phpdoc/en/pear/about.xml diff -u phpdoc/en/pear/about.xml:1.6 phpdoc/en/pear/about.xml:1.6.2.1 --- phpdoc/en/pear/about.xml:1.6 Sat Nov 10 16:49:43 2001 +++ phpdoc/en/pear/about.xml Sun Nov 11 21:04:38 2001 @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> - <chapter id="pear.about"> +<?xml version="1.0" encoding="UTF-8"?> +<!-- $Revision: 1.6.2.1 $ --> +<chapter id="pear.about"> <title>About PEAR</title> <simpara> PEAR is dedicated to Malin Bakken, Index: phpdoc/en/pear/pear.xml diff -u phpdoc/en/pear/pear.xml:1.11 phpdoc/en/pear/pear.xml:1.11.2.1 --- phpdoc/en/pear/pear.xml:1.11 Sat Nov 10 16:49:43 2001 +++ phpdoc/en/pear/pear.xml Sun Nov 11 21:04:38 2001 @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> - <reference id="pear.reference"> +<?xml version="1.0" encoding="UTF-8"?> +<!-- $Revision: 1.11.2.1 $ --> +<reference id="pear.reference"> <title>PEAR Reference Manual</title> <titleabbrev>PEAR</titleabbrev> @@ -50,8 +50,7 @@ when the request is over. This is not a destructor in the sense that you can "delete" an object and have the destructor called, but in the sense that PHP gives you a callback in the object - when PHP is done executing. See <link - linkend="example.pear.destructors">the example</link> below. + when PHP is done executing. See <link linkend="example.pear.destructors">the example</link> below. </simpara> <para> <warning id="pear.destructors.warning"> @@ -99,8 +98,7 @@ <classname>PEAR_Error</classname>'s constructor, but all of the parameters are optional, and you can set up defaults for errors generated from each object based on the - <classname>PEAR</classname> class. See the <link - linkend="example.pear.error1">PEAR error examples</link> for how + <classname>PEAR</classname> class. See the <link linkend="example.pear.error1">PEAR error examples</link> for how to use it and the <classname>PEAR_Error</classname> reference for the full details. </simpara> @@ -174,8 +172,7 @@ when PHP is used in command-line mode. Bummer. </simpara> <simpara> - Also, see the <link - linkend="pear.destructors.warning">warning</link> about how to + Also, see the <link linkend="pear.destructors.warning">warning</link> about how to instantiate objects if you want to use the destructor. </simpara> </note> @@ -359,12 +356,12 @@ <title>Methods</title> <refsect2 id="function.pear.pear"> <title>PEAR::PEAR</title> - <funcsynopsis> - <funcprototype> - <funcdef>PEAR()</funcdef> + + <methodsynopsis> + <type>PEAR()</type> <void/> - </funcprototype> - </funcsynopsis> + </methodsynopsis> + <para> This is the PEAR class constructor. Call it from the constructor of every class inheriting the PEAR class. @@ -387,12 +384,12 @@ </refsect2> <refsect2 id="function.pear.-pear"> <title>PEAR::_PEAR</title> - <funcsynopsis> - <funcprototype> - <funcdef>_PEAR()</funcdef> + + <methodsynopsis> + <type>_PEAR()</type> <void/> - </funcprototype> - </funcsynopsis> + </methodsynopsis> + <para> This is the PEAR class destructor. It is called during request shutdown. @@ -466,22 +463,16 @@ </refsect1> <refsect1> <title>Properties</title> - <simpara></simpara> + <simpara/> </refsect1> <refsect1> <title>Methods</title> - <funcsynopsis> - <funcprototype> - <funcdef><function>PEAR_Error::PEAR_Error</function></funcdef> - <paramdef> - <parameter><optional>message</optional></parameter> - <parameter><optional>code</optional></parameter> - <parameter><optional>mode</optional></parameter> - <parameter><optional>options</optional></parameter> - <parameter><optional>userinfo</optional></parameter> - </paramdef> - </funcprototype> - </funcsynopsis> + + <methodsynopsis> + <methodname>PEAR_Error::PEAR_Error</methodname> + <methodparam choice="opt"><type></type><parameter>message</parameter><parameter>code</parameter><parameter>mode</parameter><parameter>options</parameter><parameter>userinfo</parameter></methodparam> + </methodsynopsis> + <refsect2> <title>Description</title> <para> @@ -507,8 +498,7 @@ <term>mode</term> <listitem> <simpara> - Mode of operation. See the <link - linkend="pear.error-modes">error modes</link> section for + Mode of operation. See the <link linkend="pear.error-modes">error modes</link> section for details. </simpara> </listitem> Index: phpdoc/en/pear/standards.xml diff -u phpdoc/en/pear/standards.xml:1.14 phpdoc/en/pear/standards.xml:1.14.2.1 --- phpdoc/en/pear/standards.xml:1.14 Sat Nov 10 16:49:43 2001 +++ phpdoc/en/pear/standards.xml Sun Nov 11 21:04:39 2001 @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.14 $ --> - <chapter id="pear.standards"> +<?xml version="1.0" encoding="UTF-8"?> +<!-- $Revision: 1.14.2.1 $ --> +<chapter id="pear.standards"> <title>PEAR Coding Standards</title> <note> <simpara> @@ -249,6 +249,7 @@ Include the $Id$ CVS keyword in each file. As each file is edited, add this tag if it's not yet present (or replace existing forms such as "Last Modified:", etc.). + <!-- <note> <simpara> @@ -259,6 +260,7 @@ </simpara> </note> --> + </para> <para> The rest of this section assumes that you have basic knowledge