derick Wed Mar 31 13:54:00 2004 EDT
Modified files: /phpdoc/en/appendices migration5.xml /phpdoc/en/reference/classobj/functions get-class.xml /phpdoc/en/reference/image reference.xml /phpdoc/en/reference/tokenizer reference.xml Log: - Corrected migration chapter item on comment tokens. - Added get_class() changes in PHP 5. - Fixed some minor typoes. http://cvs.php.net/diff.php/phpdoc/en/appendices/migration5.xml?r1=1.13&r2=1.14&ty=u Index: phpdoc/en/appendices/migration5.xml diff -u phpdoc/en/appendices/migration5.xml:1.13 phpdoc/en/appendices/migration5.xml:1.14 --- phpdoc/en/appendices/migration5.xml:1.13 Mon Mar 22 10:12:36 2004 +++ phpdoc/en/appendices/migration5.xml Wed Mar 31 13:53:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.13 $ --> +<!-- $Revision: 1.14 $ --> <appendix id="migration5"> <title>Migrating from PHP 4 to PHP 5</title> @@ -50,11 +50,11 @@ The <constant>T_ML_CONSTANT</constant> constant is no longer defined by the <link linkend="ref.tokenizer">Tokenizer</link> extension. If error_reporting is set to <constant>E_ALL</constant>, PHP will generate a - notice. Instead of <constant>T_ML_CONSTANT</constant> for /* */ the - <constant>T_COMMENT</constant> constant is used, thus both // and /* */ + notice. Although the <constant>T_ML_CONSTANT</constant> was never used + at all, it was defined in PHP 4. In both PHP 4 and PHP 5 // and /* */ are resolved as the <constant>T_COMMENT</constant> constant. However the - PHPDoc style comments /** */ ,which starting PHP5 are parsed by PHP, are - recongnized as <constant>T_DOC_COMMENT</constant>. + PHPDoc style comments /** */ ,which starting PHP 5 are parsed by PHP, are + recognized as <constant>T_DOC_COMMENT</constant>. </simpara></listitem> <listitem><simpara> $_SERVER should be populated with argc and argv if <link http://cvs.php.net/diff.php/phpdoc/en/reference/classobj/functions/get-class.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/classobj/functions/get-class.xml diff -u phpdoc/en/reference/classobj/functions/get-class.xml:1.5 phpdoc/en/reference/classobj/functions/get-class.xml:1.6 --- phpdoc/en/reference/classobj/functions/get-class.xml:1.5 Thu Jan 15 07:42:05 2004 +++ phpdoc/en/reference/classobj/functions/get-class.xml Wed Mar 31 13:53:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/classobj.xml, last change in rev 1.4 --> <refentry id="function.get-class"> <refnamediv> @@ -19,9 +19,10 @@ </para> <note> <simpara> - <function>get_class</function> returns a user defined class name - in lowercase. A class defined in a PHP extension is returned - in its original notation. + A class defined in a PHP extension is returned in its original notation. + In PHP 4 <function>get_class</function> returns a user defined class + name in lowercase, but in PHP 5 it will return the class name in it's + original notation too, just like class names from PHP extensions. </simpara> </note> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/image/reference.xml?r1=1.19&r2=1.20&ty=u Index: phpdoc/en/reference/image/reference.xml diff -u phpdoc/en/reference/image/reference.xml:1.19 phpdoc/en/reference/image/reference.xml:1.20 --- phpdoc/en/reference/image/reference.xml:1.19 Sat Feb 28 10:13:36 2004 +++ phpdoc/en/reference/image/reference.xml Wed Mar 31 13:53:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.19 $ --> +<!-- $Revision: 1.20 $ --> <reference id="ref.image"> <title>Image Functions</title> <titleabbrev>Image</titleabbrev> @@ -144,7 +144,7 @@ you are able to work with information stored in headers of <acronym>JPEG</acronym> and <acronym>TIFF</acronym> images. This way you can read meta data generated by digital cameras as mentioned above. These - functions does not require the <acronym>GD</acronym> library. + functions do not require the <acronym>GD</acronym> library. <note> <simpara> PHP does not require any additional library for the exif module. http://cvs.php.net/diff.php/phpdoc/en/reference/tokenizer/reference.xml?r1=1.17&r2=1.18&ty=u Index: phpdoc/en/reference/tokenizer/reference.xml diff -u phpdoc/en/reference/tokenizer/reference.xml:1.17 phpdoc/en/reference/tokenizer/reference.xml:1.18 --- phpdoc/en/reference/tokenizer/reference.xml:1.17 Tue Feb 24 03:46:30 2004 +++ phpdoc/en/reference/tokenizer/reference.xml Wed Mar 31 13:53:59 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> +<!-- $Revision: 1.18 $ --> <reference id="ref.tokenizer"> <title>Tokenizer Functions</title> <titleabbrev>Tokenizer</titleabbrev> @@ -46,7 +46,7 @@ * The following three lines define it in order to * preserve backwards compatibility. * - * The next two lines define the PHP5-only T_DOC_COMMENT, + * The next two lines define the PHP 5-only T_DOC_COMMENT, * which we will mask as T_ML_COMMENT for PHP 4. */ if (!defined('T_ML_COMMENT')) {