summaryrefslogtreecommitdiff
path: root/ext/tidy/tidy.c
diff options
context:
space:
mode:
authorandrey <andrey@php.net>2012-07-09 17:59:42 +0300
committerandrey <andrey@php.net>2012-07-09 17:59:42 +0300
commit66e1ac23c1601abb66fa78bff87453e5e37a9377 (patch)
tree19b707c38dda43d747dd923ac05974632bcb07fc /ext/tidy/tidy.c
parent555db7dc4ecaffdbfb4a10f4d00ddd81c0f89ef6 (diff)
parent2032470e4113dfbf04a1ed3b12de85ffcde6f367 (diff)
downloadphp-git-66e1ac23c1601abb66fa78bff87453e5e37a9377.tar.gz
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Diffstat (limited to 'ext/tidy/tidy.c')
-rw-r--r--ext/tidy/tidy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 5ac1a69196..72d8f5db66 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1238,7 +1238,7 @@ static PHP_FUNCTION(tidy_parse_string)
/* }}} */
/* {{{ proto string tidy_get_error_buffer()
- Return warnings and errors which occured parsing the specified document*/
+ Return warnings and errors which occurred parsing the specified document*/
static PHP_FUNCTION(tidy_get_error_buffer)
{
TIDY_FETCH_OBJECT;