diff --git a/appendices/migration5.xml b/appendices/migration5.xml index 19d36edfa6..fba943630d 100755 --- a/appendices/migration5.xml +++ b/appendices/migration5.xml @@ -1,5 +1,5 @@ - + Migrating from PHP 4 to PHP 5 @@ -50,11 +50,11 @@ The T_ML_CONSTANT constant is no longer defined by the Tokenizer extension. If error_reporting is set to E_ALL, PHP will generate a - notice. Instead of T_ML_CONSTANT for /* */ the - T_COMMENT constant is used, thus both // and /* */ + notice. Although the T_ML_CONSTANT was never used + at all, it was defined in PHP 4. In both PHP 4 and PHP 5 // and /* */ are resolved as the T_COMMENT constant. However the - PHPDoc style comments /** */ ,which starting PHP5 are parsed by PHP, are - recongnized as T_DOC_COMMENT. + PHPDoc style comments /** */ ,which starting PHP 5 are parsed by PHP, are + recognized as T_DOC_COMMENT. $_SERVER should be populated with argc and argv if - + @@ -19,9 +19,10 @@ - get_class 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 get_class 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. diff --git a/reference/image/reference.xml b/reference/image/reference.xml index 6e08bfe87e..d370634be5 100644 --- a/reference/image/reference.xml +++ b/reference/image/reference.xml @@ -1,5 +1,5 @@ - + Image Functions Image @@ -144,7 +144,7 @@ you are able to work with information stored in headers of JPEG and TIFF images. This way you can read meta data generated by digital cameras as mentioned above. These - functions does not require the GD library. + functions do not require the GD library. PHP does not require any additional library for the exif module. diff --git a/reference/tokenizer/reference.xml b/reference/tokenizer/reference.xml index 05cdb76b78..7454f384ff 100644 --- a/reference/tokenizer/reference.xml +++ b/reference/tokenizer/reference.xml @@ -1,5 +1,5 @@ - + Tokenizer Functions Tokenizer @@ -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')) {