Merge pull request #1269 from somdoron/manual_and_welcome

Manual and welcome documentation

AUTHORS

@@ -105,6 +105,7 @@ Lourens Naudé
 Hardeep Singh 
 André Caron 
 Tim Mossbarger 
+Doron Somech
 
 Credits
 =======

doc/zmq_setsockopt.txt

@@ -780,6 +780,36 @@ Option value unit:: 0, 1
 Default value:: 0
 Applicable socket types:: ZMQ_XPUB
 
+ZMQ_XPUB_MANUAL: change the subscription handling to manual
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sets the 'XPUB' socket subscription handling mode manual/automatic.
+A value of '0' is the default and subscription requests will be handled automatically.
+A value of '1' will change the subscription requests handling to manual, 
+with manual mode subscription requests are not added to the subscription list.
+To add subscription the user need to call setsockopt with ZMQ_SUBSCRIBE on XPUB socket.
+
+[horizontal]
+Option value type:: int
+Option value unit:: 0, 1
+Default value:: 0
+Applicable socket types:: ZMQ_XPUB
+
+ZMQ_WELCOME_MSG: set welcome message that will be received by subscriber when connecting
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sets a welcome message the will be recieved by subscriber when connecting.
+Subscriber must subscribe to the Welcome message before connecting.
+Welcome message will also be sent on reconnecting.
+For welcome message to work well user must poll on incoming subscription messages on the XPUB socket and handle them.
+
+Use NULL and lenght of zero to disable welcome message.
+
+[horizontal]
+Option value type:: binary data
+Option value unit:: N/A
+Default value:: NULL
+Applicable socket types:: ZMQ_XPUB
 
 ZMQ_ZAP_DOMAIN: Set RFC 27 authentication domain
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~