diff --git a/appendices/debugger.xml b/appendices/debugger.xml index 2b0343bdaa..e747bd8ca3 100644 --- a/appendices/debugger.xml +++ b/appendices/debugger.xml @@ -44,8 +44,8 @@ - The code for the debugger has not been ported to PHP4, at the - present time only PHP3 supports the debugger code. + The code for the debugger has not been ported to PHP 4, at the + present time only PHP 3 supports the debugger code. diff --git a/appendices/phpdevel.xml b/appendices/phpdevel.xml index 7fdc6f5f9e..795c98f8a6 100644 --- a/appendices/phpdevel.xml +++ b/appendices/phpdevel.xml @@ -4,7 +4,7 @@ - Adding functions to PHP3 + Adding functions to PHP 3 Function Prototype @@ -182,7 +182,7 @@ convert_string_to_number(arg1); /* Converts string to either LONG or DOUBLE dep fault. So please take care and free all of your wasted memory. - If you compile with "-DDEBUG", PHP3 will print out a list of all + If you compile with "-DDEBUG", PHP 3 will print out a list of all memory that was allocated using emalloc() and estrdup() but never freed with efree() when it is done running the specified script. @@ -618,7 +618,7 @@ php3_list_delete(resource_id->value.lval); Adding runtime configuration directives - Many of the features of PHP3 can be configured at runtime. These + Many of the features of PHP 3 can be configured at runtime. These configuration directives can appear in either the designated php3.ini file, or in the case of the Apache module version in the Apache .conf files. The advantage of having them in the Apache diff --git a/chapters/intro.xml b/chapters/intro.xml index de8574e107..6949dd43d6 100644 --- a/chapters/intro.xml +++ b/chapters/intro.xml @@ -129,11 +129,11 @@ people had contributed to, to being a much more organized team effort. The parser was rewritten from scratch by Zeev Suraski and Andi Gutmans and this new parser formed the basis for PHP Version - 3. A lot of the utility code from PHP/FI was ported over to PHP3 + 3. A lot of the utility code from PHP/FI was ported over to PHP 3 and a lot of it was completely rewritten. - Today (end-1999) either PHP/FI or PHP3 ships with a number of + Today (end-1999) either PHP/FI or PHP 3 ships with a number of commercial products such as C2's StrongHold web server and RedHat Linux. A conservative estimate based on an extrapolation from numbers provided by NetCraft diff --git a/features/file-upload.xml b/features/file-upload.xml index 027c5163e1..363fc11c51 100644 --- a/features/file-upload.xml +++ b/features/file-upload.xml @@ -216,7 +216,7 @@ if (is_uploaded_file($userfile)) { Common Pitfalls The MAX_FILE_SIZE item cannot specify a file size greater than the file - size that has been set in the upload_max_filesize in the PHP3.ini file + size that has been set in the upload_max_filesize in the PHP 3.ini file or the corresponding php3_upload_max_filesize Apache .conf directive. The default is 2 Megabytes. diff --git a/functions/array.xml b/functions/array.xml index 768f5b87fa..62ad7b6f0b 100644 --- a/functions/array.xml +++ b/functions/array.xml @@ -251,11 +251,11 @@ array_keys ($array, "blue"); // returns array (0, 3, 4) - This function was added to PHP4, below is an implementation for - those still using PHP3. + This function was added to PHP 4, below is an implementation for + those still using PHP 3. - Implementation of <function>array_keys</function> for PHP3 + Implementation of <function>array_keys</function> for PHP 3 users @@ -1029,11 +1029,11 @@ array_values ($array); // returns array ("XL", "gold") - This function was added to PHP4, below is an implementation for - those still using PHP3. + This function was added to PHP 4, below is an implementation for + those still using PHP 3. - Implementation of <function>array_values</function> for PHP3 + Implementation of <function>array_values</function> for PHP 3 users diff --git a/functions/com.xml b/functions/com.xml index aba5e4f1e9..366571cf21 100644 --- a/functions/com.xml +++ b/functions/com.xml @@ -5,7 +5,7 @@ These functions are only available on the Windows version of - PHP. These functions have been added in PHP4. + PHP. These functions have been added in PHP 4. diff --git a/functions/cpdf.xml b/functions/cpdf.xml index 53bfadd7c3..6fb9b5265d 100644 --- a/functions/cpdf.xml +++ b/functions/cpdf.xml @@ -39,7 +39,7 @@ - The function cpdf_set_font has changed since PHP3 + The function cpdf_set_font has changed since PHP 3 to support asian fonts. The encoding parameter is no longer an integer but a string. diff --git a/functions/cybercash.xml b/functions/cybercash.xml index 62afd00f22..63f43cffdf 100644 --- a/functions/cybercash.xml +++ b/functions/cybercash.xml @@ -7,7 +7,7 @@ These functions are only available if the interpreter has been compiled with the . These functions - have been added in PHP4. + have been added in PHP 4. diff --git a/functions/domxml.xml b/functions/domxml.xml index 2d1d6d694a..66ec1663d4 100644 --- a/functions/domxml.xml +++ b/functions/domxml.xml @@ -7,7 +7,7 @@ These functions are only available if PHP was configured with , using the GNOME xml library. You will need at least libxml-2.0.0 (the beta - version will not work). These functions have been added in PHP4. + version will not work). These functions have been added in PHP 4. This module defines the following constants: diff --git a/functions/errorfunc.xml b/functions/errorfunc.xml index 5c0ca324d8..ac4320a649 100644 --- a/functions/errorfunc.xml +++ b/functions/errorfunc.xml @@ -255,7 +255,7 @@ error_reporting (E_ERROR | E_WARNING | E_PARSE | E_NOTICE); // New syntax for PH /* good for code authoring to report uninitialized or (possibly mis-spelled) variables */ error_reporting (63); // Old syntax, PHP 2/3 -error_reporting (E_ALL); // New syntax for PHP3/4 +error_reporting (E_ALL); // New syntax for PHP 3/4 /* report all PHP errors */ @@ -328,7 +328,7 @@ error_reporting (E_ALL); // New syntax for PHP3/4 <?php -// redefine the user error constants - PHP4 only +// redefine the user error constants - PHP 4 only define (FATAL,E_USER_ERROR); define (ERROR,E_USER_WARNING); define (WARNING,E_USER_NOTICE); diff --git a/functions/funchand.xml b/functions/funchand.xml index 5f06ca4ddc..15410c21c6 100755 --- a/functions/funchand.xml +++ b/functions/funchand.xml @@ -158,7 +158,7 @@ similar(a,b) = 11(45.833333333333%) $av = array("the ","a ","that ","this "); array_walk($av, create_function('&$v,$k','$v = $v."mango";')); -print_r($av); // for PHP3 use var_dump() +print_r($av); // for PHP 3 use var_dump() // outputs: // Array // ( diff --git a/functions/http.xml b/functions/http.xml index b378215e50..9dfeef5cab 100644 --- a/functions/http.xml +++ b/functions/http.xml @@ -177,10 +177,10 @@ header ("Pragma: no-cache"); // HTTP/1.0 - In PHP3, multiple calls to setcookie in the same + In PHP 3, multiple calls to setcookie in the same script will be performed in reverse order. If you are trying to delete one cookie before inserting another you should put the - insert before the delete. In PHP4, multiple calls to + insert before the delete. In PHP 4, multiple calls to setcookie are performed in the order called. diff --git a/functions/ibase.xml b/functions/ibase.xml index ddb8d2bae3..e51566f26a 100644 --- a/functions/ibase.xml +++ b/functions/ibase.xml @@ -514,7 +514,7 @@ magic_quotes_sybase = On Ibase_num_fields is currently not functional - in PHP4. + in PHP 4. diff --git a/functions/image.xml b/functions/image.xml index 43d13ff3aa..31d3366d0f 100644 --- a/functions/image.xml +++ b/functions/image.xml @@ -2168,7 +2168,7 @@ ExifVersion: 0200 - This function is only available in PHP4 compiled using --enable-exif + This function is only available in PHP 4 compiled using --enable-exif This function does not require the GD image library. diff --git a/functions/imap.xml b/functions/imap.xml index 20bda9564a..8628d57dde 100644 --- a/functions/imap.xml +++ b/functions/imap.xml @@ -2708,7 +2708,7 @@ echo nl2br(imap_mail_compose($envelope,$body)); - This function is currently only available in PHP3. + This function is currently only available in PHP 3. diff --git a/functions/info.xml b/functions/info.xml index e627c088ed..d822330d65 100644 --- a/functions/info.xml +++ b/functions/info.xml @@ -793,7 +793,7 @@ echo "Current PHP version: ".phpversion(); - This funcionality was added in PHP4 Beta 4. + This funcionality was added in PHP 4 Beta 4. @@ -983,7 +983,7 @@ putenv ("UNIQID=$uniqid"); - This funcionality was added in PHP4 Beta 4. + This funcionality was added in PHP 4 Beta 4. diff --git a/functions/math.xml b/functions/math.xml index f63237d216..4768281b97 100644 --- a/functions/math.xml +++ b/functions/math.xml @@ -116,7 +116,7 @@ Only M_PI is available in PHP versions up to and including PHP4RC1. - All other constants are available starting with PHP4.0. Constants + All other constants are available starting with PHP 4.0. Constants labelled [4.0.2] were added in PHP 4.0.2. diff --git a/functions/misc.xml b/functions/misc.xml index c3caf7c878..0d069ae328 100644 --- a/functions/misc.xml +++ b/functions/misc.xml @@ -250,9 +250,9 @@ $file = fopen ($filename, 'r') A return statement will terminate the evaluation of - the string immediatley. In PHP4 you may use return + the string immediatley. In PHP 4 you may use return to return a value that will become the result of the - eval function while in PHP3 + eval function while in PHP 3 eval was of type void and did never return anything. diff --git a/functions/pdf.xml b/functions/pdf.xml index cc05e94e20..4542d92fdd 100644 --- a/functions/pdf.xml +++ b/functions/pdf.xml @@ -49,7 +49,7 @@ there has been tons of changes especially to the pdflib API. Most of these changes has been somehow covered by PHP, some has even required changes to the PHP API. Since pdflib - 3.x the API seems to be stabilzed and PHP4 has adopted the version as a + 3.x the API seems to be stabilzed and PHP 4 has adopted the version as a minimum requirement for PDF support. The consequence will be that many functions will disappear or be replaced by alternatives sooner or later. Support for pdflib 0.6 is already completely given up. @@ -228,8 +228,8 @@ for possible changes. - Any version of PHP4 after March, 9th 2000 do not support versions - of pdflib older than 3.0. PHP3 on the other hand should not be used + Any version of PHP 4 after March, 9th 2000 do not support versions + of pdflib older than 3.0. PHP 3 on the other hand should not be used with version newer than 2.01. diff --git a/functions/posix.xml b/functions/posix.xml index 2043360a84..a81b38498a 100644 --- a/functions/posix.xml +++ b/functions/posix.xml @@ -8,7 +8,7 @@ IEEE 1003.1 (POSIX.1) standards document which are not accessible through other means. POSIX.1 for example defined the open(), read(), write() and close() functions, too, which traditionally have been - part of PHP3 for a long time. Some more system specific functions + part of PHP 3 for a long time. Some more system specific functions have not been available before, though, and this module tries to remedy this by providing easy access to these functions. diff --git a/functions/recode.xml b/functions/recode.xml index 87c9b03465..3214c3d545 100644 --- a/functions/recode.xml +++ b/functions/recode.xml @@ -64,7 +64,7 @@ This is an alias for recode_string. It has - been added in PHP4. + been added in PHP 4. diff --git a/functions/swf.xml b/functions/swf.xml index 42080d83bb..d65f5a4601 100644 --- a/functions/swf.xml +++ b/functions/swf.xml @@ -76,7 +76,7 @@ swf_closefile (); - SWF support was added in PHP4 RC2. + SWF support was added in PHP 4 RC2. diff --git a/language/control-structures.xml b/language/control-structures.xml index e0616022cb..426823c18d 100644 --- a/language/control-structures.xml +++ b/language/control-structures.xml @@ -422,9 +422,9 @@ for (expr1; expr2; expr3): statement; ...; endfor; Other languages have a foreach statement to - traverse an array or hash. PHP3 has no such construct; PHP4 does + traverse an array or hash. PHP 3 has no such construct; PHP 4 does (see foreach). In PHP3, you + linkend="control-structures.foreach">foreach). In PHP 3, you can combine while with the list and each functions to achieve the same effect. See the documentation for @@ -435,7 +435,7 @@ for (expr1; expr2; expr3): statement; ...; endfor; <literal>foreach</literal> - PHP4 (not PHP3) includes a foreach construct, + PHP 4 (not PHP 3) includes a foreach construct, much like perl and some other languages. This simply gives an easy way to iterate over arrays. There are two syntaxes; the second is a minor but useful extension of the first: @@ -887,11 +887,11 @@ require ("file.php"); /* Works. */ - In PHP3, it is possible to execute a return + In PHP 3, it is possible to execute a return statement inside a requireed file, as long as that statement occurs in the global scope of the requireed file. It may not occur within any - block (meaning inside braces ({}). In PHP4, however, this ability + block (meaning inside braces ({}). In PHP 4, however, this ability has been discontinued. If you need this functionality, see include. @@ -974,22 +974,22 @@ if ($condition) { - In both PHP3 and PHP4, it is possible to execute a + In both PHP 3 and PHP 4, it is possible to execute a return statement inside an includeed file, in order to terminate processing in that file and return to the script which called it. Some differences in the way this works exist, however. The - first is that in PHP3, the return may not + first is that in PHP 3, the return may not appear inside a block unless it's a function block, in which case the return applies to that function and not the - whole file. In PHP4, however, this restriction does not - exist. Also, PHP4 allows you to return values from + whole file. In PHP 4, however, this restriction does not + exist. Also, PHP 4 allows you to return values from includeed files. You can take the value of the include call as you would a normal - function. This generates a parse error in PHP3. + function. This generates a parse error in PHP 3. - <function>include</function> in PHP3 and PHP4 + <function>include</function> in PHP 3 and PHP 4 Assume the existence of the following file (named test.inc) in the same directory as the main @@ -1015,9 +1015,9 @@ echo "File returned: '$retval'<br>\n"; - When main.html is called in PHP3, it will + When main.html is called in PHP 3, it will generate a parse error on line 2; you can't take the value of an - include in PHP3. In PHP4, however, the + include in PHP 3. In PHP 4, however, the result will be: Before the return @@ -1035,12 +1035,12 @@ echo "Back in main.html<br>\n"; - In PHP4, the output will be: + In PHP 4, the output will be: Before the return Back in main.html - However, PHP3 will give the following output: + However, PHP 3 will give the following output: Before the return 27Back in main.html @@ -1059,7 +1059,7 @@ Before the return - The spurious '27' is due to the fact that PHP3 does not support + The spurious '27' is due to the fact that PHP 3 does not support returning values from files like that. diff --git a/language/functions.xml b/language/functions.xml index a32265616d..a5ddb323e9 100644 --- a/language/functions.xml +++ b/language/functions.xml @@ -23,18 +23,18 @@ function foo ($arg_1, $arg_2, ..., $arg_n) { definitions. - In PHP3, functions must be defined before they are referenced. No - such requirement exists in PHP4. + In PHP 3, functions must be defined before they are referenced. No + such requirement exists in PHP 4. PHP does not support function overloading, nor is it possible to undefine or redefine previously-declared functions. - PHP3 does not support variable numbers of arguments to functions, + PHP 3 does not support variable numbers of arguments to functions, although default arguments are supported (see Default argument - values for more information). PHP4 supports both: see for more information). PHP 4 supports both: see Variable-length argument lists and the function references for func_num_args, @@ -57,13 +57,13 @@ function foo ($arg_1, $arg_2, ..., $arg_n) { reference, and default argument values. Variable-length argument lists are supported only - in PHP4 and later; see Variable-length argument lists and the function references for func_num_args, func_get_arg, and func_get_args for more information. A - similar effect can be achieved in PHP3 by passing an array of + similar effect can be achieved in PHP 3 by passing an array of arguments to a function: @@ -208,7 +208,7 @@ Making a bowl of acidophilus raspberry. Variable-length argument lists - PHP4 has support for variable-length argument lists in + PHP 4 has support for variable-length argument lists in user-defined functions. This is really quite easy, using the func_num_args, func_get_arg, and @@ -282,7 +282,7 @@ $newref = &returns_reference(); This is a deprecated feature, and should only be used by the - PHP/FI2->PHP3 convertor. + PHP/FI2->PHP 3 convertor. @@ -292,7 +292,7 @@ $newref = &returns_reference(); usort, array_walk, and register_shutdown_function. You can get around this limitation by writing a wrapper function (in normal - PHP3 form) to call the old_function. + PHP 3 form) to call the old_function. diff --git a/language/operators.xml b/language/operators.xml index 63873e0a9c..1291152ed9 100644 --- a/language/operators.xml +++ b/language/operators.xml @@ -95,10 +95,10 @@ $b .= "There!"; // sets $b to "Hello There!", just like $b = $b . "There!"; Note that the assignment copies the original variable to the new one (assignment by value), so changes to one will not affect the other. This may also have relevance if you need to copy something - like a large array inside a tight loop. PHP4 supports assignment + like a large array inside a tight loop. PHP 4 supports assignment by reference, using the $var = &$othervar; syntax, but this is not possible - in PHP3. 'Assignment by reference' means that both variables end + in PHP 3. 'Assignment by reference' means that both variables end up pointing at the same data, and nothing is copied anywhere. To learn more about references, please read References explained. @@ -194,7 +194,7 @@ $b .= "There!"; // sets $b to "Hello There!", just like $b = $b . "There!"; Identical True if $a is equal to $b, and they are of the same - type. (PHP4 only) + type. (PHP 4 only) @@ -207,7 +207,7 @@ $b .= "There!"; // sets $b to "Hello There!", just like $b = $b . "There!"; Not identical True if $a is not equal to $b, or they are not of the same - type. (PHP4 only) + type. (PHP 4 only) diff --git a/language/types.xml b/language/types.xml index 69cc4a6882..990211c75a 100644 --- a/language/types.xml +++ b/language/types.xml @@ -419,7 +419,7 @@ $a["foo"][4]["bar"][0] = $f; # four dimensional! - In PHP3 it is not possible to reference multidimensional arrays + In PHP 3 it is not possible to reference multidimensional arrays directly within strings. For instance, the following will not have the desired result: @@ -428,7 +428,7 @@ $a[3]['bar'] = 'Bob'; echo "This won't work: $a[3][bar]"; - In PHP3, the above will output This won't work: + In PHP 3, the above will output This won't work: Array[bar]. The string concatenation operator, however, can be used to overcome this: @@ -439,7 +439,7 @@ echo "This will work: " . $a[3][bar]; - In PHP4, however, the whole problem may be circumvented by + In PHP 4, however, the whole problem may be circumvented by enclosing the array reference (inside the string) in curly braces: diff --git a/language/variables.xml b/language/variables.xml index 5dcc19089c..0f29275477 100644 --- a/language/variables.xml +++ b/language/variables.xml @@ -39,7 +39,7 @@ $t - In PHP3, variables are always assigned by value. That is to say, + In PHP 3, variables are always assigned by value. That is to say, when you assign an expression to a variable, the entire value of the original expression is copied into the destination variable. This means, for instance, that after assigning one @@ -49,7 +49,7 @@ $t linkend="language.expressions">Expressions. - PHP4 offers another way to assign values to variables: + PHP 4 offers another way to assign values to variables: assign by reference. This means that the new variable simply references (in other words, "becomes an alias for" or "points to") the original variable. Changes to the new variable