--- a/Socket.st	Fri May 08 00:37:29 2015 +0200
+++ b/Socket.st	Fri May 08 03:07:22 2015 +0200
@@ -4145,7 +4145,7 @@
     ^ nil
 !
 
-waitForNewConnectionWithTimeout:timeoutSeconds
+waitForNewConnectionWithTimeout:timeoutSecondsOrNil
     "suspend the current process, until a new connection comes
      in at the receiver or a timeout occurs.
      For a new connection, an accept is performed and the new socket is returned.
@@ -4153,9 +4153,9 @@
      This method implements the inner wait-primitive of a single-connection
      server application."
 
-    (self readWaitWithTimeout:timeoutSeconds) ifTrue:[
-	"a timeout occurred - no connection within timeout"
-	^ nil
+    (self readWaitWithTimeout:timeoutSecondsOrNil) ifTrue:[
+        "a timeout occurred - no connection within timeout"
+        ^ nil
     ].
     ^ self accept.
 ! !
@@ -4163,10 +4163,10 @@
 !Socket class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.313 2015-03-12 10:50:27 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.314 2015-05-08 01:07:22 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.313 2015-03-12 10:50:27 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.314 2015-05-08 01:07:22 cg Exp $'
 ! !