Whitespace fixes, reformatting to bring all lines to 80 cols, grammatical fixes, removed redundant information

1 files changed, 81 insertions, 82 deletions

diff --git a/UPGRADING b/UPGRADING
index 1ea0199544..c034c1f4a2 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -44,9 +44,9 @@ UPGRADE NOTES - PHP 5.3
   successful.
 
 - The array functions natsort(), natcasesort(), usort(), uasort(), uksort(),
-  array_flip() and array_unique(), no longer accept objects passed as arguments.
-  If you need to access their properties using an object, you will need to cast
-  the objects to arrays first.
+  array_flip(), and array_unique() no longer accept objects passed as arguments.
+  If you need to use them to access an object's properties, you must cast the
+  object to an array first.
 
 - var_dump() output now includes private object members.
 
@@ -59,76 +59,76 @@ UPGRADE NOTES - PHP 5.3
 
 - clearstatcache() no longer clears the realpath cache by default.
 
-- realpath() is no longer system dependent and works the same on any platform.
+- realpath() is no longer system-dependent and works identically on all
+  platforms.
 
 - call_user_func() now propagates $this even if the callee is the parent class.
 
-- The filesystem functions opendir(), scandir() and dir() now use the default
-  context if no context is passed as an argument to them.
+- The filesystem functions opendir(), scandir(), and dir() now use the default
+  context if no context argument is passed.
 
 - The behaviour of functions with by-reference parameters called by value has
   changed. Where previously the function would accept the by-value argument, a
   warning is now emitted and all by-ref parameters are set to NULL.
 
-- There is now native support for the following math functions: asinh(), acosh(),
-  atanh(), log1p() and expm1().
+- There is now native support for the following math functions: asinh(),
+  acosh(), atanh(), log1p(), and expm1().
 
 - In the GD extension, there is now pixelation support available through
   the imagefilter() function.
 
-- crypt() now has Blowfish and extended DES support, and crypt() features are now
-  100% portable. PHP has its own internal crypt implementation which drops into
-  place when support for crypt or crypt_r() is not found.
+- crypt() now has Blowfish and extended DES support, and crypt() features are
+  now 100% portable. PHP has its own internal crypt implementation which drops
+  into place when system support for crypt or crypt_r() is not found.
 
 - get_cfg_var() is now able to return "array" INI options.
 
-- Stream wrappers can now be used by include_path().
+- Stream wrappers can now be used by the include_path INI directive.
 
-- There are new parameters in:
-     clearstatcache(): clear_realpath_cache and filename.
-     copy(): context.
-     fgetcsv(): escape.
-     ini_get_all(): details.
-     json_encode(): options.
-     json_decode(): depth.
-     nl2br(): is_xhtml.
-     parse_ini_file(): scanner_mode.
-     round(): mode.
-     stream_context_create(): params.
-     strstr(), stristr(): before_needle.
-     sybase_connect(): new.
-
-- And new mode options for fopen, 'n' (O_NONBLOCK)
-
-- The new mysqlnd library necessitates using MySQL's newer 41 byte password format.
-  Continued use of the old 16 byte passwords will cause mysql_connect() to produce
-  the following error message: "mysqlnd cannot connect to MySQL 4.1+ using old
-  authentication"
-
-- The dl() function is now disabled by default, and only available under the cli,
-  cgi and the embed SAPIs.
-
-- Changed opendir(), dir() and scandir() to use default context when no context
-  argument is passed.
-
-- mail() now supports logging of mail sent.
-
-- stream_select(), stream_set_blocking(), stream_set_timeout() and 
+- These functions now take new parameters:
+     clearstatcache(): $clear_realpath_cache and $filename.
+     copy(): $context
+     fgetcsv(): $escape
+     ini_get_all(): $details
+     json_encode(): $options
+     json_decode(): $depth
+     nl2br(): $is_xhtml
+     parse_ini_file(): $scanner_mode
+     round(): $mode
+     stream_context_create(): $params
+     strstr(), stristr(): $before_needle
+     sybase_connect(): $new
+
+- And new mode option for fopen: 'n' (O_NONBLOCK)
+
+- The new mysqlnd library necessitates using MySQL's newer 41-byte password
+  format. Continued use of the old 16 byte passwords will cause mysql_connect()
+  and other related functsins to produce the following error message:
+  "mysqlnd cannot connect to MySQL 4.1+ using old authentication"
+
+- The dl() function is now disabled by default, and only available under the
+  cli, cgi, and embed SAPIs.
+
+- mail() now supports the logging of sent mail.
+
+- stream_select(), stream_set_blocking(), stream_set_timeout(), and 
   stream_set_write_buffer() now work with user-space stream wrappers.
