From 18b6e6803bd0b8a11911d4adb3a0668f9630a347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kreuzberger?= <joerg@kreuzberger.eu>
Date: Tue, 14 Apr 2015 18:30:27 +0200
Subject: [PATCH 1/2] Add documenation for ZMQ_XPUP_NODROP

fix for issue #1287
---
 doc/zmq_setsockopt.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt
index 52ee0a82..e73d2254 100644
--- a/doc/zmq_setsockopt.txt
+++ b/doc/zmq_setsockopt.txt
@@ -808,6 +808,23 @@ Option value unit:: 0, 1
 Default value:: 0
 Applicable socket types:: ZMQ_XPUB
 
+ZMQ_XPUB_NODROP: do not silently drop messages if SENDHWM is reached
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the 'XPUB' socket behaviour to return error EAGAIN if SEND_HWM is
+reached and the message could not be send. 
+
+A value of '0' is the default and messages are dropped if SENDHWM is reached.
+
+A value of `0` is the default and drops the message silently when the peers
+SNDHWM is reached.  A value of `1` returns an 'EAGAIN' error code if the
+SNDHWM is reached and ZMQ_DONTWAIT was used.
+
+[horizontal]
+Option value type:: int
+Option value unit:: 0, 1
+Default value:: 0
+Applicable socket types:: ZMQ_XPUB, ZMQ_PUB
+
 ZMQ_WELCOME_MSG: set welcome message that will be received by subscriber when connecting
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

From d4a580349556afa98d98e4fa21532ccb7226e86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Kreuzberger?= <joerg@kreuzberger.eu>
Date: Tue, 14 Apr 2015 18:32:06 +0200
Subject: [PATCH 2/2] Update zmq_setsockopt.txt

#1287
---
 doc/zmq_setsockopt.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt
index e73d2254..031c406f 100644
--- a/doc/zmq_setsockopt.txt
+++ b/doc/zmq_setsockopt.txt
@@ -810,11 +810,9 @@ Applicable socket types:: ZMQ_XPUB
 
 ZMQ_XPUB_NODROP: do not silently drop messages if SENDHWM is reached
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the 'XPUB' socket behaviour to return error EAGAIN if SEND_HWM is
+Sets the 'XPUB' socket behaviour to return error EAGAIN if SENDHWM is
 reached and the message could not be send. 
 
-A value of '0' is the default and messages are dropped if SENDHWM is reached.
-
 A value of `0` is the default and drops the message silently when the peers
 SNDHWM is reached.  A value of `1` returns an 'EAGAIN' error code if the
 SNDHWM is reached and ZMQ_DONTWAIT was used.