Merge jv
authorMerge Script
Fri, 22 Jul 2016 07:11:12 +0200
branchjv
changeset 4003 8d89173109ff
parent 4000 da23c6d5b93d (current diff)
parent 4002 2fcb2003e3df (diff)
child 4010 ffad47fc7637
Merge
--- a/RunArray.st	Wed Jul 13 07:01:20 2016 +0200
+++ b/RunArray.st	Fri Jul 22 07:11:12 2016 +0200
@@ -1237,7 +1237,7 @@
 
 size
     "Answer how many elements the receiver contains.
-     Thsi is not the number of runs (but the simulated number of elements)."
+     This is not the number of runs (but the simulated number of elements)."
 
     |n     "{ Class: SmallInteger }"
      runSz "{ Class: SmallInteger }"|
--- a/SharedCollection.st	Wed Jul 13 07:01:20 2016 +0200
+++ b/SharedCollection.st	Fri Jul 22 07:11:12 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -41,7 +43,7 @@
     Instances of this class provide synchronized access (of multiple processes) 
     to a collection.
 
-    Notice: the message-forwarding is done by catching sbclassResponsibility and
+    Notice: the message-forwarding is done by catching subclassResponsibility and
     doesNotUnderstand errors.
     For performance, and for more complex operation-atomicy, more messages might need
     an explicit handling. See the implementation of #at: / #at:put: and #size for examples.