cvs: phpdoc /en/appendices reserved.xml

felipe Thu Dec 27 03:31:02 2007 UTC Modified files: /phpdoc/en/appendices reserved.xml Log: Added final and __NAMESPACE__ keywords; Modified version of namespace keyword; Removed import keyworkd http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/reserved.xml?r1=1.68&r2=1.69&diff_format=u Index: phpdoc/en/appendices/reserved.xml diff -u phpdoc/en/appendices/reserved.xml:1.68 phpdoc/en/appendices/reserved.xml:1.69 --- phpdoc/en/appendices/reserved.xml:1.68 Wed Aug 15 15:53:53 2007 +++ phpdoc/en/appendices/reserved.xml Thu Dec 27 03:31:02 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.68 $ --> +<!-- $Revision: 1.69 $ --> <appendix xml:id="reserved" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>List of Reserved Words</title> @@ -220,7 +220,7 @@ <link linkend="language.oop5.interfaces">implements</link> (as of PHP 5) </entry> <entry> - <link linkend="language.oop5.basic">extends</link> + <link linkend="language.operators.type">instanceof</link> (as of PHP 5) </entry> <entry> <link linkend="language.oop5.visibility">public</link> (as of PHP 5) @@ -260,21 +260,23 @@ <link linkend="keyword.class">this</link> (as of PHP 5) </entry> <entry> - namespace (PHP 6 only) + <link linkend="language.oop5.final">final</link> (as of PHP 5) </entry> </row> <row> <entry> - import (PHP 6 only) + <link linkend="language.namespaces">use</link> (as of PHP 5.3) </entry> <entry> - goto (PHP 6 only) + <link linkend="language.namespaces">namespace</link> (as of PHP 5.3) </entry> <entry> + <link linkend="language.namespaces">__NAMESPACE__</link> (as of PHP 5.3) </entry> <entry> + goto (PHP 6 only) </entry> - <entry> + <entry> </entry> </row> </tbody>