MFH: Fix typo (avaliable -> available). (bug #28725)

diff --git a/ChangeLog b/ChangeLog
index f9cf05f815dfe13de82dce4e09f0b94bfd6fe00e..a1a23645c8b3f711db09ffc649af1fce39ad8a55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -148,9 +148,9 @@
        * Changed all argument parsing to use the new zend_parse_parameters()
        * If a function is unavailable due to lack of support for a certain
       feature,
-         do not make the function avaliable, rather then making it print an
+         do not make the function available, rather then making it print an
       error
-         saying that the functionality offered by the function is not avaliable.
+         saying that the functionality offered by the function is not available.
        * Lots of WS fixes all over the file.
        * Change strcpy() to strncpy() to prevent possible buffer overflows.
       Fixed a bug in ncurses_pair_content(), 1st parameter was wrong.
@@ -1384,7 +1384,7 @@
 2002-12-11  Ilia Alshanetsky  <ilia@prohost.org>
 
     * ext/exif/exif.c:
-      decode variable is only used when mbstring is avaliable.
+      decode variable is only used when mbstring is available.
 
     * ext/openssl/openssl.c:
       ZTS fix.
@@ -2193,7 +2193,7 @@
 2002-12-04  Ilia Alshanetsky  <ilia@prohost.org>
 
     * ext/gd/gd.c:
-      MFH (build fix, when xpm support is not avaliable).
+      MFH (build fix, when xpm support is not available).
 
 2002-12-04  Rasmus Lerdorf  <rasmus@lerdorf.on.ca>
 
@@ -5864,7 +5864,7 @@
       Compile warning fix.
 
     * ext/mbstring/tests/overload.phpt:
-      Added a skip condition for when mail() function is not avaliable.
+      Added a skip condition for when mail() function is not available.
 
     * ext/mbstring/tests/mb_send_mail05.phpt
       ext/mbstring/tests/mb_send_mail06.phpt:
@@ -6758,7 +6758,7 @@
       ext/standard/tests/strings/htmlentities07.phpt
       ext/standard/tests/strings/htmlentities08.phpt
       ext/standard/tests/strings/htmlentities09.phpt:
-      Added skip conditions in the event the required charset is not avaliabled.
+      Added skip conditions in the event the required charset is not availabled.
       Removed old (commented out) module loading code.
 
     * run-tests.php:
@@ -6766,11 +6766,11 @@
 
     * ext/pspell/tests/01pspell_basic.phpt:
       Added a skip condition if the English dictionary needed for the test is not
-      avaliable.
+      available.
 
     * ext/pcntl/tests/001.phpt:
       Added a skip condition in the event posix_kill(), which is used by the test
-      is not avaliable.
+      is not available.
 
     * ext/exif/exif.c:
       
@@ -6903,7 +6903,7 @@
       main/safe_mode.c:
       
       Instead of checking whether realpath exists based on OS. Use the
-      HAVE_REALPATH define, which is set if realpath() is avaliable. This patch
+      HAVE_REALPATH define, which is set if realpath() is available. This patch
       also resolves bug #18868.
 
 2002-11-06  Sascha Schumann  <sascha@schumann.cx>
@@ -9030,7 +9030,7 @@
 
     * ext/standard/tests/strings/strtoupper.phpt:
     Added 'skip logic' to the test on platforms where the locale required by
-    this test is not avaliable.
+    this test is not available.
 
 2002-10-23  Melvyn Sopacua  <msopacua@idg.nl>
 

diff --git a/ext/gd/tests/gif2gd.phpt b/ext/gd/tests/gif2gd.phpt
index 3eee211871c74c503a9872fd2ee51fab4619b5ac..75291777d8b50c0d547d2b2cc9f17e62122bd1ae 100644 (file)
--- a/ext/gd/tests/gif2gd.phpt
+++ b/ext/gd/tests/gif2gd.phpt
@@ -3,7 +3,7 @@ gif --> gd1/gd2 conversion test
 --SKIPIF--
 <?php 
        if (!extension_loaded('gd')) {
-               die("skip gd extension not avaliable.");
+               die("skip gd extension not available.");
        }
        if (!GD_BUNDLED) {
                die("skip external GD libraries always fail");

diff --git a/ext/gd/tests/gif2jpg.phpt b/ext/gd/tests/gif2jpg.phpt
index 38a0493ff9f889656133a58714ea21cc429b1fc4..efea3525cfe9b675da2da0c6a1ac0132b0a3d0a7 100644 (file)
--- a/ext/gd/tests/gif2jpg.phpt
+++ b/ext/gd/tests/gif2jpg.phpt
@@ -3,7 +3,7 @@ gif --> jpeg conversion test
 --SKIPIF--
 <?php 
        if (!extension_loaded('gd')) {
-               die("skip gd extension not avaliable.");
+               die("skip gd extension not available.");
        }
        if (!GD_BUNDLED) {
                die("skip external GD libraries always fail");

diff --git a/ext/gd/tests/gif2png.phpt b/ext/gd/tests/gif2png.phpt
index 70ddc379376409be37b0673639d486be14aa43ff..6ac99bb22fa4675df9ca3f8ea51740b1740f5ced 100644 (file)
--- a/ext/gd/tests/gif2png.phpt
+++ b/ext/gd/tests/gif2png.phpt
@@ -3,7 +3,7 @@ gif --> png conversion test
 --SKIPIF--
 <?php 
        if (!extension_loaded('gd')) {
-               die("skip gd extension not avaliable.");
+               die("skip gd extension not available.");
        }
        if (!GD_BUNDLED) {
                die("skip external GD libraries always fail");

diff --git a/ext/gd/tests/jpeg2png.phpt b/ext/gd/tests/jpeg2png.phpt
index e345a51abd90018d82930b3b195a38d4c9097b27..c86cb4fe4a8a247d18941548e871a3b09518bb36 100644 (file)
--- a/ext/gd/tests/jpeg2png.phpt
+++ b/ext/gd/tests/jpeg2png.phpt
@@ -3,7 +3,7 @@ jpeg <--> png conversion test
 --SKIPIF--
 <?php 
        if (!extension_loaded('gd')) {
-               die("skip gd extension not avaliable.");
+               die("skip gd extension not available.");
        }
        if (!GD_BUNDLED) {
                die("skip external GD libraries always fail");

diff --git a/ext/gd/tests/jpg2gd.phpt b/ext/gd/tests/jpg2gd.phpt
index c1da986f211d88e835ec3bf6d80a5a2f4fd725d2..24d1940faf3c0cb6c80db1d9cec595b8550d1fe9 100644 (file)
--- a/ext/gd/tests/jpg2gd.phpt
+++ b/ext/gd/tests/jpg2gd.phpt
@@ -3,7 +3,7 @@ jpeg <--> gd1/gd2 conversion test
 --SKIPIF--
 <?php 
        if (!extension_loaded('gd')) {
-               die("skip gd extension not avaliable.");
+               die("skip gd extension not available.");
        }
        if (!GD_BUNDLED) {
                die("skip external GD libraries always fail");

diff --git a/ext/gd/tests/png2gd.phpt b/ext/gd/tests/png2gd.phpt
index 9a25c5a7bc59c30fe5e845f814dfafac4cc64c68..d74e888d6c1566b2104ea298dfb0f5233d1fe694 100644 (file)
--- a/ext/gd/tests/png2gd.phpt
+++ b/ext/gd/tests/png2gd.phpt
@@ -3,7 +3,7 @@ png <--> gd1/gd2 conversion test
 --SKIPIF--
 <?php 
        if (!extension_loaded('gd')) {
-               die("skip gd extension not avaliable.");
+               die("skip gd extension not available.");
        }
        if (!GD_BUNDLED) {
                die("skip external GD libraries always fail");

diff --git a/ext/gd/tests/xpm2gd.phpt b/ext/gd/tests/xpm2gd.phpt
index 617d634e6aa4decae8cdd6e66608235ae96fadf8..9c6cca4eb9ad83ad11b1fa7d2e8b70f84e56ff1d 100644 (file)
--- a/ext/gd/tests/xpm2gd.phpt
+++ b/ext/gd/tests/xpm2gd.phpt
@@ -3,7 +3,7 @@ xpm --> gd1/gd2 conversion test
 --SKIPIF--
 <?php 
        if (!extension_loaded('gd')) {
-               die("skip gd extension not avaliable.");
+               die("skip gd extension not available.");
        }
        if (!GD_BUNDLED) {
                die("skip external GD libraries always fail");

diff --git a/ext/gd/tests/xpm2jpg.phpt b/ext/gd/tests/xpm2jpg.phpt
index 462d42680a4e8f5b176b82979d2e6bf829ceb4b1..3df491ce44effacda8d1217a2e6c8e00059edf8b 100644 (file)
--- a/ext/gd/tests/xpm2jpg.phpt
+++ b/ext/gd/tests/xpm2jpg.phpt
@@ -3,7 +3,7 @@ xpm --> jpeg conversion test
 --SKIPIF--
 <?php 
        if (!extension_loaded('gd')) {
-               die("skip gd extension not avaliable.");
+               die("skip gd extension not available.");
        }
        if (!GD_BUNDLED) {
                die("skip external GD libraries always fail");

diff --git a/ext/gd/tests/xpm2png.phpt b/ext/gd/tests/xpm2png.phpt
index ff8d403333d70c0eccbddb4268e62aa1fc2f516f..520cc3da0a74d8d28ab3902fef5555327856b215 100644 (file)
--- a/ext/gd/tests/xpm2png.phpt
+++ b/ext/gd/tests/xpm2png.phpt
@@ -3,7 +3,7 @@ xpm --> png conversion test
 --SKIPIF--
 <?php 
        if (!extension_loaded('gd')) {
-               die("skip gd extension not avaliable.");
+               die("skip gd extension not available.");
        }
        if (!GD_BUNDLED) {
                die("skip external GD libraries always fail");

diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index 5cbb91738b55590913933bffc34ad61c2decf66f..2be8fbb815121c6d690eeafd375c86f85c59d1ba 100644 (file)
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -498,7 +498,7 @@ EXEC SQL END DECLARE SECTION;
                int host_len = 0, user_len = 0, passwd_len = 0;
                host = user = passwd = NULL;
 
-               /* set default values if any are avaliable */
+               /* set default values if any are available */
                if (IFXG(default_host)) {
                        host = IFXG(default_host);
                        host_len = strlen(host);

diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt
index 7d1dc981d2abd058e11d7d441df3d0d739c1566a..7033424b80e7b1b6ccabbea6b356ebca64d1756a 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail05.phpt
+++ b/ext/mbstring/tests/mb_send_mail05.phpt
@@ -6,7 +6,7 @@ if (@mb_send_mail() === false || !mb_language("Simplified Chinese")) {
        die("skip mb_send_mail() not available");
 }
 if (!@mb_internal_encoding('GB2312')) {
-       die("skip GB2312 encoding is not avaliable on this platform");
+       die("skip GB2312 encoding is not available on this platform");
 }
 ?>
 --INI--

diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt
index 92087f96490797754289bd10abfa04466b0cf2b1..2e8c1512848402772d774962c7245777cbd2d226 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail06.phpt
+++ b/ext/mbstring/tests/mb_send_mail06.phpt
@@ -6,7 +6,7 @@ if (@mb_send_mail() === false || !mb_language("Traditional Chinese")) {
        die("skip mb_send_mail() not available");
 }
 if (!@mb_internal_encoding('BIG5')) {
-       die("skip BIG5 encoding is not avaliable on this platform");
+       die("skip BIG5 encoding is not available on this platform");
 }
 ?>
 --INI--

diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt
index ae429f3ced52a350fa6eb251d604e62d7a2cf9ee..21fdaa597c5afa7e466a30b990f9bddba735c25e 100644 (file)
--- a/ext/mbstring/tests/mb_send_mail07.phpt
+++ b/ext/mbstring/tests/mb_send_mail07.phpt
@@ -6,7 +6,7 @@ if (@mb_send_mail() === false || !mb_language("Korean")) {
        die("skip mb_send_mail() not available");
 }
 if (!@mb_internal_encoding('ISO-2022-KR')) {
-       die("skip ISO-2022-KR encoding is not avaliable on this platform");
+       die("skip ISO-2022-KR encoding is not available on this platform");
 }
 ?>
 --INI--

diff --git a/ext/mhash/tests/skip.inc b/ext/mhash/tests/skip.inc
index 81912d21c84b40f57666e2e90f3cb1e691d45eae..ff60bfff275bcdd42f56007f0577cb057f3b1476 100644 (file)
--- a/ext/mhash/tests/skip.inc
+++ b/ext/mhash/tests/skip.inc
@@ -1,5 +1,5 @@
 <?php
 if (!extension_loaded("mhash")) {
-       die("skip mhash extension is not avaliable");
+       die("skip mhash extension is not available");
 }
 ?>
\ No newline at end of file

diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c
index 029e37d72315f95678f009ff281e91ad703f82b8..3be2262f57c2c9d2247c23427508098f69e005d1 100644 (file)
--- a/ext/mime_magic/mime_magic.c
+++ b/ext/mime_magic/mime_magic.c
@@ -314,7 +314,7 @@ PHP_FUNCTION(mime_content_type)
        }
 
        if (conf->magic == (struct magic *)-1) {
-               php_error(E_ERROR, MODNAME " could not be initialized, magic file %s is not avaliable",  conf->magicfile);
+               php_error(E_ERROR, MODNAME " could not be initialized, magic file %s is not available",  conf->magicfile);
                RETURN_FALSE;
        } 
 

diff --git a/ext/pcntl/tests/001.phpt b/ext/pcntl/tests/001.phpt
index 27aff8bbe484b55c62181f002323ed7d27da60e8..642525976a6d4b36ed6c41cf44b08fa066b62d9f 100644 (file)
--- a/ext/pcntl/tests/001.phpt
+++ b/ext/pcntl/tests/001.phpt
@@ -3,7 +3,7 @@ Test pcntl wait functionality
 --SKIPIF--
 <?php
        if (!extension_loaded("pcntl")) print "skip"; 
-       if (!function_exists("posix_kill")) print "skip posix_kill() not avaliable";
+       if (!function_exists("posix_kill")) print "skip posix_kill() not available";
 ?>
 --POST--
 --GET--

diff --git a/ext/pspell/tests/01pspell_basic.phpt b/ext/pspell/tests/01pspell_basic.phpt
index 5a25e35be8dfe7874fd269cd3eb810a2dd004f4a..fd97bcf62daeaa0fa4fa6def94ff79314e09b474 100644 (file)
--- a/ext/pspell/tests/01pspell_basic.phpt
+++ b/ext/pspell/tests/01pspell_basic.phpt
@@ -4,7 +4,7 @@ pspell basic tests (warning: may fail with pspell/aspell < GNU Aspell 0.50.3)
 <?php 
        if (!extension_loaded("pspell")) print "skip"; 
        if (!@pspell_new ("en", "", "", "", (PSPELL_FAST|PSPELL_RUN_TOGETHER))) {
-               die("skip English dictionary is not avaliable");
+               die("skip English dictionary is not available");
        }
 ?>
 --POST--

diff --git a/ext/shmop/tests/001.phpt b/ext/shmop/tests/001.phpt
index 1a1b926308d05bd423773537be2c8923c4815dde..fc293c82ec8367ebc48594fc61397a2862ee88cf 100644 (file)
--- a/ext/shmop/tests/001.phpt
+++ b/ext/shmop/tests/001.phpt
@@ -3,7 +3,7 @@ shmop extension test
 --SKIPIF--
 <?php
        if (!extension_loaded("shmop")) {
-               die("skip shmop() extension not avaliable");
+               die("skip shmop() extension not available");
        }
 ?>
 --FILE--

diff --git a/ext/standard/tests/image/getimagesize_swc.phpt b/ext/standard/tests/image/getimagesize_swc.phpt
index b9b83f437372f298d6160fce1a1bbb7a8f960395..f8c74498a43c9a671f757094f18743baa96fa5f2 100644 (file)
--- a/ext/standard/tests/image/getimagesize_swc.phpt
+++ b/ext/standard/tests/image/getimagesize_swc.phpt
@@ -3,7 +3,7 @@ GetImageSize() for compressed swf files
 --SKIPIF--
 <?php
        if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
-               die("skip zlib extension is not avaliable");
+               die("skip zlib extension is not available");
        }
 ?>
 --FILE--

diff --git a/pear/CMD.php b/pear/CMD.php
index 7e82ff24b588ba7de59d74820f2f9f2be20f8fb2..2bf82def352b54cf916c4867f671459b4f47a108 100755 (executable)
--- a/pear/CMD.php
+++ b/pear/CMD.php
@@ -231,7 +231,7 @@ class Cmd extends PEAR
     /**
      * Errorhandler. If option CMD_VERBOSE is true,
      * the error is printed to stdout, otherwise it 
-     * is avaliable in lastError
+     * is available in lastError
      *
      * @return bool always returns true 
      *

diff --git a/run-tests.php b/run-tests.php
index ca608c3a763f133f1ebddf74681dca83ca6930af..0cac9cfa09100d61695b127724776acfc51ea901 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -37,7 +37,7 @@
  */
 
 
-/* Sanity check to ensure that pcre extension needed by this script is avaliable.
+/* Sanity check to ensure that pcre extension needed by this script is available.
  * In the event it is not, print a nice error message indicating that this script will
  * not run without it.
  */
@@ -568,7 +568,7 @@ TEST $file
        }
        fclose($fp);
 
-       /* For GET/POST tests, check if cgi sapi is avaliable and if it is, use it. */
+       /* For GET/POST tests, check if cgi sapi is available and if it is, use it. */
        if ((!empty($section_text['GET']) || !empty($section_text['POST']))) {
                if (file_exists("./sapi/cgi/php")) {
                        $old_php = $php;

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 62f476f35d32355489e8f3f3115096973d4f6da9..cc4390bf1272bf55ec3c3283a203096a5a829c41 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -140,7 +140,7 @@ php_apache_sapi_read_post(char *buf, uint count_bytes TSRMLS_DC)
        /*
         * This loop is needed because ap_get_brigade() can return us partial data
         * which would cause premature termination of request read. Therefor we
-        * need to make sure that if data is avaliable we fill the buffer completely.
+        * need to make sure that if data is available we fill the buffer completely.
         */
 
        while (ap_get_brigade(r->input_filters, brigade, AP_MODE_READBYTES, APR_BLOCK_READ, len) == APR_SUCCESS) {

diff --git a/tests/lang/overload_leak.phpt b/tests/lang/overload_leak.phpt
index 4772ddec8a1f0d9a9dfdc17edc624d7852344f3d..2385e46973ccccc9d4c7fffef39828b7782db793 100644 (file)
--- a/tests/lang/overload_leak.phpt
+++ b/tests/lang/overload_leak.phpt
@@ -2,7 +2,7 @@
 Memory leaks occur within an overloaded method that returns a reference
 --SKIPIF--
 <?php
-       if (!function_exists('overload')) die('SKIP overload() not avaliable');
+       if (!function_exists('overload')) die('SKIP overload() not available');
 ?>
 --FILE--
 <?php