From 6c393f53e28f41118eed9a8d034d8d46f2555572 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Sat, 4 Sep 2010 15:54:34 +0200 Subject: Revert "Further cleanups on reference manual" This reverts commit 13f3481e127a6b2390e847af6b01ee88f1b4ae61. Conflicts: doc/zmq_device.txt doc/zmq_tcp.txt --- doc/zmq_bind.txt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'doc/zmq_bind.txt') diff --git a/doc/zmq_bind.txt b/doc/zmq_bind.txt index 5eb1bcf..3ad62e7 100644 --- a/doc/zmq_bind.txt +++ b/doc/zmq_bind.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 -- cgit v1.2.3 From 32baeb610e779862b58c56f66571b01599743a9e Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Sat, 4 Sep 2010 15:55:11 +0200 Subject: Revert "Various changes to documentation project:" This reverts commit 77a3c36ff1f11215229a4efdb821a3cb83a9d6fc. --- doc/zmq_bind.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'doc/zmq_bind.txt') diff --git a/doc/zmq_bind.txt b/doc/zmq_bind.txt index 3ad62e7..7aa5a0b 100644 --- a/doc/zmq_bind.txt +++ b/doc/zmq_bind.txt @@ -70,8 +70,8 @@ assert (socket); /* Bind it to a in-process transport with the address 'my_publisher' */ int rc = zmq_bind (socket, "inproc://my_publisher"); assert (rc == 0); -/* Bind it to a TCP transport on port 5555 of all local interfaces */ -rc = zmq_bind (socket, "tcp://*:5555"); +/* Bind it to a TCP transport on port 5555 of the 'eth0' interface */ +rc = zmq_bind (socket, "tcp://eth0:5555"); assert (rc == 0); ---- @@ -82,3 +82,8 @@ linkzmq:zmq_connect[3] linkzmq:zmq_socket[3] linkzmq:zmq[7] + +AUTHORS +------- +The 0MQ documentation was written by Martin Sustrik and +Martin Lucina . -- cgit v1.2.3