Merge jv
authorMerge Script
Fri, 23 Sep 2016 07:02:11 +0200
branchjv
changeset 4093 3d5eab86719e
parent 4087 196fe006cf55 (current diff)
parent 4092 61384ffc7271 (diff)
child 4096 f5dd9192a02c
Merge
Socket.st
--- a/EllipticalArc.st	Wed Sep 21 07:06:47 2016 +0200
+++ b/EllipticalArc.st	Fri Sep 23 07:02:11 2016 +0200
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libbasic2' }"
 
+"{ NameSpace: Smalltalk }"
+
 Geometric subclass:#EllipticalArc
 	instanceVariableNames:'boundingBox startAngle sweepAngle'
 	classVariableNames:''
@@ -250,7 +252,7 @@
 !EllipticalArc methodsFor:'converting'!
 
 asEllipticalArc
-    "convert the receiver into an ellipticalArc - thats the receiver itself"
+    "convert the receiver into an ellipticalArc - that's the receiver itself"
 
     ^ self 
 ! !
@@ -307,5 +309,6 @@
 !EllipticalArc class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/EllipticalArc.st,v 1.14 2009-06-06 10:12:23 cg Exp $'
+    ^ '$Header$'
 ! !
+
--- a/List.st	Wed Sep 21 07:06:47 2016 +0200
+++ b/List.st	Fri Sep 23 07:02:11 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1996 by eXept Software AG
               All Rights Reserved
@@ -331,7 +333,7 @@
 
 reset
     "logically remove all elements from the collection.
-     Thats almost the same as #removeAll, but keeps the contentsArray.
+     That's almost the same as #removeAll, but keeps the contentsArray.
      Returns the receiver."
 
      |prevSize|
--- a/MultiReadStream.st	Wed Sep 21 07:06:47 2016 +0200
+++ b/MultiReadStream.st	Fri Sep 23 07:02:11 2016 +0200
@@ -1,5 +1,7 @@
 "{ Package: 'stx:libbasic2' }"
 
+"{ NameSpace: Smalltalk }"
+
 PeekableStream subclass:#MultiReadStream
 	instanceVariableNames:'streamStack'
 	classVariableNames:''
@@ -111,7 +113,7 @@
 !
 
 position
-    "/ thats depatable !!
+    "/ that's debatable !!
     "/ the code below only makes sense, if we see the multiStream as some kind of
     "/ macro-expanding c-define stream
 
@@ -164,6 +166,6 @@
 !MultiReadStream class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic2/MultiReadStream.st,v 1.9 2014-05-29 10:34:42 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/Socket.st	Wed Sep 21 07:06:47 2016 +0200
+++ b/Socket.st	Fri Sep 23 07:02:11 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
@@ -3592,11 +3594,11 @@
 !
 
 getPeerName
-    "return the peer name; thats the hostname (or dotted name) of the
+    "return the peer name; that's the hostname (or dotted name) of the
      partners host after an accept."
 
     peerName isNil ifTrue:[
-	peerName := self class peerNameFromDomain:domain peer:peer.
+        peerName := self class peerNameFromDomain:domain peer:peer.
     ].
     ^ peerName
 !
@@ -3828,7 +3830,6 @@
     "
 ! !
 
-
 !Socket methodsFor:'specials'!
 
 linger:anIntegerOrNil
@@ -4104,7 +4105,6 @@
     ^ self setSocketOption:#'TCP_NODELAY' argument:aBoolean argument:nil.
 ! !
 
-
 !Socket methodsFor:'waiting'!
 
 waitForNewConnectionOrDataOnAny:otherConnections timeout:timeoutSeconds
--- a/UnitConverter.st	Wed Sep 21 07:06:47 2016 +0200
+++ b/UnitConverter.st	Fri Sep 23 07:02:11 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1996 eXept Software AG
               All Rights Reserved
@@ -143,7 +145,7 @@
         Transcript showCR:(
             UnitConverter convert:1 from:#'lightsecond' to:#'kilometer') 
                                                                 [exEnd]
-    thats the same:
+    that's the same:
                                                                 [exBegin]
         Transcript showCR:(
             UnitConverter convert:1 from:#'lightspeed*s' to:#'kilometer') 
@@ -322,7 +324,7 @@
 
     self addConversion:231      from:#gallon to:#'inch^3'.
     self addConversion:(1/4)    from:#quart to:#gallon.  "/ well - at least here,
-                                                         "/ thats also 1/4th of a good wine ;-)
+                                                         "/ that's also 1/4th of a good wine ;-)
     self addConversion:(1/2)    from:#pint to:#quart.
     self addConversion:(1/16)   from:#floz to:#pint.
     self addConversion:(1/8)    from:#fldr to:#floz.