--- a/SmalltalkChunkFileSourceWriter.st	Sat Jul 04 11:52:42 2015 +0100
+++ b/SmalltalkChunkFileSourceWriter.st	Mon Jul 06 06:06:17 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2004 by eXept Software AG
               All Rights Reserved
@@ -67,15 +69,15 @@
 
     |s|
 
-    s := TextStream on:''.
+    s := (TextStream ? WriteStream) on:''.
     s nextPutAll:
-'message selector and argument names
+'message "selector and argument names"
     "comment stating purpose of this message"
 
     |temporaries|
 
-    statement.
-    statement.
+    "statement."
+    "statement."
 
     "
      optional: comment giving example use
@@ -99,6 +101,11 @@
 
  Or clear this text, type in the method from scratch
  and install it with `accept''.
+
+ If you don''t like this method template to appear,
+ disable it either via the global or browser''s settings dialog,
+ or by evaluating:
+     UserPreferences current showMethodTemplate:false
 "
 '.
     ^ s contents
@@ -107,7 +114,7 @@
 versionMethodTemplateForCVS
     "careful to avoid expansion by cvs here!!"
 
-    ^ ('version\    ^ ''$' , 'Header$''') withCRs
+    ^ ('version_CVS\    ^ ''$' , 'Header$''') withCRs
 
     "Created: / 21-08-2012 / 11:52:27 / cg"
 ! !
@@ -711,11 +718,11 @@
 !SmalltalkChunkFileSourceWriter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/SmalltalkChunkFileSourceWriter.st,v 1.30 2015-02-03 19:14:15 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/SmalltalkChunkFileSourceWriter.st,v 1.30 2015-02-03 19:14:15 cg Exp $'
+    ^ '$Header$'
 !
 
 version_HG