# HG changeset patch
# User Merge Script
# Date 1448431442 -3600
# Node ID bf2395abae60103051a3e7b1f153ca50264e263a
# Parent  2e07929bffcc7fa17beb3d9009fd082ac09d7078# Parent  eb81fa3d84079f722fc6d94283c41047d524b864
Merge

diff -r 2e07929bffcc -r bf2395abae60 Socket.st
--- a/Socket.st	Fri Nov 20 06:48:41 2015 +0100
+++ b/Socket.st	Wed Nov 25 07:04:02 2015 +0100
@@ -2047,6 +2047,7 @@
 !
 
 connectTo:hostOrPathName port:portNrOrName
+    <resource: #obsolete>
     "Backward compatibility connect; connect to port, portNrOrNameOrNil on host, hostOrPathNameOrSocketAddr.
      For backward compatibility, hostOrPathNameOrSocketAddr may be also a string or a byteArray,
      but it is recommended to pass SocketAddress instances.
@@ -2059,6 +2060,7 @@
 !
 
 connectTo:hostOrPathNameOrSocketAddr port:portNrOrNameOrNil withTimeout:timeout
+    <resource: #obsolete>
     "Backward compatibility connect; connect to port, portNrOrNameOrNil on host, hostOrPathNameOrSocketAddr.
      For backward compatibility, hostOrPathNameOrSocketAddr may be also a string or a byteArray,
      but it is recommended to pass SocketAddress instances.
@@ -3798,6 +3800,7 @@
     "
 ! !
 
+
 !Socket methodsFor:'specials'!
 
 linger:anIntegerOrNil
@@ -4073,6 +4076,7 @@
     ^ self setSocketOption:#'TCP_NODELAY' argument:aBoolean argument:nil.
 ! !
 
+
 !Socket methodsFor:'waiting'!
 
 waitForNewConnectionOrDataOnAny:otherConnections timeout:timeoutSeconds