Skip to content
Browse files

Merge pull request #463 from hintjens/master

Addded ROUTER-ROUTER (back) as valid combination
  • Loading branch information...
2 parents 3eaf4a9 + 6290054 commit d1e0889ab02b093233bb4fae26723c9b8daecb3b @hurtonm hurtonm committed Nov 9, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 doc/zmq_socket.txt
View
4 doc/zmq_socket.txt
@@ -130,7 +130,7 @@ Deprecated alias: 'ZMQ_XREQ'.
[horizontal]
.Summary of ZMQ_DEALER characteristics
-Compatible peer sockets:: 'ZMQ_ROUTER', 'ZMQ_REP'
+Compatible peer sockets:: 'ZMQ_ROUTER', 'ZMQ_REP', 'ZMQ_DEALER'
Direction:: Bidirectional
Send/receive pattern:: Unrestricted
Outgoing routing strategy:: Round-robin
@@ -166,7 +166,7 @@ Deprecated alias: 'ZMQ_XREP'.
[horizontal]
.Summary of ZMQ_ROUTER characteristics
-Compatible peer sockets:: 'ZMQ_DEALER', 'ZMQ_REQ'
+Compatible peer sockets:: 'ZMQ_DEALER', 'ZMQ_REQ', 'ZMQ_ROUTER'
Direction:: Bidirectional
Send/receive pattern:: Unrestricted
Outgoing routing strategy:: See text

0 comments on commit d1e0889

Please sign in to comment.
Something went wrong with that request. Please try again.