vrana Sun Oct 17 07:46:29 2004 EDT
Modified files:
/phpdoc/en/language/oop5 basic.xml exceptions.xml iterations.xml
Log:
Change link to interface
One more missing ?>
extends keyword
http://cvs.php.net/diff.php/phpdoc/en/language/oop5/basic.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/language/oop5/basic.xml
diff -u phpdoc/en/language/oop5/basic.xml:1.6 phpdoc/en/language/oop5/basic.xml:1.7
--- phpdoc/en/language/oop5/basic.xml:1.6 Wed Oct 13 07:19:08 2004
+++ phpdoc/en/language/oop5/basic.xml Sun Oct 17 07:46:28 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<sect1 id="language.oop5.basic">
<title>The Basics</title>
@@ -95,11 +95,11 @@
</example>
</sect2>
- <sect2 id="language.oop5.basic.extend">
- <title>extend</title>
+ <sect2 id="language.oop5.basic.extends">
+ <title>extends</title>
<para>
A class can inherit methods and members of another class by using the
- extend keyword in the declaration. It is not possible to extend multiple
+ extends keyword in the declaration. It is not possible to extend multiple
classes, a class can only inherit one base class.
</para>
<para>
http://cvs.php.net/diff.php/phpdoc/en/language/oop5/exceptions.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/language/oop5/exceptions.xml
diff -u phpdoc/en/language/oop5/exceptions.xml:1.8
phpdoc/en/language/oop5/exceptions.xml:1.9
--- phpdoc/en/language/oop5/exceptions.xml:1.8 Sun Oct 10 03:48:42 2004
+++ phpdoc/en/language/oop5/exceptions.xml Sun Oct 17 07:46:28 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<sect1 id="language.oop5.exceptions">
<title>Exceptions</title>
@@ -197,6 +197,7 @@
// Continue execution
var_dump($o);
echo "\n\n";
+?>
]]>
</programlisting>
</example>
http://cvs.php.net/diff.php/phpdoc/en/language/oop5/iterations.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/language/oop5/iterations.xml
diff -u phpdoc/en/language/oop5/iterations.xml:1.6
phpdoc/en/language/oop5/iterations.xml:1.7
--- phpdoc/en/language/oop5/iterations.xml:1.6 Sun Oct 17 07:09:29 2004
+++ phpdoc/en/language/oop5/iterations.xml Sun Oct 17 07:46:28 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<sect1 id="language.oop5.iterations">
<title>Object Iteration</title>
<para>
@@ -47,7 +47,7 @@
As the output shows, the <link linkend="control-structures.foreach">foreach</link>
iterated through each public variable that is defined. To take it
a step further you can <varname>implement</varname> one of PHP 5's
- internal <xref linkend="language.oop5.interfaces" /> named
+ internal <link linkend="language.oop5.interfaces">interface</link> named
<varname>Iterator</varname>. This allows the object to decide what
and how the object will be iterated.
</para>
