summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2014-04-17 17:23:05 +0200
committerBob Weinand <bobwei9@hotmail.com>2014-04-17 17:23:05 +0200
commitc02003e6b8fcb6a22d2bf458a22f24277b3e0b45 (patch)
tree12b43dc30b78ec1b6fc43b090798893a9449eb1f /ext
parent00bef4b1c78bcd1d6ed3fe9c2a32a07be9ddf6cc (diff)
parent0ec122b80430b7a925f96aa7e61b27defb5731a9 (diff)
downloadphp-git-c02003e6b8fcb6a22d2bf458a22f24277b3e0b45.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext')
-rwxr-xr-xext/spl/README2
-rwxr-xr-xext/spl/spl.php3
2 files changed, 1 insertions, 4 deletions
diff --git a/ext/spl/README b/ext/spl/README
index b2aeb596d0..28373a3eda 100755
--- a/ext/spl/README
+++ b/ext/spl/README
@@ -4,4 +4,4 @@ code in the file spl.php or in the corresponding .inc file in the examples
subdirectory. Based on the internal implementations or the files in the
examples subdirectory there are also some .php files to experiment with.
-For more information look at: http://php.net/~helly/php/ext/spl
+For more information look at: http://php.net/manual/en/book.spl.php
diff --git a/ext/spl/spl.php b/ext/spl/spl.php
index 3638a5a2b7..c276f1f2ee 100755
--- a/ext/spl/spl.php
+++ b/ext/spl/spl.php
@@ -145,9 +145,6 @@
* - Debug session 2 <a href="http://talks.somabo.de/200509_toronto_iterator_debug_session_1.pps">[pps]</a>, <a href="http://talks.somabo.de/200509_toronto_iterator_debug_session_1.pdf">[pdf]</a>, <a href="http://taks.somabo.de/200411_php_conference_frankfrurt_iterator_debug_session.swf">[swf]</a>
* - Debug session 3 <a href="http://talks.somabo.de/200509_toronto_iterator_debug_session_2.pps">[pps]</a>, <a href="http://talks.somabo.de/200509_toronto_iterator_debug_session_2.pdf">[pdf]</a>
*
- * You can download this documentation as a chm file
- * <a href="http://php.net/~helly/php/ext/spl/spl.chm">here</a>.
- *
* (c) Marcus Boerger, 2003 - 2007
*/