Index: TECH/StreamUtils.cls.xml
===================================================================
diff -u -r3131 -r3481
--- TECH/StreamUtils.cls.xml	(.../StreamUtils.cls.xml)	(revision 3131)
+++ TECH/StreamUtils.cls.xml	(.../StreamUtils.cls.xml)	(revision 3481)
@@ -8,12 +8,12 @@
 <FormalSpec>Stream:%Stream.Object,Text:%String</FormalSpec>
 <Implementation><![CDATA[
 	#dim IsTextInStream As %Boolean = 0
-	do Stream.Rewind()
+	Do Stream.Rewind()
 	while ('Stream.AtEnd) && ('IsTextInStream) {
-		#dim Line As %String = Stream.ReadLine()
+		#dim Line As %String = Stream.Read()
 		set IsTextInStream = ( Line[Text )
 	}
-	do Stream.Rewind()
+	Do Stream.Rewind()
 	
 	quit IsTextInStream
 ]]></Implementation>
@@ -24,15 +24,14 @@
 <FormalSpec>Stream:%Stream.Object,Search:%String,Replace:%String</FormalSpec>
 <Implementation><![CDATA[
 	set tmpStream = ##class(%GlobalCharacterStream).%New()
-	set tmpStream.LineTerminator = Stream.LineTerminator
-	do Stream.Rewind()
+	Do Stream.Rewind()
 	while 'Stream.AtEnd {
-		#dim String As %String = Stream.ReadLine()
-		do tmpStream.WriteLine(##class(TECH.StringUtils).Replace(String,.Search,.Replace))
+		#dim String As %String = Stream.Read()
+		Do tmpStream.Write(##class(TECH.StringUtils).Replace(String,.Search,.Replace))
 	}	
-	do Stream.Clear()
-	do Stream.CopyFrom(tmpStream)
-	do Stream.Rewind()
+	Do Stream.Clear()
+	Do Stream.CopyFrom(tmpStream)
+	Do Stream.Rewind()
 	quit
 ]]></Implementation>
 </Method>
@@ -60,7 +59,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim TextBetween As %String = ""
-	do Stream.Rewind()
+	Do Stream.Rewind()
 	while ( '$length(TextBetween) ) && ( 'Stream.AtEnd ) {
 		#dim String As %String = Stream.Read()
 		set TextBetween = $$$TextBetween(String,First,Last)