--- a/Socket.st	Sun Jan 09 16:49:06 2000 +0100
+++ b/Socket.st	Mon Jan 17 12:20:18 2000 +0100
@@ -985,7 +985,7 @@
 
 ! !
 
-!Socket class methodsFor:'ST80 instance creation'!
+!Socket class methodsFor:'Compatibility ST80'!
 
 family:domainSymbol type:typeSymbol
     "create a socket for domain and type - ST80 simply uses a different name.
@@ -1001,9 +1001,7 @@
      Socket family:#inet type:#datagram
      Socket family:#unix type:#stream
     "
-! !
-
-!Socket class methodsFor:'ST80 queries'!
+!
 
 getHostname
     "return the computers hostname string"
@@ -2086,7 +2084,7 @@
     "
 ! !
 
-!Socket methodsFor:'Compatibility - ST-80'!
+!Socket methodsFor:'Compatibility - ST80'!
 
 errorReporter
     "ST-80 mimicry."
@@ -3491,23 +3489,6 @@
     ^ true
 !
 
-waitForNewConnectionWithTimeout:timeoutSeconds
-    "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.
-     Returns nil, if a timeout occured.
-     This method implements the inner wait-primitive of a single-connection 
-     server application."
-
-    |newConnection|
-
-    (self readWaitWithTimeout:timeoutSeconds) ifTrue:[
-	"/ a timeout occurred - no connection within timeout
-	^ nil
-    ].
-    ^ self accept.
-!
-
 waitForNewConnectionOrDataOnAny:otherConnections timeout:timeoutSeconds
     "suspend the current process, until either a new connection comes
      in at the receiver, or data arrives on any of the otherConnections.
@@ -3578,6 +3559,23 @@
 
     "/ none - a timeout
     ^ nil
+!
+
+waitForNewConnectionWithTimeout:timeoutSeconds
+    "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.
+     Returns nil, if a timeout occured.
+     This method implements the inner wait-primitive of a single-connection 
+     server application."
+
+    |newConnection|
+
+    (self readWaitWithTimeout:timeoutSeconds) ifTrue:[
+	"/ a timeout occurred - no connection within timeout
+	^ nil
+    ].
+    ^ self accept.
 ! !
 
 !Socket methodsFor:'low level-connecting'!
@@ -4662,5 +4660,5 @@
 !Socket class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.139 1999-12-15 11:13:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.140 2000-01-17 11:20:18 cg Exp $'
 ! !