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_poll.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_poll.txt')
| -rw-r--r-- | doc/zmq_poll.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/zmq_poll.txt b/doc/zmq_poll.txt index 2648ad7..fe2a209 100644 --- a/doc/zmq_poll.txt +++ b/doc/zmq_poll.txt @@ -102,13 +102,13 @@ The provided 'items' was not valid (NULL). EXAMPLE ------- -.Polling indefinitely for input events on both a 0MQ socket and a TCP socket. +.Polling indefinitely for input events on both a 0MQ socket and a standard socket. ---- zmq_pollitem_t items [2]; /* First item refers to 0MQ socket 'socket' */ items[0].socket = socket; items[0].events = ZMQ_POLLIN; -/* Second item refers to TCP socket 'fd' */ +/* Second item refers to standard socket 'fd' */ items[1].socket = NULL; items[1].fd = fd; items[1].events = ZMQ_POLLIN; @@ -129,3 +129,7 @@ linkzmq:zmq[7] Your operating system documentation for the _poll()_ system call. +AUTHORS +------- +The 0MQ documentation was written by Martin Sustrik <sustrik@250bpm.com> and +Martin Lucina <mato@kotelna.sk>. |