Fix conlict

extra/cocoa/application/application-docs.factor

@@ -27,8 +27,8 @@ HELP: with-cocoa
 { $description "Sets up an autorelease pool, initializes the " { $snippet "NSApplication" } " singleton, and calls the quotation." } ;
 
 HELP: do-event
-{ $values { "app" "an " { $snippet "NSApplication" } } }
-{ $description "Processes any pending events in the queue. Does not block." } ;
+{ $values { "app" "an " { $snippet "NSApplication" } } { "?" "a boolean" } }
+{ $description "Processes a pending event in the queue, if any, returning a boolean indicating if there was one. Does not block." } ;
 
 HELP: add-observer
 { $values { "observer" "an " { $snippet "NSObject" } } { "selector" string } { "name" "an " { $snippet "NSString" } } { "object" "an " { $snippet "NSObject" } } }

extra/io/sockets/sockets-docs.factor

@@ -130,7 +130,7 @@ HELP: <server>
 { $errors "Throws an error if the address is already in use, or if it if the system forbids access." } ;
 
 HELP: accept
-{ $values { "server" "a handle" } { "client" "a bidirectional stream" } { "addrspec" "an address specifier" } }
+{ $values { "server" "a handle" } { "client" "a bidirectional stream" } { "remote" "an address specifier" } }
 { $description "Waits for a connection to a server socket created by " { $link <server> } ", and outputs a bidirectional stream when the connection has been established. The encoding of this stream is the one that was passed to the server constructor." }
 { $errors "Throws an error if the server socket is closed or otherwise is unavailable." } ;
 

extra/io/sockets/sockets.factor

@@ -185,7 +185,7 @@ M: object (client) ( remote -- client-in client-out local )
 
 SYMBOL: local-address
 
-: with-client ( addrspec encoding quot -- )
+: with-client ( remote encoding quot -- )
     >r <client> [ local-address set ] curry
     r> compose with-stream ; inline
 
@@ -230,7 +230,7 @@ HOOK: (datagram) io-backend ( addr -- datagram )
 
 HOOK: (receive) io-backend ( datagram -- packet addrspec )
 
-: receive ( datagram -- packet sockaddr )
+: receive ( datagram -- packet addrspec )
     check-datagram-port
     [ (receive) ] [ addr>> ] bi parse-sockaddr ;
 

extra/io/windows/nt/sockets/sockets.factor

@@ -131,7 +131,9 @@ TUPLE: WSARecvFrom-args port
     WSARecvFrom-args >tuple*< WSARecvFrom socket-error* ;
 
 : parse-WSARecvFrom ( n WSARecvFrom -- packet sockaddr )
-    [ lpBuffers*>> WSABUF-buf swap memory>byte-array ] [ lpFrom*>> ] bi ;
+    [ lpBuffers*>> WSABUF-buf swap memory>byte-array ]
+    [ lpFromLen*>> *int . ]
+    [ lpFrom*>> ] tri ;
 
 M: winnt (receive) ( datagram -- packet addrspec )
     [