From 83d253d72d4fe83f4a001a7cfb4059ccc52b04e0 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Sat, 4 Sep 2010 15:51:09 +0200 Subject: Revert "Removed wip zmq_deviced from master" This reverts commit de0173754cc82f6c08875a892892f043a804554c. --- doc/zmq.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc/zmq.txt') diff --git a/doc/zmq.txt b/doc/zmq.txt index 362f907..54c7ba1 100644 --- a/doc/zmq.txt +++ b/doc/zmq.txt @@ -144,7 +144,9 @@ nodes in complex messaging topologies. Devices can act as brokers that other nodes connect to, proxies that connect through to other nodes, or any mix of these two models. -You can start a device in an application thread, see linkzmq:zmq_device[3]. +You can start a device in an application thread, see linkzmq:zmq_device[3], +and you can also start devices externally, as standalone processes, see +linkzmq:zmq_deviced[1]. ERROR HANDLING -- cgit v1.2.3 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.txt | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'doc/zmq.txt') diff --git a/doc/zmq.txt b/doc/zmq.txt index 54c7ba1..d8f398e 100644 --- a/doc/zmq.txt +++ b/doc/zmq.txt @@ -139,14 +139,20 @@ Local in-process (inter-thread) communication transport:: Devices ~~~~~~~ -0MQ provides 'devices', which are building blocks that act as intermediate -nodes in complex messaging topologies. Devices can act as brokers that other -nodes connect to, proxies that connect through to other nodes, or any mix of -these two models. - -You can start a device in an application thread, see linkzmq:zmq_device[3], -and you can also start devices externally, as standalone processes, see -linkzmq:zmq_deviced[1]. +Apart from the 0MQ library the 0MQ distribution includes 'devices' which are +building blocks intended to serve as intermediate nodes in complex messaging +topologies. + +The following devices are provided: + +Forwarder device for request-response messaging:: + linkzmq:zmq_queue[1] + +Forwarder device for publish-subscribe messaging:: + linkzmq:zmq_forwarder[1] + +Streamer device for parallelized pipeline messaging:: + linkzmq:zmq_streamer[1] ERROR HANDLING -- 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.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'doc/zmq.txt') diff --git a/doc/zmq.txt b/doc/zmq.txt index d8f398e..06658c9 100644 --- a/doc/zmq.txt +++ b/doc/zmq.txt @@ -199,3 +199,22 @@ Other language bindings Other language bindings (Python, Ruby, Java and more) are provided by members of the 0MQ community and pointers can be found on the 0MQ website. + +AUTHORS +------- +The 0MQ documentation was written by Martin Sustrik and +Martin Lucina . + + +RESOURCES +--------- +Main web site: + +Report bugs to the 0MQ development mailing list: + + +COPYING +------- +Free use of this software is granted under the terms of the GNU Lesser General +Public License (LGPL). For details see the files `COPYING` and `COPYING.LESSER` +included with the 0MQ distribution. -- cgit v1.2.3