summaryrefslogtreecommitdiff
path: root/doc/zmq.txt
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-05-31 06:11:42 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-05-31 06:11:42 +0200
commit3bb60da0d085b1089ddec4617fcd40f2cda88567 (patch)
tree3b63d553b602140e94e78ab0bef440708dd2e88a /doc/zmq.txt
parent04fcd4d55b3b01e75d1d0d547987841811a2d610 (diff)
parentda37c45b0c7200eea96118952e671972b71df4ce (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'doc/zmq.txt')
-rw-r--r--doc/zmq.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/zmq.txt b/doc/zmq.txt
index 003570a..fa15e43 100644
--- a/doc/zmq.txt
+++ b/doc/zmq.txt
@@ -90,8 +90,8 @@ Standard sockets present a _synchronous_ interface to either connection-mode
reliable byte streams (SOCK_STREAM), or connection-less unreliable datagrams
(SOCK_DGRAM). In comparison, 0MQ sockets present an abstraction of a
asynchronous _message queue_, with the exact queueing semantics depending on
-the socket type (_messaging pattern_) in use. See linkzmq:zmq_socket[3] for the
-_messaging patterns_ provided.
+the socket type in use. See linkzmq:zmq_socket[3] for the socket types
+provided.
0MQ sockets being _asynchronous_ means that the timings of the physical
connection setup and teardown, reconnect and effective delivery are organized