--- a/Collection.st	Sat Apr 09 00:59:38 2005 +0200
+++ b/Collection.st	Sat Apr 09 19:14:05 2005 +0200
@@ -2714,9 +2714,8 @@
 !
 
 isEmptyOrNil
-    "Squeak compatibility:
-     return true if I am nil or an empty collection - true here, iff the receivers size is 0,
-     Sigh: the same as ST/X isNilOrEmptyCollection - which one should be kept in the long run ?"
+    "return true if I am nil or an empty collection - true here, if the receivers size is 0,
+     (from Sqeak)"
 
     ^ self isEmpty
 
@@ -2725,8 +2724,10 @@
 !
 
 isNilOrEmptyCollection
-    "return true if I am nil or an empty collection - true here, iff the receivers size is 0.
-     Sigh: the same as Squeaks isEmptyOrNil - which one should be kept in the long run ?"
+    "return true if I am nil or an empty collection - false here.
+     Obsolete, use isEmptyOrNil."
+
+    <resource:#obsolete>
 
     ^ self isEmpty
 
@@ -2801,7 +2802,7 @@
 !Collection class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Collection.st,v 1.173 2005-02-22 11:20:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Collection.st,v 1.174 2005-04-09 17:14:05 stefan Exp $'
 ! !
 
 Collection initialize!

--- a/Object.st	Sat Apr 09 00:59:38 2005 +0200
+++ b/Object.st	Sat Apr 09 19:14:05 2005 +0200
@@ -8275,9 +8275,8 @@
 !
 
 isEmptyOrNil
-    "Squeak compatibility:
-     return true if I am nil or an empty collection - return false here.
-     Sigh: the same as ST/X isNilOrEmptyCollection - which one should be kept in the long run ?"
+    "return true if I am nil or an empty collection - return false here.
+     (from Squeak)"
 
     ^ false
 
@@ -8552,7 +8551,7 @@
 isMemberOf:aClass
     "return true, if the receiver is an instance of aClass, false otherwise.
      Advice: 
-        use of this to check objects for certain attributes/protocoll should
+        use of this to check objects for certain attributes/protocol should
         be avoided; it limits the reusability of your classes by limiting use
         to instances of a certain class.
         Use check-methods to check an object for a certain attributes/protocol
@@ -8618,7 +8617,9 @@
 
 isNilOrEmptyCollection
     "return true if I am nil or an empty collection - false here.
-     Sigh: the same as Squeaks isEmptyOrNil - which one should be kept in the long run ?"
+     Obsolete, use isEmptyOrNil."
+
+    <resource:#obsolete>
 
     ^ false
 
@@ -9221,7 +9222,7 @@
 !Object class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.525 2005-04-08 22:59:38 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.526 2005-04-09 17:13:01 stefan Exp $'
 ! !
 
 Object initialize!

--- a/UndefinedObject.st	Sat Apr 09 00:59:38 2005 +0200
+++ b/UndefinedObject.st	Sat Apr 09 19:14:05 2005 +0200
@@ -609,9 +609,8 @@
 !
 
 isEmptyOrNil
-    "Squeak compatibility:
-     return true if I am nil or an empty collection - since I am nil, return true.
-     Sigh: the same as ST/X isNilOrEmptyCollection - which one should be kept in the long run ?"
+    "return true if I am nil or an empty collection - since I am nil, return true.
+     (from Sqeak)"
 
     ^ true
 
@@ -636,8 +635,10 @@
 !
 
 isNilOrEmptyCollection
-    "return true if I am nil or an empty collection - since I am nil, return true.
-     Sigh: the same as Squeaks isEmptyOrNil - which one should be kept in the long run ?"
+    "return true if I am nil or an empty collection - false here.
+     Obsolete, use isEmptyOrNil."
+
+    <resource:#obsolete>
 
     ^ true
 
@@ -680,7 +681,7 @@
 !UndefinedObject class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UndefinedObject.st,v 1.61 2005-04-08 22:48:26 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UndefinedObject.st,v 1.62 2005-04-09 17:13:45 stefan Exp $'
 ! !
 
 UndefinedObject initialize!