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_connect.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_connect.txt')
| -rw-r--r-- | doc/zmq_connect.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/doc/zmq_connect.txt b/doc/zmq_connect.txt index 5634bbf..ffcf3b4 100644 --- a/doc/zmq_connect.txt +++ b/doc/zmq_connect.txt @@ -24,15 +24,10 @@ the underlying transport protocol selected. The following transports are defined: -'inproc':: - local in-process (inter-thread) communication transport, see - linkzmq:zmq_inproc[7] -'ipc':: - local inter-process communication transport, see linkzmq:zmq_ipc[7] -'tcp':: - unicast transport using TCP, see linkzmq:zmq_tcp[7] -'pgm', 'epgm':: - reliable multicast transport using PGM, see linkzmq:zmq_pgm[7] +'inproc':: local in-process (inter-thread) communication transport, see linkzmq:zmq_inproc[7] +'ipc':: local inter-process communication transport, see linkzmq:zmq_ipc[7] +'tcp':: unicast transport using TCP, see linkzmq:zmq_tcp[7] +'pgm', 'epgm':: reliable multicast transport using PGM, see linkzmq:zmq_pgm[7] With the exception of 'ZMQ_PAIR' sockets, a single socket may be connected to multiple endpoints using _zmq_connect()_, while simultaneously accepting @@ -86,3 +81,7 @@ linkzmq:zmq_socket[3] linkzmq:zmq[7] +AUTHORS +------- +The 0MQ documentation was written by Martin Sustrik <sustrik@250bpm.com> and +Martin Lucina <mato@kotelna.sk>. |