From fbe5d859f461b0deaa6083fdee077e01e9b47b91 Mon Sep 17 00:00:00 2001
From: Michael Compton <michael.compton@littleedge.co.uk>
Date: Tue, 15 Feb 2011 09:33:19 +0100
Subject: Added note regarding setting sockopt before bind/connect

Signed-off-by: Michael Compton <michael.compton@littleedge.co.uk>
---
 AUTHORS                | 1 +
 doc/zmq_setsockopt.txt | 1 +
 2 files changed, 2 insertions(+)

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
 -----------
-- 
cgit v1.2.3