--- a/display.rc	Thu Jan 09 19:08:04 1997 +0100
+++ b/display.rc	Fri Jan 10 19:34:12 1997 +0100
@@ -178,7 +178,7 @@
 	]
     ].
     display isNil ifTrue:[
-	'cannot determine display I am running on' errorPrintCR.
+	'display.rc [warning]: cannot determine display I am running on' errorPrintCR.
     ] ifFalse:[
 	"
 	 if there is a corresponding file d_<displayName>.rc ...
@@ -288,7 +288,7 @@
 	"
 	Display supportsDeepIcons:false.
 	Smalltalk isStandAloneApp ifFalse:[
-	    ('trying display setup d_' , displayType , '.rc ...') infoPrintCR.
+	    ('display.rc [info]: trying display setup ''d_' , displayType , '.rc'' ...') infoPrintCR.
 	].
 	Smalltalk fileIn:('d_' , displayType , '.rc')
     ].
@@ -381,7 +381,7 @@
 	    View defaultStyle:#normal
 	]
     ].
-    'no style set in display.rc - default to ' infoPrint.
+    'display.rc [info]: no style set - default to ' infoPrint.
     View defaultStyle infoPrintCR
 ]
 !

--- a/h_sample_host.rc	Thu Jan 09 19:08:04 1997 +0100
+++ b/h_sample_host.rc	Fri Jan 10 19:34:12 1997 +0100
@@ -11,8 +11,8 @@
  * NNTPSERVER configuration (for newsReader)
  *"
 (OperatingSystem getEnvironment:'NNTPSERVER') isNil ifTrue:[
-    Stdout showCR:'please edit h_sample.rc for NNTPSERVER setup'.
-"/    Stdout showCR:'setting NNTPSERVER to <your-NNTP-host-here>'.
+    'h_sample_host.rc [info]: please edit me for NNTPSERVER setup' infoPrintCR.
+"/    'h_sample_host.rc [info]: setting NNTPSERVER to <your-NNTP-host-here>' infoPrintCR.
 "/    Smalltalk at:#NNTPSERVER put:'<your-NNTP-host-here>'.
 ].
 !
@@ -22,7 +22,9 @@
  * - uncomment the one you have
  *"
 
-Stdout showCR:'configuring printer ...'!
+'h_sample_host.rc [info]: please edit me for printer setup' infoPrintCR.
+"/ 'h_sample_host.rc [info]: configuring printer ...' infoPrintCR
+!
 
 "/ PostscriptPrinterStream autoload.
 "/ Smalltalk at:#Printer put:PostscriptPrinterStream.

