pierrick Sun, 03 Apr 2011 21:46:52 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309927
Log:
Fix common typos in the source code (Reported in Bug #54065)
# External libraries were excluded
# Thanks eitan at eitanadler dot com for the first patch :)
Bug: http://bugs.php.net/54065 (Open) fix common typos in documentation
Changed paths:
U php/php-src/branches/PHP_5_3/INSTALL
U php/php-src/branches/PHP_5_3/ext/imap/php_imap.c
U php/php-src/branches/PHP_5_3/ext/pcntl/tests/pcntl_fork_basic.phpt
U php/php-src/branches/PHP_5_3/ext/snmp/snmp.c
U php/php-src/branches/PHP_5_3/ext/spl/internal/appenditerator.inc
U php/php-src/branches/PHP_5_3/ext/spl/internal/cachingiterator.inc
U php/php-src/branches/PHP_5_3/ext/spl/internal/regexiterator.inc
U php/php-src/branches/PHP_5_3/ext/standard/array.c
U
php/php-src/branches/PHP_5_3/ext/standard/tests/array/array_shift_variation5.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/lstat_stat_variation9.phpt
U php/php-src/branches/PHP_5_3/ext/xmlreader/php_xmlreader.c
U php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h
U php/php-src/branches/PHP_5_3/main/streams/php_stream_filter_api.h
U php/php-src/branches/PHP_5_3/sapi/litespeed/README
U
php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/gtTestSubject.php
U
php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php
U
php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
U php/php-src/branches/PHP_5_3/win32/install.txt
U php/php-src/trunk/INSTALL
U php/php-src/trunk/ext/imap/php_imap.c
U php/php-src/trunk/ext/pcntl/tests/pcntl_fork_basic.phpt
U php/php-src/trunk/ext/spl/internal/appenditerator.inc
U php/php-src/trunk/ext/spl/internal/cachingiterator.inc
U php/php-src/trunk/ext/spl/internal/regexiterator.inc
U php/php-src/trunk/ext/standard/array.c
U php/php-src/trunk/ext/standard/tests/array/array_shift_variation5.phpt
U php/php-src/trunk/ext/standard/tests/file/lstat_stat_variation9.phpt
U php/php-src/trunk/ext/xmlreader/php_xmlreader.c
U php/php-src/trunk/main/streams/php_stream_context.h
U php/php-src/trunk/main/streams/php_stream_filter_api.h
U php/php-src/trunk/php.ini-development
U php/php-src/trunk/php.ini-production
U php/php-src/trunk/sapi/litespeed/README
U php/php-src/trunk/scripts/dev/generate-phpt/src/gtTestSubject.php
U
php/php-src/trunk/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php
U php/php-src/trunk/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
U php/php-src/trunk/win32/install.txt
Modified: php/php-src/branches/PHP_5_3/INSTALL
===================================================================
--- php/php-src/branches/PHP_5_3/INSTALL 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/INSTALL 2011-04-03 21:46:52 UTC (rev 309927)
@@ -1535,7 +1535,7 @@
core directives is available in the appendix. Probably not all PHP
directives are documented in the manual though. For a complete list of
directives available in your PHP version, please read your well
- commented php.ini file. Alternatively, you may find the the latest
+ commented php.ini file. Alternatively, you may find the latest
php.ini from SVN helpful too.
Example 6-1. php.ini example
Modified: php/php-src/branches/PHP_5_3/ext/imap/php_imap.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/imap/php_imap.c 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/ext/imap/php_imap.c 2011-04-03 21:46:52 UTC (rev 309927)
@@ -4299,7 +4299,7 @@
charset_token = offset;
}
/* Return the rest of the data as unencoded, as it was either unencoded or was missing separators
- which rendered the the remainder of the string impossible for us to decode. */
+ which rendered the remainder of the string impossible for us to decode. */
memcpy(text, &string[charset_token], end - charset_token); /* Extract unencoded text from string */
text[end - charset_token] = 0x00;
MAKE_STD_ZVAL(myobject);
Modified: php/php-src/branches/PHP_5_3/ext/pcntl/tests/pcntl_fork_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pcntl/tests/pcntl_fork_basic.phpt 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/ext/pcntl/tests/pcntl_fork_basic.phpt 2011-04-03 21:46:52 UTC (rev 309927)
@@ -11,7 +11,7 @@
?>
--FILE--
<?php
-echo "*** Test by calling method or function with its expected arguments, first print the child PID and the the father ***\n";
+echo "*** Test by calling method or function with its expected arguments, first print the child PID and the father ***\n";
$pid = pcntl_fork();
if ($pid > 0) {
@@ -22,6 +22,6 @@
}
?>
--EXPECTF--
-*** Test by calling method or function with its expected arguments, first print the child PID and the the father ***
+*** Test by calling method or function with its expected arguments, first print the child PID and the father ***
int(0)
int(%d)
Modified: php/php-src/branches/PHP_5_3/ext/snmp/snmp.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/snmp/snmp.c 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/ext/snmp/snmp.c 2011-04-03 21:46:52 UTC (rev 309927)
@@ -1160,7 +1160,7 @@
/* {{{ proto void php_snmpv3(INTERNAL_FUNCTION_PARAMETERS, int st)
*
* Generic SNMPv3 object fetcher
-* From here is passed on the the common internal object fetcher.
+* From here is passed on the common internal object fetcher.
*
* st=SNMP_CMD_GET snmp3_get() - query an agent and return a single value.
* st=SNMP_CMD_GETNEXT snmp3_getnext() - query an agent and return the next single value.
Modified: php/php-src/branches/PHP_5_3/ext/spl/internal/appenditerator.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/internal/appenditerator.inc 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/ext/spl/internal/appenditerator.inc 2011-04-03 21:46:52 UTC (rev 309927)
@@ -31,7 +31,7 @@
* @param $it Iterator to append
*
* If the current state is invalid but the appended iterator is valid
- * the the AppendIterator itself becomes valid. However there will be no
+ * the AppendIterator itself becomes valid. However there will be no
* call to $it->rewind(). Also if the current state is invalid the inner
* ArrayIterator will be rewound und forwarded to the appended element.
*/
@@ -119,4 +119,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: php/php-src/branches/PHP_5_3/ext/spl/internal/cachingiterator.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/internal/cachingiterator.inc 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/ext/spl/internal/cachingiterator.inc 2011-04-03 21:46:52 UTC (rev 309927)
@@ -86,7 +86,7 @@
$this->it->next();
}
- /** @return whether teh iterator is valid
+ /** @return whether the iterator is valid
*/
function valid()
{
@@ -154,4 +154,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: php/php-src/branches/PHP_5_3/ext/spl/internal/regexiterator.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/internal/regexiterator.inc 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/ext/spl/internal/regexiterator.inc 2011-04-03 21:46:52 UTC (rev 309927)
@@ -19,7 +19,7 @@
*/
class RegexIterator extends FilterIterator
{
- const USE_KEY = 0x00000001; /**< If present in $flags the the key is
+ const USE_KEY = 0x00000001; /**< If present in $flags the key is
used rather then the current value. */
const MATCH = 0; /**< Mode: Executed a plain match only */
Modified: php/php-src/branches/PHP_5_3/ext/standard/array.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/array.c 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/ext/standard/array.c 2011-04-03 21:46:52 UTC (rev 309927)
@@ -606,7 +606,7 @@
/* Clear FCI cache otherwise : for example the same or other array with
* (partly) the same key values has been sorted with uasort() or
- * other sorting function the comparison is cached, however the the name
+ * other sorting function the comparison is cached, however the name
* of the function for comparison is not respected. see bug #28739 AND #33295
*
* Following defines will assist in backup / restore values. */
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/array/array_shift_variation5.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/array/array_shift_variation5.phpt 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/array/array_shift_variation5.phpt 2011-04-03 21:46:52 UTC (rev 309927)
@@ -9,7 +9,7 @@
/*
* Use the result of one call to array_shift
- * as the the $stack argument of another call to array_shift()
+ * as the $stack argument of another call to array_shift()
* When done in one statement causes strict error messages.
*/
@@ -42,4 +42,4 @@
-- Correct Method: --
string(4) "zero"
-Done
\ No newline at end of file
+Done
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/lstat_stat_variation9.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/lstat_stat_variation9.phpt 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/lstat_stat_variation9.phpt 2011-04-03 21:46:52 UTC (rev 309927)
@@ -36,7 +36,7 @@
$old_stat = stat($dirname);
-/* now delete teh surdir and file and record the stat */
+/* now delete the surdir and file and record the stat */
unlink("$dirname/lstat_stat_variation9a.tmp");
rmdir("$dirname/lstat_stat_variation9_subdir");
Modified: php/php-src/branches/PHP_5_3/ext/xmlreader/php_xmlreader.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/xmlreader/php_xmlreader.c 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/ext/xmlreader/php_xmlreader.c 2011-04-03 21:46:52 UTC (rev 309927)
@@ -860,7 +860,7 @@
/* }}} */
/* {{{ proto boolean XMLReader::open(string URI [, string encoding [, int options]])
-Sets the URI that the the XMLReader will parse. */
+Sets the URI that the XMLReader will parse. */
PHP_METHOD(xmlreader, open)
{
zval *id;
@@ -1021,7 +1021,7 @@
/* }}} */
/* {{{ proto boolean XMLReader::setRelaxNGSchema(string filename)
-Sets the string that the the XMLReader will parse. */
+Sets the string that the XMLReader will parse. */
PHP_METHOD(xmlreader, setRelaxNGSchema)
{
php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_FILE);
@@ -1029,7 +1029,7 @@
/* }}} */
/* {{{ proto boolean XMLReader::setRelaxNGSchemaSource(string source)
-Sets the string that the the XMLReader will parse. */
+Sets the string that the XMLReader will parse. */
PHP_METHOD(xmlreader, setRelaxNGSchemaSource)
{
php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_STRING);
@@ -1043,7 +1043,7 @@
*/
/* {{{ proto boolean XMLReader::XML(string source [, string encoding [, int options]])
-Sets the string that the the XMLReader will parse. */
+Sets the string that the XMLReader will parse. */
PHP_METHOD(xmlreader, XML)
{
zval *id;
Modified: php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h
===================================================================
--- php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/main/streams/php_stream_context.h 2011-04-03 21:46:52 UTC (rev 309927)
@@ -31,7 +31,7 @@
/* Attempt to fetch context from the zval passed,
If no context was passed, use the default context
- The the default context has not yet been created, do it now. */
+ The default context has not yet been created, do it now. */
#define php_stream_context_from_zval(zcontext, nocontext) ( \
(zcontext) ? zend_fetch_resource(&(zcontext) TSRMLS_CC, -1, "Stream-Context", NULL, 1, php_le_stream_context()) : \
(nocontext) ? NULL : \
Modified: php/php-src/branches/PHP_5_3/main/streams/php_stream_filter_api.h
===================================================================
--- php/php-src/branches/PHP_5_3/main/streams/php_stream_filter_api.h 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/main/streams/php_stream_filter_api.h 2011-04-03 21:46:52 UTC (rev 309927)
@@ -27,7 +27,7 @@
*
* Each stream can have a chain of filters for reading and another for writing.
*
- * When data is written to the stream, is is placed into a bucket and placed at
+ * When data is written to the stream, it is placed into a bucket and placed at
* the start of the input brigade.
*
* The first filter in the chain is invoked on the brigade and (depending on
Modified: php/php-src/branches/PHP_5_3/sapi/litespeed/README
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/litespeed/README 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/sapi/litespeed/README 2011-04-03 21:46:52 UTC (rev 309927)
@@ -20,7 +20,7 @@
usually, FastCGI PHP is not an option in shared hosting environment
due to lacking of this flexibility. LiteSpeed SAPI is carefully designed
to address this issue. PHP configurations can be modified the same way
-as that in mod_php with the the same configuration directives.
+as that in mod_php with the same configuration directives.
PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for
PHP scripting with LiteSpeed web server.
Modified: php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/gtTestSubject.php
===================================================================
--- php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/gtTestSubject.php 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/gtTestSubject.php 2011-04-03 21:46:52 UTC (rev 309927)
@@ -128,7 +128,7 @@
/**
- * Returns the argument list with teh greatest possible number of arguments.
+ * Returns the argument list with the greatest possible number of arguments.
*
* @return string
*/
@@ -163,4 +163,4 @@
return $this->initialisationStatements;
}
}
-?>
\ No newline at end of file
+?>
Modified: php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php
===================================================================
--- php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php 2011-04-03 21:46:52 UTC (rev 309927)
@@ -1,7 +1,7 @@
<?php
/**
- * Check that teh method name is valid
+ * Check that the method name is valid
*
*/
class gtIsValidMethod extends gtPreCondition {
@@ -25,4 +25,4 @@
return gtText::get('unknownMethod');
}
}
-?>
\ No newline at end of file
+?>
Modified: php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
===================================================================
--- php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/testcase/gtTestCase.php 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/scripts/dev/generate-phpt/src/testcase/gtTestCase.php 2011-04-03 21:46:52 UTC (rev 309927)
@@ -23,7 +23,7 @@
/**
- * Object containing teh ooptional sections that may be added to the test case
+ * Object containing the optional sections that may be added to the test case
*
* @var gtOptionalSections
*/
@@ -140,7 +140,7 @@
/**
- * Add FILE section closing tag to teh test case
+ * Add FILE section closing tag to the test case
*
*/
public function fileClosing() {
@@ -227,4 +227,4 @@
return $this->optionalSections;
}
}
-?>
\ No newline at end of file
+?>
Modified: php/php-src/branches/PHP_5_3/win32/install.txt
===================================================================
--- php/php-src/branches/PHP_5_3/win32/install.txt 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/branches/PHP_5_3/win32/install.txt 2011-04-03 21:46:52 UTC (rev 309927)
@@ -1427,7 +1427,7 @@
core directives is available in the appendix. Probably not all PHP
directives are documented in the manual though. For a complete list of
directives available in your PHP version, please read your well
- commented php.ini file. Alternatively, you may find the the latest
+ commented php.ini file. Alternatively, you may find the latest
php.ini from SVN helpful too.
Example 5-1. php.ini example
Modified: php/php-src/trunk/INSTALL
===================================================================
--- php/php-src/trunk/INSTALL 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/INSTALL 2011-04-03 21:46:52 UTC (rev 309927)
@@ -1527,7 +1527,7 @@
core directives is available in the appendix. Probably not all PHP
directives are documented in the manual though. For a complete list of
directives available in your PHP version, please read your well
- commented php.ini file. Alternatively, you may find the the latest
+ commented php.ini file. Alternatively, you may find the latest
php.ini from SVN helpful too.
Example 6-1. php.ini example
Modified: php/php-src/trunk/ext/imap/php_imap.c
===================================================================
--- php/php-src/trunk/ext/imap/php_imap.c 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/ext/imap/php_imap.c 2011-04-03 21:46:52 UTC (rev 309927)
@@ -4291,7 +4291,7 @@
charset_token = offset;
}
/* Return the rest of the data as unencoded, as it was either unencoded or was missing separators
- which rendered the the remainder of the string impossible for us to decode. */
+ which rendered the remainder of the string impossible for us to decode. */
memcpy(text, &string[charset_token], end - charset_token); /* Extract unencoded text from string */
text[end - charset_token] = 0x00;
MAKE_STD_ZVAL(myobject);
Modified: php/php-src/trunk/ext/pcntl/tests/pcntl_fork_basic.phpt
===================================================================
--- php/php-src/trunk/ext/pcntl/tests/pcntl_fork_basic.phpt 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/ext/pcntl/tests/pcntl_fork_basic.phpt 2011-04-03 21:46:52 UTC (rev 309927)
@@ -11,7 +11,7 @@
?>
--FILE--
<?php
-echo "*** Test by calling method or function with its expected arguments, first print the child PID and the the father ***\n";
+echo "*** Test by calling method or function with its expected arguments, first print the child PID and the father ***\n";
$pid = pcntl_fork();
if ($pid > 0) {
@@ -22,6 +22,6 @@
}
?>
--EXPECTF--
-*** Test by calling method or function with its expected arguments, first print the child PID and the the father ***
+*** Test by calling method or function with its expected arguments, first print the child PID and the father ***
int(0)
int(%d)
Modified: php/php-src/trunk/ext/spl/internal/appenditerator.inc
===================================================================
--- php/php-src/trunk/ext/spl/internal/appenditerator.inc 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/ext/spl/internal/appenditerator.inc 2011-04-03 21:46:52 UTC (rev 309927)
@@ -31,7 +31,7 @@
* @param $it Iterator to append
*
* If the current state is invalid but the appended iterator is valid
- * the the AppendIterator itself becomes valid. However there will be no
+ * the AppendIterator itself becomes valid. However there will be no
* call to $it->rewind(). Also if the current state is invalid the inner
* ArrayIterator will be rewound und forwarded to the appended element.
*/
@@ -119,4 +119,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: php/php-src/trunk/ext/spl/internal/cachingiterator.inc
===================================================================
--- php/php-src/trunk/ext/spl/internal/cachingiterator.inc 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/ext/spl/internal/cachingiterator.inc 2011-04-03 21:46:52 UTC (rev 309927)
@@ -86,7 +86,7 @@
$this->it->next();
}
- /** @return whether teh iterator is valid
+ /** @return whether the iterator is valid
*/
function valid()
{
@@ -154,4 +154,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: php/php-src/trunk/ext/spl/internal/regexiterator.inc
===================================================================
--- php/php-src/trunk/ext/spl/internal/regexiterator.inc 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/ext/spl/internal/regexiterator.inc 2011-04-03 21:46:52 UTC (rev 309927)
@@ -19,7 +19,7 @@
*/
class RegexIterator extends FilterIterator
{
- const USE_KEY = 0x00000001; /**< If present in $flags the the key is
+ const USE_KEY = 0x00000001; /**< If present in $flags the key is
used rather then the current value. */
const MATCH = 0; /**< Mode: Executed a plain match only */
Modified: php/php-src/trunk/ext/standard/array.c
===================================================================
--- php/php-src/trunk/ext/standard/array.c 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/ext/standard/array.c 2011-04-03 21:46:52 UTC (rev 309927)
@@ -606,7 +606,7 @@
/* Clear FCI cache otherwise : for example the same or other array with
* (partly) the same key values has been sorted with uasort() or
- * other sorting function the comparison is cached, however the the name
+ * other sorting function the comparison is cached, however the name
* of the function for comparison is not respected. see bug #28739 AND #33295
*
* Following defines will assist in backup / restore values. */
Modified: php/php-src/trunk/ext/standard/tests/array/array_shift_variation5.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/array/array_shift_variation5.phpt 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/ext/standard/tests/array/array_shift_variation5.phpt 2011-04-03 21:46:52 UTC (rev 309927)
@@ -9,7 +9,7 @@
/*
* Use the result of one call to array_shift
- * as the the $stack argument of another call to array_shift()
+ * as the $stack argument of another call to array_shift()
* When done in one statement causes strict error messages.
*/
@@ -42,4 +42,4 @@
-- Correct Method: --
string(4) "zero"
-Done
\ No newline at end of file
+Done
Modified: php/php-src/trunk/ext/standard/tests/file/lstat_stat_variation9.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/lstat_stat_variation9.phpt 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/ext/standard/tests/file/lstat_stat_variation9.phpt 2011-04-03 21:46:52 UTC (rev 309927)
@@ -36,7 +36,7 @@
$old_stat = stat($dirname);
-/* now delete teh surdir and file and record the stat */
+/* now delete the surdir and file and record the stat */
unlink("$dirname/lstat_stat_variation9a.tmp");
rmdir("$dirname/lstat_stat_variation9_subdir");
Modified: php/php-src/trunk/ext/xmlreader/php_xmlreader.c
===================================================================
--- php/php-src/trunk/ext/xmlreader/php_xmlreader.c 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/ext/xmlreader/php_xmlreader.c 2011-04-03 21:46:52 UTC (rev 309927)
@@ -859,7 +859,7 @@
/* }}} */
/* {{{ proto boolean XMLReader::open(string URI [, string encoding [, int options]])
-Sets the URI that the the XMLReader will parse. */
+Sets the URI that the XMLReader will parse. */
PHP_METHOD(xmlreader, open)
{
zval *id;
@@ -1020,7 +1020,7 @@
/* }}} */
/* {{{ proto boolean XMLReader::setRelaxNGSchema(string filename)
-Sets the string that the the XMLReader will parse. */
+Sets the string that the XMLReader will parse. */
PHP_METHOD(xmlreader, setRelaxNGSchema)
{
php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_FILE);
@@ -1028,7 +1028,7 @@
/* }}} */
/* {{{ proto boolean XMLReader::setRelaxNGSchemaSource(string source)
-Sets the string that the the XMLReader will parse. */
+Sets the string that the XMLReader will parse. */
PHP_METHOD(xmlreader, setRelaxNGSchemaSource)
{
php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAM_PASSTHRU, XMLREADER_LOAD_STRING);
@@ -1042,7 +1042,7 @@
*/
/* {{{ proto boolean XMLReader::XML(string source [, string encoding [, int options]])
-Sets the string that the the XMLReader will parse. */
+Sets the string that the XMLReader will parse. */
PHP_METHOD(xmlreader, XML)
{
zval *id;
Modified: php/php-src/trunk/main/streams/php_stream_context.h
===================================================================
--- php/php-src/trunk/main/streams/php_stream_context.h 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/main/streams/php_stream_context.h 2011-04-03 21:46:52 UTC (rev 309927)
@@ -31,7 +31,7 @@
/* Attempt to fetch context from the zval passed,
If no context was passed, use the default context
- The the default context has not yet been created, do it now. */
+ The default context has not yet been created, do it now. */
#define php_stream_context_from_zval(zcontext, nocontext) ( \
(zcontext) ? zend_fetch_resource(&(zcontext) TSRMLS_CC, -1, "Stream-Context", NULL, 1, php_le_stream_context(TSRMLS_C)) : \
(nocontext) ? NULL : \
Modified: php/php-src/trunk/main/streams/php_stream_filter_api.h
===================================================================
--- php/php-src/trunk/main/streams/php_stream_filter_api.h 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/main/streams/php_stream_filter_api.h 2011-04-03 21:46:52 UTC (rev 309927)
@@ -27,7 +27,7 @@
*
* Each stream can have a chain of filters for reading and another for writing.
*
- * When data is written to the stream, is is placed into a bucket and placed at
+ * When data is written to the stream, it is placed into a bucket and placed at
* the start of the input brigade.
*
* The first filter in the chain is invoked on the brigade and (depending on
Modified: php/php-src/trunk/php.ini-development
===================================================================
--- php/php-src/trunk/php.ini-development 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/php.ini-development 2011-04-03 21:46:52 UTC (rev 309927)
@@ -603,7 +603,7 @@
; starts up. G,P,C,E & S are abbreviations for the following respective super
; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
: paid for the registration of these arrays and because ENV is not as commonly
-; used as the others, ENV is is not recommended on productions servers. You
+; used as the others, ENV is not recommended on productions servers. You
; can still get access to the environment variables through getenv() should you
; need to.
; Default Value: "EGPCS"
Modified: php/php-src/trunk/php.ini-production
===================================================================
--- php/php-src/trunk/php.ini-production 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/php.ini-production 2011-04-03 21:46:52 UTC (rev 309927)
@@ -603,7 +603,7 @@
; starts up. G,P,C,E & S are abbreviations for the following respective super
; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
: paid for the registration of these arrays and because ENV is not as commonly
-; used as the others, ENV is is not recommended on productions servers. You
+; used as the others, ENV is not recommended on productions servers. You
; can still get access to the environment variables through getenv() should you
; need to.
; Default Value: "EGPCS"
Modified: php/php-src/trunk/sapi/litespeed/README
===================================================================
--- php/php-src/trunk/sapi/litespeed/README 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/sapi/litespeed/README 2011-04-03 21:46:52 UTC (rev 309927)
@@ -20,7 +20,7 @@
usually, FastCGI PHP is not an option in shared hosting environment
due to lacking of this flexibility. LiteSpeed SAPI is carefully designed
to address this issue. PHP configurations can be modified the same way
-as that in mod_php with the the same configuration directives.
+as that in mod_php with the same configuration directives.
PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for
PHP scripting with LiteSpeed web server.
Modified: php/php-src/trunk/scripts/dev/generate-phpt/src/gtTestSubject.php
===================================================================
--- php/php-src/trunk/scripts/dev/generate-phpt/src/gtTestSubject.php 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/scripts/dev/generate-phpt/src/gtTestSubject.php 2011-04-03 21:46:52 UTC (rev 309927)
@@ -128,7 +128,7 @@
/**
- * Returns the argument list with teh greatest possible number of arguments.
+ * Returns the argument list with the greatest possible number of arguments.
*
* @return string
*/
@@ -163,4 +163,4 @@
return $this->initialisationStatements;
}
}
-?>
\ No newline at end of file
+?>
Modified: php/php-src/trunk/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php
===================================================================
--- php/php-src/trunk/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidMethod.php 2011-04-03 21:46:52 UTC (rev 309927)
@@ -1,7 +1,7 @@
<?php
/**
- * Check that teh method name is valid
+ * Check that the method name is valid
*
*/
class gtIsValidMethod extends gtPreCondition {
@@ -25,4 +25,4 @@
return gtText::get('unknownMethod');
}
}
-?>
\ No newline at end of file
+?>
Modified: php/php-src/trunk/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
===================================================================
--- php/php-src/trunk/scripts/dev/generate-phpt/src/testcase/gtTestCase.php 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/scripts/dev/generate-phpt/src/testcase/gtTestCase.php 2011-04-03 21:46:52 UTC (rev 309927)
@@ -23,7 +23,7 @@
/**
- * Object containing teh ooptional sections that may be added to the test case
+ * Object containing the optional sections that may be added to the test case
*
* @var gtOptionalSections
*/
@@ -140,7 +140,7 @@
/**
- * Add FILE section closing tag to teh test case
+ * Add FILE section closing tag to the test case
*
*/
public function fileClosing() {
@@ -227,4 +227,4 @@
return $this->optionalSections;
}
}
-?>
\ No newline at end of file
+?>
Modified: php/php-src/trunk/win32/install.txt
===================================================================
--- php/php-src/trunk/win32/install.txt 2011-04-03 21:07:48 UTC (rev 309926)
+++ php/php-src/trunk/win32/install.txt 2011-04-03 21:46:52 UTC (rev 309927)
@@ -1419,7 +1419,7 @@
core directives is available in the appendix. Probably not all PHP
directives are documented in the manual though. For a complete list of
directives available in your PHP version, please read your well
- commented php.ini file. Alternatively, you may find the the latest
+ commented php.ini file. Alternatively, you may find the latest
php.ini from SVN helpful too.
Example 5-1. php.ini example
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