+
 ===================================
 3. Changes made to existing methods
 ===================================
 
-- The magic methods __get(), __set(), __isset(), __unset() and __call() should
+- The magic methods __get(), __set(), __isset(), __unset(), and __call() should
   always be public and can no longer be static. Method signatures are enforced.
 
-- The __call() magic method now gets invoked on private/protected method access.
+- The __call() magic method now gets invoked on access to private and protected
+  methods.
 
 - The __toString() magic method can no longer accept arguments.
 
 - There is a new magic method, __callStatic().
 
-- Internal count() vs count_elements() handler resolution rules have changed.
+- Internal count() vs. count_elements() handler resolution rules have changed.
   (This could potentially break custom PHP extensions.)
 
 - The trailing / has been removed from SplFileInfo and other related directory
@@ -137,7 +137,7 @@ UPGRADE NOTES - PHP 5.3
 - SplFileInfo::getpathinfo() now returns information about the path name.
 
 - There are new parameters in:
-     Exception::__construct(): previous.
+     Exception::__construct(): $previous
 
 ===================================
 4. Changes made to existing classes
@@ -153,10 +153,10 @@ UPGRADE NOTES - PHP 5.3
 - define_syslog_variables() is deprecated.
 
 - All ereg functions are deprecated and emit E_DEPRECATED errors.
-  Use PCRE (preg_*()) instead.
+  Use the PCRE family of functions (preg_*()) instead.
 
-- Deprecated session_register(), session_unregister() and
-  session_is_registered().
+- session_register(), session_unregister(), and session_is_registered() are now
+  deprecated. Use the $_SESSION superglobal array instead.
 
 - The following ini directives will now emit an E_DEPRECATED warning 
   upon startup if they are activated:
@@ -173,7 +173,7 @@ UPGRADE NOTES - PHP 5.3
 6. Undeprecated
 ===============
 
-- By popular request, is_a() is no longer marked deprecated.
+- By popular request, is_a() is no longer deprecated.
 
 ==============
 7. Extensions:
@@ -195,10 +195,10 @@ UPGRADE NOTES - PHP 5.3
 
      c. with changed behaviour
 
-        - dns: dns_check_record() will now return an extra "entries" indice,
+        - dns: dns_check_record() will now return an extra "entries" index,
           containing the TXT elements.
 
-        - datetime: date/timefunctions will no longer use the TZ environment
+        - datetime: date/time functions will no longer use the TZ environment
           variable to guess which timezone should be used.
 
         - cURL now supports SSH
@@ -211,10 +211,10 @@ UPGRADE NOTES - PHP 5.3
           that references a persistent connection going out of scope, will now
           roll back any uncommitted transaction. You should explicitly commit or
           rollback as needed.
-          Setting oci8.old_oci_close_semantics=On in php.ini gives the old
-          behaviour.
+          The old behavior can be enabled with the INI directive
+          oci8.old_oci_close_semantics.
 
-        - openssl: There is now support for OpenSSL digest and cipher functions.
+        - openssl: OpenSSL digest and cipher functions are now supported.
           It is also now possible to access the internal values of DSA, RSA and
           DH keys.
 
@@ -222,8 +222,7 @@ UPGRADE NOTES - PHP 5.3
           open_basedir restrictions apply, unless "/tmp" is explicitly added to
           the list of allowed paths.
 
-        - SOAP: Now supports sending user supplied HTTP headers.
-
+        - SOAP: Now supports sending user-supplied HTTP headers.
 
      d. no longer possible to disable
 
@@ -231,12 +230,11 @@ UPGRADE NOTES - PHP 5.3
         - Reflection
         - SPL
 
-
 ==========================
 8. Changes in SAPI support
 ==========================
 
-- A new SAPI is now available called litespeed.
+- A new "litespeed" SAPI is now available.
 
 - FastCGI is now always enabled and can not be disabled. See sapi/cgi/CHANGES
   for more details.
@@ -245,19 +243,17 @@ UPGRADE NOTES - PHP 5.3
   repeated several times.
  
 - CGI/FastCGI now has support for .htaccess style user-defined php.ini files.
