diff options
author | Martin Lucina <mato@kotelna.sk> | 2010-09-04 16:01:31 +0200 |
---|---|---|
committer | Martin Lucina <mato@kotelna.sk> | 2010-09-04 16:01:31 +0200 |
commit | 2673a84e07b93b8607958516c55341c2eb220a6e (patch) | |
tree | f92a010ef03d459b8c3087efd5a629d8a99a9af1 /doc/zmq_socket.txt | |
parent | 0a1f7e3524338690551c04ebfccd896a0b96f399 (diff) | |
parent | ee3444ff93888a052cd1ba48aa22892f7077a7a0 (diff) |
Merge branch 'maint'
* maint:
doc: Update zmq_socket(3) for 2.0.8 API changes
Revert "Added man page for the zmq_device method"
Revert "Added clean target that deletes generated man pages"
Revert "Various changes to documentation project:"
Revert "Reverting 'clean' change to Makefile"
Revert "Removed empty man pages for old standalone devices"
Revert "Further cleanups on reference manual"
Revert "Small improvements to zmq_device(3) page"
Revert "Removed wip zmq_deviced from master"
Diffstat (limited to 'doc/zmq_socket.txt')
-rw-r--r-- | doc/zmq_socket.txt | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/doc/zmq_socket.txt b/doc/zmq_socket.txt index 23a79e4..2156af2 100644 --- a/doc/zmq_socket.txt +++ b/doc/zmq_socket.txt @@ -223,13 +223,13 @@ to downstream pipeline _nodes_. Messages are load-balanced to all connected downstream _nodes_. The _zmq_recv()_ function is not implemented for this socket type. -When a 'ZMQ_PUSH' socket enters an exceptional state due to having -reached the high water mark for all downstream _nodes_, or if there are no -downstream _nodes_ at all, then any linkzmq:zmq_send[3] operations on the -socket shall block until the exceptional state ends or at least one downstream -_node_ becomes available for sending; messages are not discarded. +When a 'ZMQ_PUSH' socket enters an exceptional state due to having reached the +high water mark for all downstream _nodes_, or if there are no downstream +_nodes_ at all, then any linkzmq:zmq_send[3] operations on the socket shall +block until the exceptional state ends or at least one downstream _node_ +becomes available for sending; messages are not discarded. -Deprecated alias: ZMQ_DOWNSTREAM. +Deprecated alias: 'ZMQ_DOWNSTREAM'. [horizontal] .Summary of ZMQ_PUSH characteristics @@ -243,12 +243,12 @@ ZMQ_HWM option action:: Block ZMQ_PULL ^^^^^^^^ -A socket of type 'ZMQ_PULL' is used by a pipeline _node_ to receive -messages from upstream pipeline _nodes_. Messages are fair-queued from among -all connected upstream _nodes_. The _zmq_send()_ function is not implemented -for this socket type. +A socket of type 'ZMQ_PULL' is used by a pipeline _node_ to receive messages +from upstream pipeline _nodes_. Messages are fair-queued from among all +connected upstream _nodes_. The _zmq_send()_ function is not implemented for +this socket type. -Deprecated alias: ZMQ_UPSTREAM. +Deprecated alias: 'ZMQ_UPSTREAM'. [horizontal] .Summary of ZMQ_PULL characteristics @@ -317,3 +317,8 @@ linkzmq:zmq_send[3] linkzmq:zmq_recv[3] linkzmq:zmq[7] + +AUTHORS +------- +The 0MQ documentation was written by Martin Sustrik <sustrik@250bpm.com> and +Martin Lucina <mato@kotelna.sk>. |