--- a/EncodedStream.st	Wed Mar 25 20:18:18 2015 +0100
+++ b/EncodedStream.st	Wed Mar 25 20:20:13 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2004 by eXept Software AG
               All Rights Reserved
@@ -53,7 +55,7 @@
     "
      |s|
      s := EncodedStream stream:Transcript encoder:(CharacterEncoder encoderToEncodeFrom:#utf8 into:#unicode).
-     s nextPutAll:('öäü' utf8Encoded)
+     s nextPutAll:('öäü' utf8Encoded)
     "
 ! !
 
@@ -418,11 +420,11 @@
 !
 
 nextPutAll:aCollection
-    stream nextPutAll:(encoder encodeString:aCollection).
+    encoder encodeString:aCollection on:stream 
 !
 
 nextPutAll:aCollection startingAt:start to:stop
-    stream nextPutAll:(encoder encodeString:(aCollection copyFrom:start to:stop)).
+    encoder encodeString:(aCollection copyFrom:start to:stop) on:stream.
 !
 
 peek
@@ -577,11 +579,11 @@
 !EncodedStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/EncodedStream.st,v 1.39 2015-03-25 14:19:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/EncodedStream.st,v 1.40 2015-03-25 19:20:13 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/EncodedStream.st,v 1.39 2015-03-25 14:19:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/EncodedStream.st,v 1.40 2015-03-25 19:20:13 cg Exp $'
 !
 
 version_SVN