summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMartin Lucina <mato@kotelna.sk>2010-02-16 19:59:32 +0100
committerMartin Lucina <mato@kotelna.sk>2010-02-16 19:59:32 +0100
commit96b2690716a811a4c782de0eccfb9affa398cfe4 (patch)
tree49719fc9222c444f6d919cd33294be9ccb550c82 /doc
parent60ce5cc82a48d5881cb493a5b6b3afba19bd0863 (diff)
parenta2f9899f6a1fad3f9c73fc7599445bdde0b95ec4 (diff)
Merge branch 'master' of github.com:sustrik/zeromq2
Diffstat (limited to 'doc')
-rw-r--r--doc/zmq_poll.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/zmq_poll.txt b/doc/zmq_poll.txt
index 8e386bc..9969d0f 100644
--- a/doc/zmq_poll.txt
+++ b/doc/zmq_poll.txt
@@ -49,7 +49,8 @@ infinite timeout.
RETURN VALUE
------------
-Function returns number of items signaled or -1 in the case of error.
+Function returns number of items signaled, 0 in the case of timeout or -1
+in the case of error.
ERRORS