Merge pull request zeromq#534 from hintjens/master

Reverted cleanups of copyrghts
scotty-labs · Mar 21, 2013 · 09a00de · 09a00de
2 parents 5ba7445 + 8c96deb
commit 09a00de
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,5 +1,14 @@
-Contributors
-============
+Corporate Contributors
+======================
+
+Copyright (c) 2007-2013 iMatix Corporation
+Copyright (c) 2009-2011 250bpm s.r.o.
+Copyright (c) 2010-2011 Miru Limited
+Copyright (c) 2011 VMware, Inc.
+Copyright (c) 2012 Spotify AB
+
+Individual Contributors
+=======================
 
 AJ Lewis <[email protected]>
 Alexej Lotz <[email protected]>

diff --git a/doc/zmq_getsockopt.txt b/doc/zmq_getsockopt.txt
@@ -60,7 +60,8 @@ ZMQ_SNDHWM: Retrieves high water mark for outbound messages
 The 'ZMQ_SNDHWM' option shall return the high water mark for outbound messages
 on the specified 'socket'. The high water mark is a hard limit on the maximum
 number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with.
+that the specified 'socket' is communicating with. A value of zero means no
+limit.
 
 If this limit has been reached the socket shall enter an exceptional state and
 depending on the socket type, 0MQ shall take appropriate action such as
@@ -80,7 +81,8 @@ ZMQ_RCVHWM: Retrieve high water mark for inbound messages
 The 'ZMQ_RCVHWM' option shall return the high water mark for inbound messages on
 the specified 'socket'. The high water mark is a hard limit on the maximum
 number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with.
+that the specified 'socket' is communicating with. A value of zero means no
+limit.
 
 If this limit has been reached the socket shall enter an exceptional state and
 depending on the socket type, 0MQ shall take appropriate action such as

diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt
@@ -31,7 +31,8 @@ ZMQ_SNDHWM: Set high water mark for outbound messages
 The 'ZMQ_SNDHWM' option shall set the high water mark for outbound messages on
 the specified 'socket'. The high water mark is a hard limit on the maximum
 number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with.
+that the specified 'socket' is communicating with. A value of zero means no
+limit.
 
 If this limit has been reached the socket shall enter an exceptional state and
 depending on the socket type, 0MQ shall take appropriate action such as
@@ -55,7 +56,8 @@ ZMQ_RCVHWM: Set high water mark for inbound messages
 The 'ZMQ_RCVHWM' option shall set the high water mark for inbound messages on
 the specified 'socket'. The high water mark is a hard limit on the maximum
 number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with.
+that the specified 'socket' is communicating with. A value of zero means no
+limit.
 
 If this limit has been reached the socket shall enter an exceptional state and
 depending on the socket type, 0MQ shall take appropriate action such as