summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--doc/zmq_setsockopt.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 4d8bf08..c9417ef 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -39,6 +39,7 @@ Martin Sustrik <sustrik@250bpm.com>
Matus Hamorsky <mhamorsky@gmail.com>
Max Wolf <YIDIEPXGXGPN@spammotel.com>
McClain Looney <m@loonsoft.com>
+Michael Compton <michael.compton@littleedge.co.uk>
Mikael Helbo Kjaer <mhk@designtech.dk>
Mikko Koppanen <mkoppanen@php.net>
Min Ragan-Kelley <benjaminrk@gmail.com>
diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt
index c342850..5cc14cd 100644
--- a/doc/zmq_setsockopt.txt
+++ b/doc/zmq_setsockopt.txt
@@ -12,6 +12,7 @@ SYNOPSIS
--------
*int zmq_setsockopt (void '*socket', int 'option_name', const void '*option_value', size_t 'option_len');*
+Caution: All options, with the exception of subscription strings, only take effect for subsequent socket bind/connects.
DESCRIPTION
-----------