# HG changeset patch
# User HG Automerge
# Date 1482747196 0
# Node ID be9c3684d375878904ab24b1b879a2cd50dbf68a
# Parent  df179f8c091cb8a1484ba2d82a09be083b0caeee# Parent  c1649b2bb8f7d120d47eb6e23af67be4dc71b3ee
Merge

diff -r df179f8c091c -r be9c3684d375 Arrow.st
--- a/Arrow.st	Thu Dec 22 23:10:37 2016 +0000
+++ b/Arrow.st	Mon Dec 26 10:13:16 2016 +0000
@@ -40,7 +40,7 @@
 "
     Arrows are just what the name says - a directed LineSegment, which
     draws itself with an arrowHead. The position of the arrowhead can
-    be set to be anywhere along the lineSegement (default is at the end).
+    be set to be anywhere along the lineSegment (default is at the end).
 
     Arrows can be drawn stroked or filled - when filled, only the arrowHead
     is filled.
diff -r df179f8c091c -r be9c3684d375 SegmentedOrderedCollection.st
--- a/SegmentedOrderedCollection.st	Thu Dec 22 23:10:37 2016 +0000
+++ b/SegmentedOrderedCollection.st	Mon Dec 26 10:13:16 2016 +0000
@@ -18,7 +18,7 @@
     adding/removing at either end AND relatively fast add/remove inside the collection.
     Compared to regular orderedColletions, there is not much of a difference if
     elements are added at either end.
-    However, when adding/removing inner elements, the performance of SegementedOrderedCollections
+    However, when adding/removing inner elements, the performance of SegmentedOrderedCollections
     is much better above a certain number of elements (actually quite big).
 
     However, notice again: 
diff -r df179f8c091c -r be9c3684d375 Socket.st
--- a/Socket.st	Thu Dec 22 23:10:37 2016 +0000
+++ b/Socket.st	Mon Dec 26 10:13:16 2016 +0000
@@ -818,11 +818,11 @@
     ^ self
         newTCPclientToHost:hostNameOrAddress
         port:aPortOrServiceName
-        domain:nil
+        domain:self defaultIpDomainForConnect
         withTimeout:nil
 
     "
-      Socket newTCPclientToHost:'www.exept.de' port:'http'
+      Socket newTCPclientToHost:'www.exept.de' port:'https'
     "
 
     "Created: 31.10.1995 / 18:54:11 / cg"
@@ -1123,11 +1123,11 @@
 
 defaultIpDomainForConnect
     "answer the domain used to look up host names for connect:
-	#AF_INET    use only IPv4
-	#AF_INET6   use only IPv6
-	nil         use both IPv4 and IPv6"
-
-    ^ #AF_INET
+        #AF_INET    use only IPv4
+        #AF_INET6   use only IPv6
+        nil         use both IPv4 and IPv6"
+
+    ^ nil
 ! !
 
 !Socket class methodsFor:'obsolete'!