cvs: phpdoc /en/language/oop5 basic.xml

didou Tue Dec 28 09:39:20 2004 EDT Modified files: /phpdoc/en/language/oop5 basic.xml Log: fix #31257: s/overloaded/overrided http://cvs.php.net/diff.php/phpdoc/en/language/oop5/basic.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/language/oop5/basic.xml diff -u phpdoc/en/language/oop5/basic.xml:1.7 phpdoc/en/language/oop5/basic.xml:1.8 --- phpdoc/en/language/oop5/basic.xml:1.7 Sun Oct 17 07:46:28 2004 +++ phpdoc/en/language/oop5/basic.xml Tue Dec 28 09:39:19 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <sect1 id="language.oop5.basic"> <title>The Basics</title> @@ -103,10 +103,10 @@ classes, a class can only inherit one base class. </para> <para> - The inherited methods and members can be overloaded, unless the parent + The inherited methods and members can be overrided, unless the parent class has defined a method as <link linkend="language.oop5.final">final</link>, by redeclaring them within the same name defined in the parent class. - It is possible to access the overloaded method or members by + It is possible to access the overrided method or members by referencing them with <link linkend="language.oop5.paamayim-nekudotayim">parent::</link> </para> <example>