+  See the new user_ini.filename and user_ini.cache_ttl INI directives.
 
 ============================
 9. Changes in INI directives
 ============================
 
-- zend_extension_debug and zend_extension_ts have been removed.
-  Instead use the zend_extension directive to load all Zend Extensions.
+- zend_extension_debug and zend_extension_ts have been removed. Always use the
+  zend_extension directive to load Zend Extensions.
 
-- zend.ze1_compatibility_mode has been removed. If this ini directive is set 
-  to on, then an E_ERROR is emitted at startup.
-
-- A new user initialization mechanism and config variables have been added:
-  user_ini.filename and user_ini.cache_ttl
+- zend.ze1_compatibility_mode has been removed. If this ini directive is set to
+  on, then an E_ERROR is emitted at startup.
 
 - There is now support for special sections: [PATH=/opt/httpd/www.example.com/]
   and [HOST=www.example.com]. Directives set in these sections cannot be
@@ -269,7 +265,7 @@ UPGRADE NOTES - PHP 5.3
 - It is now possible to use the full path to load modules using the "extension"
   directive.
 
-- "ini-variables" can now be used almost anywhere in a php.ini file.
+- "ini variables" can now be used almost anywhere in a php.ini file.
 
 - It is now possible to use alphanumeric or variable indices in ini option
   arrays.
@@ -289,7 +285,7 @@ UPGRADE NOTES - PHP 5.3
   Static HEREDOCs can be used to initialize static variables and class members
   or constants:
 
-      static $foo = <<<LABEL
+      static $foo = <<<'LABEL'
       No variables here...
       LABEL;
 
@@ -302,6 +298,9 @@ UPGRADE NOTES - PHP 5.3
       namespace my\name;
       $obj = new \my\name\MyClass;
 
+      use \my\name\MyClass as MyClass;
+      $obj = new MyClass;
+
 ===================
 11. Windows support
 ===================
@@ -315,23 +314,24 @@ UPGRADE NOTES - PHP 5.3
   imagecolorclosesthwb(), mcrypt_create_iv(), inet_ntop(), inet_pton(), 
   getmxrr(), checkdnsrr(), dns_get_record(), linkinfo(), readlink(), 
   symlink(), link(), fnmatch(), stream_socket_pair(), time_nanosleep(), 
-  time_sleep_until() and socket_create_pair().
+  time_sleep_until(), and socket_create_pair().
 
 - Improved portability of stat(), touch(), filemtime(), filesize() and related
-  functions (100% portable for the available data)
+  functions (100% portable for the available data).
 
 - The PDO_OCI php_pdo_oci8.dll library (for use with Oracle version 8 client
-  libraries) is no longer being built. Instead, use php_pdo_oci.dll (note no '8')
-  with Oracle 10 or 11 client libraries. Connection to other database versions
-  is supported.
-
-- For the OCI8 extension, a new library php_oci8_11g.dll is available in addition to
-  php_oci8.dll. Only one can be enabled at any time. Use php_oci8.dll with Oracle 10.2
-  client libraries. Use php_oci8_11g.dll with Oracle 11 client libraries. Connection
-  to other database versions is supported.
-
-- It's now possible to use hardlinks on Windows using the link() function, 
-  and symbolic links via the symlink() function. Hardlinks are available 
+  libraries) is no longer being built. Instead, use php_pdo_oci.dll (note no
+  '8') with Oracle 10 or 11 client libraries. Connection to other database
+  versions is supported.
+
+- For the OCI8 extension, a new library php_oci8_11g.dll is available in
+  addition to php_oci8.dll. Only one can be enabled at any time. Use
+  php_oci8.dll with Oracle 10.2 client libraries. Use php_oci8_11g.dll with
+  Oracle 11 client libraries. Connection to other database versions is
+  supported.
+
+- It is now possible to create hard links on Windows using the link() function,
+  and symbolic links using the symlink() function. Hard links are available
   as of Windows 2000 and symbolic links as of Windows Vista.
 
 ===================
@@ -541,4 +541,3 @@ UPGRADE NOTES - PHP 5.3
        - PDO_Firebird: PDO::FB_ATTR_DATE_FORMAT
                        PDO::FB_ATTR_TIME_FORMAT
                        PDO::FB_ATTR_TIMESTAMP_FORMAT
-