diff --git a/reference/bc/functions/bcscale.xml b/reference/bc/functions/bcscale.xml index eb66910bc0..b86770a8de 100644 --- a/reference/bc/functions/bcscale.xml +++ b/reference/bc/functions/bcscale.xml @@ -13,7 +13,7 @@ intscale - Sets the default scale parameter for all subsequent bc math functions that + Sets the default scale parameter for all subsequent calls to bc math functions that do not explicitly specify a scale parameter. diff --git a/reference/curl/functions/curl-setopt.xml b/reference/curl/functions/curl-setopt.xml index 79f580304f..9f09fd2922 100644 --- a/reference/curl/functions/curl-setopt.xml +++ b/reference/curl/functions/curl-setopt.xml @@ -92,8 +92,9 @@ on secure transfers. - Available since PHP 5.3.2. Requires CURLOPT_VERBOSE to be - on to have an effect. + Added in cURL 7.19.1. + Available since PHP 5.3.2. + Requires CURLOPT_VERBOSE to be on to have an effect. @@ -454,7 +455,7 @@ timeouts with a minimum timeout allowed of one second. - Added in cURL 7.16.3. Available since PHP 5.2.3. + Added in cURL 7.16.2. Available since PHP 5.2.3. @@ -721,7 +722,7 @@ timeouts with a minimum timeout allowed of one second. - Added in cURL 7.16.3. Available since PHP 5.2.3. + Added in cURL 7.16.2. Available since PHP 5.2.3. diff --git a/reference/datetime/datetime/construct.xml b/reference/datetime/datetime/construct.xml index a3634f3991..f1688e6957 100644 --- a/reference/datetime/datetime/construct.xml +++ b/reference/datetime/datetime/construct.xml @@ -45,7 +45,7 @@ A DateTimeZone object representing the - desired time zone. + timezone of $time. If $timezone is omitted, diff --git a/reference/datetime/functions/gmmktime.xml b/reference/datetime/functions/gmmktime.xml index 6d6cb91655..7e71ab7068 100644 --- a/reference/datetime/functions/gmmktime.xml +++ b/reference/datetime/functions/gmmktime.xml @@ -149,7 +149,7 @@ ]]> diff --git a/reference/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml index e04265a216..1209325280 100644 --- a/reference/geoip/functions/geoip-country-code-by-name.xml +++ b/reference/geoip/functions/geoip-country-code-by-name.xml @@ -68,6 +68,15 @@ This host is located in: US + + + &reftitle.notes; + + + Please see http://www.maxmind.com/en/iso3166 for a complete list of possible return values, including special codes. + + + &reftitle.seealso; diff --git a/reference/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml index 6b507005c2..0abe009bba 100644 --- a/reference/geoip/functions/geoip-database-info.xml +++ b/reference/geoip/functions/geoip-database-info.xml @@ -52,9 +52,9 @@ &reftitle.examples; - A <function>geoip_region_by_name</function> example + A <function>geoip_database_info</function> example - This will output the current database version string. + This will output information regarding the database. Imagick::setImageMatte + Imagick Alpha Channel Constants diff --git a/reference/mbstring/functions/mb-output-handler.xml b/reference/mbstring/functions/mb-output-handler.xml index 00d582bf03..7b711faa12 100644 --- a/reference/mbstring/functions/mb-output-handler.xml +++ b/reference/mbstring/functions/mb-output-handler.xml @@ -75,7 +75,7 @@ - Does not set Content-Type, using header. + Content-Type has not been set, using header. @@ -120,23 +120,17 @@ ob_start("mb_output_handler"); &reftitle.notes; - If you want to output some binary data such as image from PHP - script with PHP 4.3.0 or later, Content-Type: header must be send - using header before any binary data was send - to client (e.g. header("Content-Type: image/png")). - If Content-Type: header was send, output character encoding - conversion will not be performed. + If you want to output binary data, such as an image, using PHP 4.3.0 or later, + a Content-Type: header must be set using header + before any binary data is sent to the client (e.g. header("Content-Type: image/png")). + If Content-Type: header is sent, output character encoding conversion will not be performed. - Note that if 'Content-Type: text/*' was send using - header, the sending data is regarded as text, - encoding conversion will be performed using character encoding - settings. + Note that if 'Content-Type: text/*' is sent, the content body is regarded as text; conversion will take place. - If you want to output some binary data such as image from PHP - script with PHP 4.2.x or earlier, you must set output encoding to - "pass" using mb_http_output. + If you want to output binary data, such as an image, using PHP 4.2.x or earlier, + you must set output encoding to "pass" using mb_http_output. diff --git a/reference/mysqli/mysqli/close.xml b/reference/mysqli/mysqli/close.xml index c0e22e2a23..374da9c443 100644 --- a/reference/mysqli/mysqli/close.xml +++ b/reference/mysqli/mysqli/close.xml @@ -51,7 +51,7 @@ &reftitle.seealso; - mysqli_connect + mysqli::__construct mysqli_init mysqli_real_connect diff --git a/reference/mysqli/mysqli/poll.xml b/reference/mysqli/mysqli/poll.xml index 2bc02c5e3c..4b47a4d8b0 100644 --- a/reference/mysqli/mysqli/poll.xml +++ b/reference/mysqli/mysqli/poll.xml @@ -84,7 +84,7 @@ &reftitle.returnvalues; - Returns number of ready connections in success, &false; otherwise. + Returns number of ready connections upon success, &false; otherwise. @@ -111,9 +111,10 @@ do { foreach ($links as $link) { if ($result = $link->reap_async_query()) { print_r($result->fetch_row()); - mysqli_free_result($result); - $processed++; - } + if (is_object($result)) + mysqli_free_result($result); + } else die(sprintf("MySQLi Error: %s", mysqli_error($link))); + $processed++; } } while ($processed < count($all_links)); ?> diff --git a/reference/mysqli/quickstart.xml b/reference/mysqli/quickstart.xml index e972dc8960..349697d1e6 100644 --- a/reference/mysqli/quickstart.xml +++ b/reference/mysqli/quickstart.xml @@ -362,13 +362,9 @@ mysqli.default_socket=/tmp/mysql.sock calling mysqli_real_query followed by mysqli_store_result. - - The mysqli_multi_query function is used - with multiple statements. - - Bad coding style + Connecting to MySQL - Navigation through buffered results + Navigation through unbuffered results - indicates character range - - ] - terminates the character class - The following sections describe the use of each of the diff --git a/reference/svn/functions/svn-commit.xml b/reference/svn/functions/svn-commit.xml index 33c8c3d2fa..4083186d1a 100644 --- a/reference/svn/functions/svn-commit.xml +++ b/reference/svn/functions/svn-commit.xml @@ -12,14 +12,14 @@ arraysvn_commit stringlog arraytargets - booldontrecursefalse + boolrecursivetrue Commits changes made in the local working copy files enumerated in the targets array to the repository, with the log message log. Directories in the targets - array will be recursively committed unless dontrecurse - is set to true. + array will be recursively committed unless recursive + is set to false. @@ -57,12 +57,12 @@ - dontrecurse + recursive Boolean flag to disable recursive committing of directories in the targets array. - Default is &false;. + Default is &true;. diff --git a/reference/url/functions/urldecode.xml b/reference/url/functions/urldecode.xml index 2ba987237a..a2578ca464 100644 --- a/reference/url/functions/urldecode.xml +++ b/reference/url/functions/urldecode.xml @@ -50,13 +50,14 @@ \n"; - $i++; +$query = "my=apples&are=green+and+red"; + +foreach (explode('&', $query) as $chunk) { + $param = explode("=", $chunk); + + if ($param) { + printf("Value for parameter \"%s\" is \"%s\"
\n", urldecode($param[0]), urldecode($param[1])); + } } ?> ]]> diff --git a/reference/var/functions/floatval.xml b/reference/var/functions/floatval.xml index c3a13fd5f1..2992198652 100644 --- a/reference/var/functions/floatval.xml +++ b/reference/var/functions/floatval.xml @@ -38,6 +38,12 @@ The float value of the given variable. Empty arrays return 0, non-empty arrays return 1. + + Strings will most likely return 0 although this depends on the + leftmost characters of the string. The common rules of + float casting + apply. + &reftitle.examples;