dams Wed Mar 9 06:41:01 2005 EDT
Modified files:
/phpdoc/en/language oop.xml
Log:
fixing bug 32247
http://cvs.php.net/diff.php/phpdoc/en/language/oop.xml?r1=1.60&r2=1.61&ty=u
Index: phpdoc/en/language/oop.xml
diff -u phpdoc/en/language/oop.xml:1.60 phpdoc/en/language/oop.xml:1.61
--- phpdoc/en/language/oop.xml:1.60 Mon Feb 14 04:10:10 2005
+++ phpdoc/en/language/oop.xml Wed Mar 9 06:40:59 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.60 $ -->
+<!-- $Revision: 1.61 $ -->
<chapter id="language.oop">
<title>Classes and Objects (PHP 4)</title>
@@ -101,7 +101,7 @@
<caution>
<simpara>
- The name <literal>stdClass</literal> is used interally by
+ The name <literal>stdClass</literal> is used internally by
Zend and is reserved. You cannot have a class named
<literal>stdClass</literal> in PHP.
</simpara>
@@ -196,13 +196,13 @@
functions add_item(), remove_item() and a variable items. These are
distinct functions and variables. You can think of the objects as
something similar to directories in a filesystem. In a filesystem you can
- have two different files <filename>README.TXT</filename>, as long as they
are in different
- directories. Just like with directories where you'll have to type the
- full pathname in order to reach each file from the toplevel directory, you
- have to specify the complete name of the function you want to call: In PHP
- terms, the toplevel directory would be the global namespace, and the
- pathname separator would be <literal>-></literal>. Thus, the names
- <varname>$cart->items</varname> and
+ have two different files <filename>README.TXT</filename>, as long as they
+ are in different directories. Just like with directories where you'll have
+ to type the full pathname in order to reach each file from the toplevel
+ directory, you have to specify the complete name of the function you want
to
+ call: in PHP terms, the toplevel directory would be the global namespace,
+ and the pathname separator would be <literal>-></literal>. Thus, the
+ names <varname>$cart->items</varname> and
<varname>$another_cart->items</varname> name two different variables.
Note that the variable is named <varname>$cart->items</varname>, not
<varname>$cart->$items</varname>, that is, a variable name in PHP has
@@ -1133,8 +1133,8 @@
</screen>
</example>
Which is the output we will expect to obtain given the comparison rules
- above. Only instances with the same values for their attributes and from
the same
- class are considered equal and identical.
+ above. Only instances with the same values for their attributes
+ and from the same class are considered equal and identical.
</para>
<para>
Even in the cases where we have object composition, the same comparison