--- a/host.rc	Thu Jan 09 19:08:04 1997 +0100
+++ b/host.rc	Fri Jan 10 19:34:12 1997 +0100
@@ -125,12 +125,12 @@
 "/
 host := OperatingSystem getHostName.
 host isNil ifTrue:[
-    'cannot determine host I am running on' errorPrintCR.
+    'host.rc [warning]: cannot determine host I am running on' errorPrintCR.
 ] ifFalse:[
     "if there is a corresponding file ..."
 
     (Smalltalk at:#'_ImageHostName') ~= host ifTrue:[
-	('trying host setup h_' , host , '.rc ...') infoPrintCR.
+	('host.rc [info]: trying host setup h_' , host , '.rc ...') infoPrintCR.
 
 	s := Smalltalk systemFileStreamFor:('h_' , host , '.rc').
 	s notNil ifTrue:[

--- a/private.rc	Thu Jan 09 19:08:04 1997 +0100
+++ b/private.rc	Fri Jan 10 19:34:12 1997 +0100
@@ -53,7 +53,7 @@
 
 |whoAmI thisIsMySystem conf systemType|
 
-'reading keyboard.rc ...' infoPrintCR.
+'private.rc [info]: reading ''keyboard.rc'' ...' infoPrintCR.
 Smalltalk fileIn:'keyboard.rc'.
 
 "/
@@ -121,7 +121,7 @@
 "/
 thisIsMySystem ifTrue:[
     HistoryManager notNil ifTrue:[
-	'activating HistoryManager ...' infoPrintCR.
+	'private.rc [info]: activating HistoryManager ...' infoPrintCR.
 	HistoryManager activate.
     ]
 ].
@@ -131,7 +131,7 @@
 "/     (using rdoit to start ST/X views via window manager menus ...)
 "/
 thisIsMySystem ifTrue:[
-    'starting RDoItServer ...' infoPrintCR.
+    'private.rc [info]: starting RDoItServer ...' infoPrintCR.
     RDoItServer autoload.
     RDoItServer start.
     RDoItServer allowHost:'localhost'.
@@ -298,7 +298,7 @@
     "/ the first time.
     "/
 
-    'starting main-menu ...' infoPrintCR.
+    'private.rc [info]: starting main-menu ...' infoPrintCR.
     Launcher open
 
     "/

--- a/smalltalk.rc	Thu Jan 09 19:08:04 1997 +0100
+++ b/smalltalk.rc	Fri Jan 10 19:34:12 1997 +0100
@@ -48,17 +48,17 @@
 args := Smalltalk commandLineArguments.
 ((args size > 0) and:[args last = '--buildClasses']) ifTrue:[
     'binary' asFilename isDirectory ifFalse:[
-	'no binary directory for classes.' printNL.
+	'smalltalk.rc [warning]: no binary directory for classes.' errorPrintCR.
     ] ifTrue:[
 	"/
 	"/ load all lazy classes
 	"/
 	Autoload subclasses do:[:aClass |
 	    Autoload autoloadFailedSignal handle:[:ex |
-		'autoload failed' printNL.
+		'smalltalk.rc [warning]: autoload failed' errorPrintCR.
 		ex return.
 	    ] do:[
-		'loading ' print. aClass name print. ' ...' printNL.
+		'smalltalk.rc [info]: loading ' infoPrint. aClass name infoPrint. ' ...' infoPrintCR.
 		aClass autoload.
 	    ]
 	].
@@ -67,7 +67,7 @@
 	"/ binary save all classes
 	"/
 	Autoload loadedClasses do:[:cls |
-	    'saving binary of ' print. cls name print. ' ...' printNL.
+	    'smalltalk.rc [info]: saving binary of ' infoPrint. cls name infoPrint. ' ...' infoPrintCR.
 	    cls binaryFileOut.
 	    OperatingSystem executeCommand:'mv *.cls binary'.
 	]
@@ -146,9 +146,9 @@
 "/
 Display isNil ifTrue:[
     DeviceWorkstation notNil ifTrue:[
-	'smalltalk.rc: No Display connection.' errorPrintCR.
+	'smalltalk.rc [warning]: No Display connection.' errorPrintCR.
     ] ifFalse:[
-	'smalltalk.rc: Configuration without display.' errorPrintCR.
+	'smalltalk.rc [warning]: Configuration without display.' errorPrintCR.
     ].
     '' errorPrintCR.
     'Textmode (enter smalltalk expressions terminated by single exclamation mark' errorPrintCR.
@@ -216,11 +216,13 @@
 "/ this handles all variant display stuff
 "/ (i.e. things which might change, when DISPLAY is set different)
 "/
+"/ 'smalltalk.rc [info]: reading ''display.rc'' ...' infoPrintCR.
 Smalltalk fileIn:'display.rc'.
 
 "/
 "/ this defines stuff relating to the host we are running on
 "/
+"/ 'smalltalk.rc [info]: reading ''host.rc'' ...' infoPrintCR.
 Smalltalk fileIn:'host.rc'.
 
 "/
@@ -243,12 +245,13 @@
 "/
 "/ read private (per user) stuff
 "/
-'reading private.rc ...' infoPrintCR.
+'smalltalk.rc [info]: reading ''private.rc'' ...' infoPrintCR.
 Smalltalk fileIn:'private.rc'.
 
 "/
 "/ read saved configuration settings (if any)
 "/
+"/ 'smalltalk.rc [info]: reading ''settings.stx'' ...' infoPrintCR.
 Smalltalk fileIn:'settings.stx'.
 
 "/
@@ -271,7 +274,9 @@
 "/
 
 "/'st.img' asFilename exists ifFalse:[
-"/    'SMALLTALK: saving initial image for faster future startup ...' infoPrintCR.
-"/    ObjectMemory primSnapShotOn:'st.img'
+"/    'smalltalk.rc [info]: saving initial image for faster future startup ...' infoPrintCR.
+"/    Smalltalk addStartBlock:[
+"/        ObjectMemory primSnapShotOn:'st.img'
+"/    ]
 "/].
 !

--- a/stbc.rc	Thu Jan 09 19:08:04 1997 +0100
+++ b/stbc.rc	Fri Jan 10 19:34:12 1997 +0100
@@ -26,13 +26,13 @@
 
     (arg startsWith:'-') ifFalse:[
 	inFile := arg asFilename.
-	('loading ' , inFile name , ' ...') errorPrintCR.
+	('stbc [info]: loading ' , inFile name , ' ...') infoPrintCR.
 	Object errorSignal handle:[:ex |
-	    'error while loading: ' errorPrint. ex errorString errorPrintCR.
+	    'stbc [error]: error while loading: ' errorPrint. ex errorString errorPrintCR.
 	] do:[
 	    Smalltalk fileIn:inFile name.
 	].
-	('done loading') errorPrintCR.
+	('stbc [info]: done loading') errorPrintCR.
 
 	baseName := inFile withoutSuffix.
 	className := baseName baseName.
@@ -41,10 +41,10 @@
 	className := Smalltalk classNameForFile:className.
 	class := Smalltalk classNamed:className.
 	class notNil ifTrue:[
-	    ('saving ' , class name , ' ...') errorPrintCR.
+	    ('stbc [info]: saving ' , class name , ' ...') infoPrintCR.
 	    class binaryFileOutWithSourceMode:#reference
 	] ifFalse:[
-	    ('no class for ' , className) errorPrintCR
+	    ('stbc [error]: no class for ' , className) errorPrintCR
 	]
     ]
 ].