--- a/String.st	Tue Mar 08 07:53:52 2016 +0000
+++ b/String.st	Thu Mar 10 08:13:13 2016 +0000
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1988 by Claus Gittinger
 	      All Rights Reserved
@@ -120,12 +122,12 @@
 
     Strings are kind of kludgy: to allow for easy handling by c-functions,
     there is always one 0-byte added at the end, which is not counted
-    in the strings size, and is not accessable from the smalltalk level.
+    in the strings size, and is not accessible from the smalltalk level.
     This guarantees, that a smalltalk string can always be passed to a
     C- or a system api function without danger (of course, this does not
     prevent a nonsense contents ...)
 
-    You cannot add any instvars to String, since the the run time system & compiler
+    You cannot add any instvars to String, since the run time system & compiler
     creates literal strings and knows that strings have no named instvars.
     If you really need strings with instVars, you have to create a subclass
     of String (the access functions defined here can handle this).
@@ -137,11 +139,11 @@
     or use instances of encodedString.
 
     [author:]
-	Claus Gittinger
+        Claus Gittinger
 
     [see also:]
-	Text StringCollection TwoByteString JISEncodedString
-	Symbol
+        Text StringCollection TwoByteString JISEncodedString
+        Symbol
 "
 ! !
 
@@ -524,9 +526,6 @@
 ! !
 
 
-
-
-
 !String methodsFor:'Compatibility-VW5.4'!
 
 asByteString
@@ -1246,7 +1245,7 @@
      'hello world' indexOfAny:'AOE' startingAt:1
      'hello world' indexOfAny:'o' startingAt:6
      'hello world' indexOfAny:'o' startingAt:6
-     'hello world' indexOfAny:'#$' startingAt:6
+     'hello world§' indexOfAny:'#§$' startingAt:6
     "
 !
 
@@ -3100,10 +3099,10 @@
 	'abcde1234' utf8EncodedOn:w
      ].
      String streamContents:[:w|
-	 'abcde' utf8EncodedOn:w
+	 'abcdeäöüß' utf8EncodedOn:w
      ].
      String streamContents:[:w|
-	 'abcde' asUnicode16String utf8EncodedOn:w
+	 'abcdeäöüß' asUnicode16String utf8EncodedOn:w
      ].
     "
 ! !
@@ -3566,8 +3565,8 @@
     "
       'hello world' asUnicode16String errorPrint
       (Character value:356) asString errorPrint
-      'Bnnigheim' errorPrint
-      'Bnnigheim' asUnicodeString errorPrint
+      'Bönnigheim' errorPrint
+      'Bönnigheim' asUnicodeString errorPrint
     "
 !
 
@@ -3979,7 +3978,6 @@
     ^ super reverse
 ! !
 
-
 !String methodsFor:'substring searching'!
 
 indexOfSubCollection:aSubString startingAt:startIndex ifAbsent:exceptionValue caseSensitive:caseSensitive
@@ -4491,7 +4489,6 @@
 
 ! !
 
-
 !String class methodsFor:'documentation'!
 
 version