diff --git a/.gitignore b/.gitignore
index 266852e6..2186e0de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,7 +88,6 @@ tests/test_many_sockets
 tests/test_diffserv
 tests/test*.log
 tests/test*.trs
-tests/test_zap_ipc_creds
 src/platform.hpp*
 src/stamp-h1
 perf/local_lat
diff --git a/AUTHORS b/AUTHORS
index 29c0811f..4cceee62 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,12 @@
 Corporate Contributors
 ======================
 
-Copyright (c) 2007-2013 iMatix Corporation
+Copyright (c) 2007-2014 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
+Copyright (c) 2013 Ericsson AB
 
 Individual Contributors
 =======================
diff --git a/doc/zmq_getsockopt.txt b/doc/zmq_getsockopt.txt
index 9beeb15c..f49fb711 100644
--- a/doc/zmq_getsockopt.txt
+++ b/doc/zmq_getsockopt.txt
@@ -26,77 +26,6 @@ value stored in the buffer.
 The following options can be retrieved with the _zmq_getsockopt()_ function:
 
 
-ZMQ_TYPE: Retrieve socket type
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_TYPE' option shall retrieve the socket type for the specified
-'socket'.  The socket type is specified at socket creation time and
-cannot be modified afterwards.
-
-[horizontal]
-Option value type:: int
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_RCVMORE: More message data parts to follow
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVMORE' option shall return True (1) if the message part last
-received from the 'socket' was a data part with more parts to follow. If there
-are no data parts to follow, this option shall return False (0).
-
-Refer to linkzmq:zmq_send[3] and linkzmq:zmq_recv[3] for a detailed description
-of multi-part messages.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: N/A
-Applicable socket types:: all
-
-
-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. 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
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
-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. 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
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
 ZMQ_AFFINITY: Retrieve I/O thread affinity
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The 'ZMQ_AFFINITY' option shall retrieve the I/O thread affinity for newly
@@ -120,143 +49,6 @@ Default value:: 0
 Applicable socket types:: N/A
 
 
-ZMQ_IDENTITY: Retrieve socket identity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_IDENTITY' option shall retrieve the identity of the specified 'socket'.
-Socket identity is used only by request/reply pattern. Namely, it can be used
-in tandem with ROUTER socket to route messages to the peer with specific
-identity.
-
-Identity should be at least one byte and at most 255 bytes long. Identities
-starting with binary zero are reserved for use by 0MQ infrastructure.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_REP, ZMQ_REQ, ZMQ_ROUTER, ZMQ_DEALER.
-
-
-ZMQ_RATE: Retrieve multicast data rate
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RATE' option shall retrieve the maximum send or receive data rate for
-multicast transports using the specified 'socket'.
-
-[horizontal]
-Option value type:: int
-Option value unit:: kilobits per second
-Default value:: 100
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_RECOVERY_IVL: Get multicast recovery interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECOVERY_IVL' option shall retrieve the recovery interval for
-multicast transports using the specified 'socket'.  The recovery interval
-determines the maximum time in milliseconds that a receiver can be absent from a
-multicast group before unrecoverable data loss will occur.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 10000
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_SNDBUF: Retrieve kernel transmit buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SNDBUF' option shall retrieve the underlying kernel transmit buffer
-size for the specified 'socket'. A value of zero means that the OS default is
-in effect. For details refer to your operating system documentation for the
-'SO_SNDBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 0
-Applicable socket types:: all
-
-
-ZMQ_RCVBUF: Retrieve kernel receive buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVBUF' option shall retrieve the underlying kernel receive buffer
-size for the specified 'socket'. A value of zero means that the OS default is
-in effect. For details refer to your operating system documentation for the
-'SO_RCVBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 0
-Applicable socket types:: all
-
-
-ZMQ_LINGER: Retrieve linger period for socket shutdown
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_LINGER' option shall retrieve the linger period for the specified
-'socket'.  The linger period determines how long pending messages which have
-yet to be sent to a peer shall linger in memory after a socket is closed with
-linkzmq:zmq_close[3], and further affects the termination of the socket's
-context with linkzmq:zmq_term[3]. The following outlines the different
-behaviours:
-
-* The default value of '-1' specifies an infinite linger period. Pending
-  messages shall not be discarded after a call to _zmq_close()_; attempting to
-  terminate the socket's context with _zmq_term()_ shall block until all
-  pending messages have been sent to a peer.
-
-* The value of '0' specifies no linger period. Pending messages shall be
-  discarded immediately when the socket is closed with _zmq_close()_.
-
-* Positive values specify an upper bound for the linger period in milliseconds.
-  Pending messages shall not be discarded after a call to _zmq_close()_;
-  attempting to terminate the socket's context with _zmq_term()_ shall block
-  until either all pending messages have been sent to a peer, or the linger
-  period expires, after which any pending messages shall be discarded.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_RECONNECT_IVL: Retrieve reconnection interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_IVL' option shall retrieve the initial reconnection interval
-for the specified 'socket'.  The reconnection interval is the period 0MQ shall
-wait between attempts to reconnect disconnected peers when using
-connection-oriented transports. The value -1 means no reconnection.
-
-NOTE: The reconnection interval may be randomized by 0MQ to prevent
-reconnection storms in topologies with a large number of peers per socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 100
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RECONNECT_IVL_MAX: Retrieve maximum reconnection interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_IVL_MAX' option shall retrieve the maximum reconnection
-interval for the specified 'socket'.  This is the maximum period 0MQ shall wait
-between attempts to reconnect. On each reconnect attempt, the previous interval
-shall be doubled untill ZMQ_RECONNECT_IVL_MAX is reached. This allows for
-exponential backoff strategy. Default value means no exponential backoff is
-performed and reconnect interval calculations are only based on
-ZMQ_RECONNECT_IVL.
-
-NOTE:  Values less than ZMQ_RECONNECT_IVL will be ignored.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (only use ZMQ_RECONNECT_IVL)
-Applicable socket types:: all, only for connection-oriented transport
-
-
 ZMQ_BACKLOG: Retrieve maximum length of the queue of outstanding connections
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The 'ZMQ_BACKLOG' option shall retrieve the maximum length of the queue of
@@ -271,302 +63,6 @@ Default value:: 100
 Applicable socket types:: all, only for connection-oriented transports
 
 
-ZMQ_MAXMSGSIZE: Maximum acceptable inbound message size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The option shall retrieve limit for the inbound messages. If a peer sends
-a message larger than ZMQ_MAXMSGSIZE it is disconnected. Value of -1 means
-'no limit'.
-
-[horizontal]
-Option value type:: int64_t
-Option value unit:: bytes
-Default value:: -1
-Applicable socket types:: all
-
-
-ZMQ_MULTICAST_HOPS: Maximum network hops for multicast packets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The option shall retrieve time-to-live used for outbound multicast packets.
-The default of 1 means that the multicast packets don't leave the local network.
-
-[horizontal]
-Option value type:: int
-Option value unit:: network hops
-Default value:: 1
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_RCVTIMEO: Maximum time before a socket operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the timeout for recv operation on the socket.  If the value is `0`,
-_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
-message to receive. If the value is `-1`, it will block until a message is
-available. For all other values, it will wait for a message for that amount
-of time before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_SNDTIMEO: Maximum time before a socket operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the timeout for send operation on the socket. If the value is `0`,
-_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
-cannot be sent. If the value is `-1`, it will block until the message is sent.
-For all other values, it will try to send the message for that amount of time
-before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_IPV6: Retrieve IPv6 socket status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the IPv6 option for the socket. A value of `1` means IPv6 is
-enabled on the socket, while `0` means the socket will use only IPv4.
-When IPv6 is enabled the socket will connect to, or accept connections
-from, both IPv4 and IPv6 hosts.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_IPV4ONLY: Retrieve IPv4-only socket override status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the IPv4-only option for the socket. This option is deprecated.
-Please use the ZMQ_IPV6 option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 1 (true)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TOS: Retrieve the Type-of-Service socket override status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the IP_TOS option for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: >0
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_IMMEDIATE: Retrieve attach-on-connect value
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the state of the attach on connect value. If set to `1`, will delay the
-attachment of a pipe on connect until the underlying connection has completed.
-This will cause the socket to block if there are no other connections, but will
-prevent queues from filling on pipes awaiting connection.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, primarily when using TCP/IPC transports.
-
-
-ZMQ_FD: Retrieve file descriptor associated with the socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_FD' option shall retrieve the file descriptor associated with the
-specified 'socket'. The returned file descriptor can be used to integrate the
-socket into an existing event loop; the 0MQ library shall signal any pending
-events on the socket in an _edge-triggered_ fashion by making the file
-descriptor become ready for reading.
-
-NOTE: The ability to read from the returned file descriptor does not
-necessarily indicate that messages are available to be read from, or can be
-written to, the underlying socket; applications must retrieve the actual event
-state with a subsequent retrieval of the 'ZMQ_EVENTS' option.
-
-NOTE: The returned file descriptor is also used internally by the 'zmq_send'
-and 'zmq_recv' functions. As the descriptor is edge triggered, applications
-must update the state of 'ZMQ_EVENTS' after each invocation of 'zmq_send'
-or 'zmq_recv'.To be more explicit: after calling 'zmq_send' the socket may
-become readable (and vice versa) without triggering a read event on the
-file descriptor.
-
-CAUTION: The returned file descriptor is intended for use with a 'poll' or
-similar system call only. Applications must never attempt to read or write data
-to it directly, neither should they try to close it.
-
-[horizontal]
-Option value type:: int on POSIX systems, SOCKET on Windows
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_EVENTS: Retrieve socket event state
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_EVENTS' option shall retrieve the event state for the specified
-'socket'.  The returned value is a bit mask constructed by OR'ing a combination
-of the following event flags:
-
-*ZMQ_POLLIN*::
-Indicates that at least one message may be received from the specified socket
-without blocking.
-
-*ZMQ_POLLOUT*::
-Indicates that at least one message may be sent to the specified socket without
-blocking.
-
-The combination of a file descriptor returned by the 'ZMQ_FD' option being
-ready for reading but no actual events returned by a subsequent retrieval of
-the 'ZMQ_EVENTS' option is valid; applications should simply ignore this case
-and restart their polling operation/event loop.
-
-[horizontal]
-Option value type:: int
-Option value unit:: N/A (flags)
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_LAST_ENDPOINT: Retrieve the last endpoint set
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_LAST_ENDPOINT' option shall retrieve the last endpoint bound for
-TCP and IPC transports. The returned value will be a string in the form of
-a ZMQ DSN. Note that if the TCP host is INADDR_ANY, indicated by a *, then
-the returned address will be 0.0.0.0 (for IPv4).
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: all, when binding TCP or IPC transports
-
-
-ZMQ_TCP_KEEPALIVE: Override SO_KEEPALIVE socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'SO_KEEPALIVE' socket option(where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,0,1
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_IDLE: Override TCP_KEEPCNT(or TCP_KEEPALIVE on some OS)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPCNT'(or 'TCP_KEEPALIVE' on some OS) socket option (where
-supported by OS). The default value of `-1` means to skip any overrides and
-leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_CNT: Override TCP_KEEPCNT socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPCNT' socket option(where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_INTVL: Override TCP_KEEPINTVL socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPINTVL' socket option(where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_ZAP_IPC_CREDS: Retrieve IPC peer credentials state
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The 'ZMQ_ZAP_IPC_CREDS' option shall return True (1) if credentials of IPC
-peers will be appended to the address sent in ZAP request messages and False
-(0) otherwise.
-
-Refer to linkzmq:zmq_setsockopt[3] for more information.
-
-NOTE: IPC peer credentials are only available on platforms supporting the
-SO_PEERCRED or LOCAL_PEERCRED socket options.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all listening sockets, when using IPC transports.
-
-
-ZMQ_MECHANISM: Retrieve current security mechanism
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MECHANISM' option shall retrieve the current security mechanism
-for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: ZMQ_NULL, ZMQ_PLAIN, or ZMQ_CURVE
-Default value:: ZMQ_NULL
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_PLAIN_SERVER: Retrieve current PLAIN server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_PLAIN_SERVER' option, if any, previously set on the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: int
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_PLAIN_USERNAME: Retrieve current PLAIN username
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_PLAIN_USERNAME' option shall retrieve the last username set for
-the PLAIN security mechanism. The returned value shall be a NULL-terminated
-string and MAY be empty. The returned size SHALL include the terminating
-null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_PLAIN_PASSWORD: Retrieve current password
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_PLAIN_PASSWORD' option shall retrieve the last password set for
-the PLAIN security mechanism. The returned value shall be a NULL-terminated
-string and MAY be empty. The returned size SHALL include the terminating
-null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP or IPC transports
-
-
 ZMQ_CURVE_PUBLICKEY: Retrieve current CURVE public key
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -611,6 +107,491 @@ Default value:: null
 Applicable socket types:: all, when using TCP transport
 
 
+ZMQ_EVENTS: Retrieve socket event state
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_EVENTS' option shall retrieve the event state for the specified
+'socket'.  The returned value is a bit mask constructed by OR'ing a combination
+of the following event flags:
+
+*ZMQ_POLLIN*::
+Indicates that at least one message may be received from the specified socket
+without blocking.
+
+*ZMQ_POLLOUT*::
+Indicates that at least one message may be sent to the specified socket without
+blocking.
+
+The combination of a file descriptor returned by the 'ZMQ_FD' option being
+ready for reading but no actual events returned by a subsequent retrieval of
+the 'ZMQ_EVENTS' option is valid; applications should simply ignore this case
+and restart their polling operation/event loop.
+
+[horizontal]
+Option value type:: int
+Option value unit:: N/A (flags)
+Default value:: N/A
+Applicable socket types:: all
+
+
+ZMQ_FD: Retrieve file descriptor associated with the socket
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_FD' option shall retrieve the file descriptor associated with the
+specified 'socket'. The returned file descriptor can be used to integrate the
+socket into an existing event loop; the 0MQ library shall signal any pending
+events on the socket in an _edge-triggered_ fashion by making the file
+descriptor become ready for reading.
+
+NOTE: The ability to read from the returned file descriptor does not
+necessarily indicate that messages are available to be read from, or can be
+written to, the underlying socket; applications must retrieve the actual event
+state with a subsequent retrieval of the 'ZMQ_EVENTS' option.
+
+NOTE: The returned file descriptor is also used internally by the 'zmq_send'
+and 'zmq_recv' functions. As the descriptor is edge triggered, applications
+must update the state of 'ZMQ_EVENTS' after each invocation of 'zmq_send'
+or 'zmq_recv'.To be more explicit: after calling 'zmq_send' the socket may
+become readable (and vice versa) without triggering a read event on the
+file descriptor.
+
+CAUTION: The returned file descriptor is intended for use with a 'poll' or
+similar system call only. Applications must never attempt to read or write data
+to it directly, neither should they try to close it.
+
+[horizontal]
+Option value type:: int on POSIX systems, SOCKET on Windows
+Option value unit:: N/A
+Default value:: N/A
+Applicable socket types:: all
+
+
+ZMQ_IDENTITY: Retrieve socket identity
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_IDENTITY' option shall retrieve the identity of the specified 'socket'.
+Socket identity is used only by request/reply pattern. Namely, it can be used
+in tandem with ROUTER socket to route messages to the peer with specific
+identity.
+
+Identity should be at least one byte and at most 255 bytes long. Identities
+starting with binary zero are reserved for use by 0MQ infrastructure.
+
+[horizontal]
+Option value type:: binary data
+Option value unit:: N/A
+Default value:: NULL
+Applicable socket types:: ZMQ_REP, ZMQ_REQ, ZMQ_ROUTER, ZMQ_DEALER.
+
+
+ZMQ_IMMEDIATE: Retrieve attach-on-connect value
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Retrieve the state of the attach on connect value. If set to `1`, will delay the
+attachment of a pipe on connect until the underlying connection has completed.
+This will cause the socket to block if there are no other connections, but will
+prevent queues from filling on pipes awaiting connection.
+
+[horizontal]
+Option value type:: int
+Option value unit:: boolean
+Default value:: 0 (false)
+Applicable socket types:: all, primarily when using TCP/IPC transports.
+
+
+ZMQ_IPV4ONLY: Retrieve IPv4-only socket override status
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Retrieve the IPv4-only option for the socket. This option is deprecated.
+Please use the ZMQ_IPV6 option.
+
+[horizontal]
+Option value type:: int
+Option value unit:: boolean
+Default value:: 1 (true)
+Applicable socket types:: all, when using TCP transports.
+
+
+ZMQ_IPV6: Retrieve IPv6 socket status
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Retrieve the IPv6 option for the socket. A value of `1` means IPv6 is
+enabled on the socket, while `0` means the socket will use only IPv4.
+When IPv6 is enabled the socket will connect to, or accept connections
+from, both IPv4 and IPv6 hosts.
+
+[horizontal]
+Option value type:: int
+Option value unit:: boolean
+Default value:: 0 (false)
+Applicable socket types:: all, when using TCP transports.
+
+
+ZMQ_LAST_ENDPOINT: Retrieve the last endpoint set
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_LAST_ENDPOINT' option shall retrieve the last endpoint bound for
+TCP and IPC transports. The returned value will be a string in the form of
+a ZMQ DSN. Note that if the TCP host is INADDR_ANY, indicated by a *, then
+the returned address will be 0.0.0.0 (for IPv4).
+
+[horizontal]
+Option value type:: NULL-terminated character string
+Option value unit:: N/A
+Default value:: NULL
+Applicable socket types:: all, when binding TCP or IPC transports
+
+
+ZMQ_LINGER: Retrieve linger period for socket shutdown
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_LINGER' option shall retrieve the linger period for the specified
+'socket'.  The linger period determines how long pending messages which have
+yet to be sent to a peer shall linger in memory after a socket is closed with
+linkzmq:zmq_close[3], and further affects the termination of the socket's
+context with linkzmq:zmq_term[3]. The following outlines the different
+behaviours:
+
+* The default value of '-1' specifies an infinite linger period. Pending
+  messages shall not be discarded after a call to _zmq_close()_; attempting to
+  terminate the socket's context with _zmq_term()_ shall block until all
+  pending messages have been sent to a peer.
+
+* The value of '0' specifies no linger period. Pending messages shall be
+  discarded immediately when the socket is closed with _zmq_close()_.
+
+* Positive values specify an upper bound for the linger period in milliseconds.
+  Pending messages shall not be discarded after a call to _zmq_close()_;
+  attempting to terminate the socket's context with _zmq_term()_ shall block
+  until either all pending messages have been sent to a peer, or the linger
+  period expires, after which any pending messages shall be discarded.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: -1 (infinite)
+Applicable socket types:: all
+
+
+ZMQ_MAXMSGSIZE: Maximum acceptable inbound message size
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The option shall retrieve limit for the inbound messages. If a peer sends
+a message larger than ZMQ_MAXMSGSIZE it is disconnected. Value of -1 means
+'no limit'.
+
+[horizontal]
+Option value type:: int64_t
+Option value unit:: bytes
+Default value:: -1
+Applicable socket types:: all
+
+
+ZMQ_MECHANISM: Retrieve current security mechanism
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_MECHANISM' option shall retrieve the current security mechanism
+for the socket.
+
+[horizontal]
+Option value type:: int
+Option value unit:: ZMQ_NULL, ZMQ_PLAIN, or ZMQ_CURVE
+Default value:: ZMQ_NULL
+Applicable socket types:: all, when using TCP or IPC transports
+
+
+ZMQ_MULTICAST_HOPS: Maximum network hops for multicast packets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The option shall retrieve time-to-live used for outbound multicast packets.
+The default of 1 means that the multicast packets don't leave the local network.
+
+[horizontal]
+Option value type:: int
+Option value unit:: network hops
+Default value:: 1
+Applicable socket types:: all, when using multicast transports
+
+
+ZMQ_PLAIN_PASSWORD: Retrieve current password
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_PLAIN_PASSWORD' option shall retrieve the last password set for
+the PLAIN security mechanism. The returned value shall be a NULL-terminated
+string and MAY be empty. The returned size SHALL include the terminating
+null byte.
+
+[horizontal]
+Option value type:: NULL-terminated character string
+Option value unit:: N/A
+Default value:: null string
+Applicable socket types:: all, when using TCP or IPC transports
+
+
+ZMQ_PLAIN_SERVER: Retrieve current PLAIN server role
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Returns the 'ZMQ_PLAIN_SERVER' option, if any, previously set on the socket.
+
+[horizontal]
+Option value type:: int
+Option value unit:: 0, 1
+Default value:: int
+Applicable socket types:: all, when using TCP or IPC transports
+
+
+ZMQ_PLAIN_USERNAME: Retrieve current PLAIN username
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_PLAIN_USERNAME' option shall retrieve the last username set for
+the PLAIN security mechanism. The returned value shall be a NULL-terminated
+string and MAY be empty. The returned size SHALL include the terminating
+null byte.
+
+[horizontal]
+Option value type:: NULL-terminated character string
+Option value unit:: N/A
+Default value:: null string
+Applicable socket types:: all, when using TCP or IPC transports
+
+
+ZMQ_RATE: Retrieve multicast data rate
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_RATE' option shall retrieve the maximum send or receive data rate for
+multicast transports using the specified 'socket'.
+
+[horizontal]
+Option value type:: int
+Option value unit:: kilobits per second
+Default value:: 100
+Applicable socket types:: all, when using multicast transports
+
+
+ZMQ_RCVBUF: Retrieve kernel receive buffer size
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_RCVBUF' option shall retrieve the underlying kernel receive buffer
+size for the specified 'socket'. A value of zero means that the OS default is
+in effect. For details refer to your operating system documentation for the
+'SO_RCVBUF' socket option.
+
+[horizontal]
+Option value type:: int
+Option value unit:: bytes
+Default value:: 0
+Applicable socket types:: all
+
+
+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. 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
+blocking or dropping sent messages. Refer to the individual socket descriptions
+in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
+type.
+
+[horizontal]
+Option value type:: int
+Option value unit:: messages
+Default value:: 1000
+Applicable socket types:: all
+
+
+ZMQ_RCVMORE: More message data parts to follow
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_RCVMORE' option shall return True (1) if the message part last
+received from the 'socket' was a data part with more parts to follow. If there
+are no data parts to follow, this option shall return False (0).
+
+Refer to linkzmq:zmq_send[3] and linkzmq:zmq_recv[3] for a detailed description
+of multi-part messages.
+
+[horizontal]
+Option value type:: int
+Option value unit:: boolean
+Default value:: N/A
+Applicable socket types:: all
+
+
+ZMQ_RCVTIMEO: Maximum time before a socket operation returns with EAGAIN
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Retrieve the timeout for recv operation on the socket.  If the value is `0`,
+_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
+message to receive. If the value is `-1`, it will block until a message is
+available. For all other values, it will wait for a message for that amount
+of time before returning with an EAGAIN error.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: -1 (infinite)
+Applicable socket types:: all
+
+
+ZMQ_RECONNECT_IVL: Retrieve reconnection interval
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_RECONNECT_IVL' option shall retrieve the initial reconnection interval
+for the specified 'socket'.  The reconnection interval is the period 0MQ shall
+wait between attempts to reconnect disconnected peers when using
+connection-oriented transports. The value -1 means no reconnection.
+
+NOTE: The reconnection interval may be randomized by 0MQ to prevent
+reconnection storms in topologies with a large number of peers per socket.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: 100
+Applicable socket types:: all, only for connection-oriented transports
+
+
+ZMQ_RECONNECT_IVL_MAX: Retrieve maximum reconnection interval
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_RECONNECT_IVL_MAX' option shall retrieve the maximum reconnection
+interval for the specified 'socket'.  This is the maximum period 0MQ shall wait
+between attempts to reconnect. On each reconnect attempt, the previous interval
+shall be doubled untill ZMQ_RECONNECT_IVL_MAX is reached. This allows for
+exponential backoff strategy. Default value means no exponential backoff is
+performed and reconnect interval calculations are only based on
+ZMQ_RECONNECT_IVL.
+
+NOTE:  Values less than ZMQ_RECONNECT_IVL will be ignored.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: 0 (only use ZMQ_RECONNECT_IVL)
+Applicable socket types:: all, only for connection-oriented transport
+
+
+ZMQ_RECOVERY_IVL: Get multicast recovery interval
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_RECOVERY_IVL' option shall retrieve the recovery interval for
+multicast transports using the specified 'socket'.  The recovery interval
+determines the maximum time in milliseconds that a receiver can be absent from a
+multicast group before unrecoverable data loss will occur.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: 10000
+Applicable socket types:: all, when using multicast transports
+
+
+ZMQ_SNDBUF: Retrieve kernel transmit buffer size
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_SNDBUF' option shall retrieve the underlying kernel transmit buffer
+size for the specified 'socket'. A value of zero means that the OS default is
+in effect. For details refer to your operating system documentation for the
+'SO_SNDBUF' socket option.
+
+[horizontal]
+Option value type:: int
+Option value unit:: bytes
+Default value:: 0
+Applicable socket types:: all
+
+
+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. 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
+blocking or dropping sent messages. Refer to the individual socket descriptions
+in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
+type.
+
+[horizontal]
+Option value type:: int
+Option value unit:: messages
+Default value:: 1000
+Applicable socket types:: all
+
+
+ZMQ_SNDTIMEO: Maximum time before a socket operation returns with EAGAIN
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Retrieve the timeout for send operation on the socket. If the value is `0`,
+_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
+cannot be sent. If the value is `-1`, it will block until the message is sent.
+For all other values, it will try to send the message for that amount of time
+before returning with an EAGAIN error.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: -1 (infinite)
+Applicable socket types:: all
+
+
+ZMQ_TCP_KEEPALIVE: Override SO_KEEPALIVE socket option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Override 'SO_KEEPALIVE' socket option(where supported by OS).
+The default value of `-1` means to skip any overrides and leave it to OS default.
+
+[horizontal]
+Option value type:: int
+Option value unit:: -1,0,1
+Default value:: -1 (leave to OS default)
+Applicable socket types:: all, when using TCP transports.
+
+
+ZMQ_TCP_KEEPALIVE_CNT: Override TCP_KEEPCNT socket option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Override 'TCP_KEEPCNT' socket option(where supported by OS).
+The default value of `-1` means to skip any overrides and leave it to OS default.
+
+[horizontal]
+Option value type:: int
+Option value unit:: -1,>0
+Default value:: -1 (leave to OS default)
+Applicable socket types:: all, when using TCP transports.
+
+
+ZMQ_TCP_KEEPALIVE_IDLE: Override TCP_KEEPCNT(or TCP_KEEPALIVE on some OS)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Override 'TCP_KEEPCNT'(or 'TCP_KEEPALIVE' on some OS) socket option (where
+supported by OS). The default value of `-1` means to skip any overrides and
+leave it to OS default.
+
+[horizontal]
+Option value type:: int
+Option value unit:: -1,>0
+Default value:: -1 (leave to OS default)
+Applicable socket types:: all, when using TCP transports.
+
+
+ZMQ_TCP_KEEPALIVE_INTVL: Override TCP_KEEPINTVL socket option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Override 'TCP_KEEPINTVL' socket option(where supported by OS).
+The default value of `-1` means to skip any overrides and leave it to OS default.
+
+[horizontal]
+Option value type:: int
+Option value unit:: -1,>0
+Default value:: -1 (leave to OS default)
+Applicable socket types:: all, when using TCP transports.
+
+
+ZMQ_TOS: Retrieve the Type-of-Service socket override status
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Retrieve the IP_TOS option for the socket.
+
+[horizontal]
+Option value type:: int
+Option value unit:: >0
+Default value:: 0
+Applicable socket types:: all, only for connection-oriented transports
+
+
+ZMQ_TYPE: Retrieve socket type
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_TYPE' option shall retrieve the socket type for the specified
+'socket'.  The socket type is specified at socket creation time and
+cannot be modified afterwards.
+
+[horizontal]
+Option value type:: int
+Option value unit:: N/A
+Default value:: N/A
+Applicable socket types:: all
+
+
 ZMQ_ZAP_DOMAIN: Retrieve RFC 27 authentication domain
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/zmq_proxy_steerable.txt b/doc/zmq_proxy_steerable.txt
index c6bf3c31..08490985 100644
--- a/doc/zmq_proxy_steerable.txt
+++ b/doc/zmq_proxy_steerable.txt
@@ -10,7 +10,7 @@ control flow
 SYNOPSIS
 --------
 *int zmq_proxy_steerable (const void '*frontend', const void '*backend', 
-							const void '*capture', const void '*control');*
+     const void '*capture', const void '*control');*
 
 
 DESCRIPTION
@@ -54,14 +54,17 @@ void *backend = zmq_socket (context, ZMQ_DEALER);
 assert (frontend);
 void *control = zmq_socket (context, ZMQ_SUB);
 assert (control);
+
 //  Bind sockets to TCP ports
 assert (zmq_bind (frontend, "tcp://*:5555") == 0);
 assert (zmq_bind (backend, "tcp://*:5556") == 0);
 assert (zmq_connect (control, "tcp://*:5557") == 0);
+
 // Subscribe to the control socket since we have chosen SUB here
 assert (zmq_setsockopt (control, ZMQ_SUBSCRIBE, "", 0));
-//  Start the queue proxy, which runs until ETERM or "TERMINATE" received on
-the control socket
+
+//  Start the queue proxy, which runs until ETERM or "TERMINATE" 
+//  received on the control socket
 zmq_proxy_steerable (frontend, backend, NULL, control);
 ----
 .Set up a controller in another node, process or whatever
@@ -69,10 +72,13 @@ zmq_proxy_steerable (frontend, backend, NULL, control);
 void *control = zmq_socket (context, ZMQ_PUB);
 assert (control);
 assert (zmq_bind (control, "tcp://*:5557") == 0);
+
 // pause the proxy
 assert (zmq_send (control, "PAUSE", 5, 0) == 0);
+
 // resume the proxy
 assert (zmq_send (control, "RESUME", 6, 0) == 0);
+
 // terminate the proxy
 assert (zmq_send (control, "TERMINATE", 9, 0) == 0);
 ---
diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt
index 95261cad..2e157f9c 100644
--- a/doc/zmq_setsockopt.txt
+++ b/doc/zmq_setsockopt.txt
@@ -30,52 +30,6 @@ argument is the size of the option value in bytes.
 The following socket options can be set with the _zmq_setsockopt()_ function:
 
 
-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. 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
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-NOTE: 0MQ does not guarantee that the socket will accept as many as ZMQ_SNDHWM
-messages, and the actual limit may be as much as 60-70% lower depending on the
-flow of messages on the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
-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. 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
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
 ZMQ_AFFINITY: Set I/O thread affinity
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The 'ZMQ_AFFINITY' option shall set the I/O thread affinity for newly created
@@ -99,52 +53,109 @@ Default value:: 0
 Applicable socket types:: N/A
 
 
-ZMQ_SUBSCRIBE: Establish message filter
+ZMQ_BACKLOG: Set maximum length of the queue of outstanding connections
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_BACKLOG' option shall set the maximum length of the queue of
+outstanding peer connections for the specified 'socket'; this only applies to
+connection-oriented transports. For details refer to your operating system
+documentation for the 'listen' function.
+
+[horizontal]
+Option value type:: int
+Option value unit:: connections
+Default value:: 100
+Applicable socket types:: all, only for connection-oriented transports.
+
+
+ZMQ_CONFLATE: Keep only last message
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+If set, a socket shall keep only one message in its inbound/outbound
+queue, this message being the last message received/the last message
+to be sent. Ignores 'ZMQ_RECVHWM' and 'ZMQ_SENDHWM' options. Does not
+support multi-part messages, in particular, only one part of it is kept
+in the socket internal queue.
+
+[horizontal]
+Option value type:: int
+Option value unit:: boolean
+Default value:: 0 (false)
+Applicable socket types:: ZMQ_PULL, ZMQ_PUSH, ZMQ_SUB, ZMQ_PUB, ZMQ_DEALER
+
+
+ZMQ_CURVE_PUBLICKEY: Set CURVE public key
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the socket's long term public key. You must set this on CURVE client
+sockets, see linkzmq:zmq_curve[7]. You can provide the key as 32 binary
+bytes, or as a 40-character string encoded in the Z85 encoding format.
+The public key must always be used with the matching secret key. To
+generate a public/secret key pair, use linkzmq:zmq_curve_keypair[3].
+
+[horizontal]
+Option value type:: binary data or Z85 text string
+Option value size:: 32 or 40
+Default value:: NULL
+Applicable socket types:: all, when using TCP transport
+
+
+ZMQ_CURVE_SECRETKEY: Set CURVE secret key
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the socket's long term secret key. You must set this on both CURVE
+client and server sockets, see linkzmq:zmq_curve[7]. You can provide the
+key as 32 binary bytes, or as a 40-character string encoded in the Z85
+encoding format. To generate a public/secret key pair, use
+linkzmq:zmq_curve_keypair[3].
+
+[horizontal]
+Option value type:: binary data or Z85 text string
+Option value size:: 32 or 40
+Default value:: NULL
+Applicable socket types:: all, when using TCP transport
+
+
+ZMQ_CURVE_SERVER: Set CURVE server role
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SUBSCRIBE' option shall establish a new message filter on a 'ZMQ_SUB'
-socket. Newly created 'ZMQ_SUB' sockets shall filter out all incoming messages,
-therefore you should call this option to establish an initial message filter.
-
-An empty 'option_value' of length zero shall subscribe to all incoming
-messages. A non-empty 'option_value' shall subscribe to all messages beginning
-with the specified prefix. Multiple filters may be attached to a single
-'ZMQ_SUB' socket, in which case a message shall be accepted if it matches at
-least one filter.
+Defines whether the socket will act as server for CURVE security, see
+linkzmq:zmq_curve[7]. A value of '1' means the socket will act as
+CURVE server. A value of '0' means the socket will not act as CURVE
+server, and its security role then depends on other option settings.
+Setting this to '0' shall reset the socket security to NULL. When you
+set this you must also set the server's secret key using the
+ZMQ_CURVE_SECRETKEY option. A server socket does not need to know
+its own public key.
 
 [horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: ZMQ_SUB
+Option value type:: int
+Option value unit:: 0, 1
+Default value:: 0
+Applicable socket types:: all, when using TCP transport
 
 
-ZMQ_UNSUBSCRIBE: Remove message filter
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_UNSUBSCRIBE' option shall remove an existing message filter on a
-'ZMQ_SUB' socket. The filter specified must match an existing filter previously
-established with the 'ZMQ_SUBSCRIBE' option. If the socket has several
-instances of the same filter attached the 'ZMQ_UNSUBSCRIBE' option shall remove
-only one instance, leaving the rest in place and functional.
+ZMQ_CURVE_SERVERKEY: Set CURVE server key
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the socket's long term server key. You must set this on CURVE client
+sockets, see linkzmq:zmq_curve[7]. You can provide the key as 32 binary
+bytes, or as a 40-character string encoded in the Z85 encoding format.
+This key must have been generated together with the server's secret key.
 
 [horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: ZMQ_SUB
+Option value type:: binary data or Z85 text string
+Option value size:: 32 or 40
+Default value:: NULL
+Applicable socket types:: all, when using TCP transport
 
 
 ZMQ_IDENTITY: Set socket identity
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_IDENTITY' option shall set the identity of the specified 'socket'.
-Socket identity is used only by request/reply pattern. Namely, it can be used
-in tandem with ROUTER socket to route messages to the peer with specific
-identity.
+The 'ZMQ_IDENTITY' option shall set the identity of the specified 'socket'
+when connecting to a ROUTER socket. The identity should be from 1 to 255
+bytes long and MAY NOT start with binary zero.
 
-Identity should be at least one byte and at most 255 bytes long. Identities
-starting with binary zero are reserved for use by 0MQ infrastructure.
-
-If two peers use the same identity when connecting to a third peer, the
-results shall be undefined.
+If two clients use the same identity when connecting to a ROUTER, the
+results shall depend on the ZMQ_ROUTER_HANDOVER option setting. If that
+is not set (or set to the default of zero), the ROUTER socket shall reject
+clients trying to connect with an already-used identity. If that option
+is set to 1, the ROUTER socket shall hand-over the connection to the new
+client and disconnect the existing one.
 
 [horizontal]
 Option value type:: binary data
@@ -153,62 +164,105 @@ Default value:: NULL
 Applicable socket types:: ZMQ_REQ, ZMQ_REP, ZMQ_ROUTER, ZMQ_DEALER.
 
 
-ZMQ_RATE: Set multicast data rate
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RATE' option shall set the maximum send or receive data rate for
-multicast transports such as linkzmq:zmq_pgm[7] using the specified 'socket'.
+ZMQ_IMMEDIATE: Queue messages only to completed connections
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+By default queues will fill on outgoing connections even if the connection has
+not completed. This can lead to "lost" messages on sockets with round-robin
+routing (REQ, PUSH, DEALER). If this option is set to `1`, messages shall be
+queued only to completed connections. This will cause the socket to block if
+there are no other connections, but will prevent queues from filling on pipes
+awaiting connection.
 
 [horizontal]
 Option value type:: int
-Option value unit:: kilobits per second
-Default value:: 100
-Applicable socket types:: all, when using multicast transports
+Option value unit:: boolean
+Default value:: 0 (false)
+Applicable socket types:: all, only for connection-oriented transports.
 
 
-ZMQ_RECOVERY_IVL: Set multicast recovery interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECOVERY_IVL' option shall set the recovery interval for multicast
-transports using the specified 'socket'. The recovery interval determines the
-maximum time in milliseconds that a receiver can be absent from a multicast
-group before unrecoverable data loss will occur.
+ZMQ_IPC_FILTER_GID: Assign group ID filters to allow new IPC connections
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Assign an arbitrary number of filters that will be applied for each new IPC
+transport connection on a listening socket. If no IPC filters are applied, then
+the IPC transport allows connections from any process. If at least one UID,
+GID, or PID filter is applied then new connection credentials should be
+matched. To clear all GID filters call zmq_setsockopt(socket,
+ZMQ_IPC_FILTER_GID, NULL, 0).
 
-CAUTION: Exercise care when setting large recovery intervals as the data
-needed for recovery will be held in memory. For example, a 1 minute recovery
-interval at a data rate of 1Gbps requires a 7GB in-memory buffer.
+NOTE: GID filters are only available on platforms supporting SO_PEERCRED or
+LOCAL_PEERCRED socket options (currently only Linux and later versions of
+OS X).
+
+[horizontal]
+Option value type:: gid_t
+Option value unit:: N/A
+Default value:: no filters (allow from all)
+Applicable socket types:: all listening sockets, when using IPC transports.
+
+
+ZMQ_IPC_FILTER_PID: Assign process ID filters to allow new IPC connections
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Assign an arbitrary number of filters that will be applied for each new IPC
+transport connection on a listening socket. If no IPC filters are applied, then
+the IPC transport allows connections from any process. If at least one UID,
+GID, or PID filter is applied then new connection credentials should be
+matched. To clear all PID filters call zmq_setsockopt(socket,
+ZMQ_IPC_FILTER_PID, NULL, 0).
+
+NOTE: PID filters are only available on platforms supporting the SO_PEERCRED
+socket option (currently only Linux).
+
+[horizontal]
+Option value type:: pid_t
+Option value unit:: N/A
+Default value:: no filters (allow from all)
+Applicable socket types:: all listening sockets, when using IPC transports.
+
+
+ZMQ_IPC_FILTER_UID: Assign user ID filters to allow new IPC connections
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Assign an arbitrary number of filters that will be applied for each new IPC
+transport connection on a listening socket. If no IPC filters are applied, then
+the IPC transport allows connections from any process. If at least one UID,
+GID, or PID filter is applied then new connection credentials should be
+matched. To clear all UID filters call zmq_setsockopt(socket,
+ZMQ_IPC_FILTER_UID, NULL, 0).
+
+NOTE: UID filters are only available on platforms supporting SO_PEERCRED or
+LOCAL_PEERCRED socket options (currently only Linux and later versions of
+OS X).
+
+[horizontal]
+Option value type:: uid_t
+Option value unit:: N/A
+Default value:: no filters (allow from all)
+Applicable socket types:: all listening sockets, when using IPC transports.
+
+
+ZMQ_IPV4ONLY: Use IPv4-only on socket
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Set the IPv4-only option for the socket. This option is deprecated.
+Please use the ZMQ_IPV6 option.
 
 [horizontal]
 Option value type:: int
-Option value unit:: milliseconds
-Default value:: 10000
-Applicable socket types:: all, when using multicast transports
+Option value unit:: boolean
+Default value:: 1 (true)
+Applicable socket types:: all, when using TCP transports.
 
 
-ZMQ_SNDBUF: Set kernel transmit buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SNDBUF' option shall set the underlying kernel transmit buffer size
-for the 'socket' to the specified size in bytes.  A value of zero means leave
-the OS default unchanged. For details please refer to your operating system
-documentation for the 'SO_SNDBUF' socket option.
+ZMQ_IPV6: Enable IPv6 on socket
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Set the IPv6 option for the socket. A value of `1` means IPv6 is
+enabled on the socket, while `0` means the socket will use only IPv4.
+When IPv6 is enabled the socket will connect to, or accept connections
+from, both IPv4 and IPv6 hosts.
 
 [horizontal]
 Option value type:: int
-Option value unit:: bytes
-Default value:: 0
-Applicable socket types:: all
-
-
-ZMQ_RCVBUF: Set kernel receive buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVBUF' option shall set the underlying kernel receive buffer size for
-the 'socket' to the specified size in bytes.  A value of zero means leave the
-OS default unchanged. For details refer to your operating system documentation
-for the 'SO_RCVBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 0
-Applicable socket types:: all
+Option value unit:: boolean
+Default value:: 0 (false)
+Applicable socket types:: all, when using TCP transports.
 
 
 ZMQ_LINGER: Set linger period for socket shutdown
@@ -241,6 +295,154 @@ Default value:: -1 (infinite)
 Applicable socket types:: all
 
 
+ZMQ_MAXMSGSIZE: Maximum acceptable inbound message size
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Limits the size of the inbound message. If a peer sends a message larger than
+ZMQ_MAXMSGSIZE it is disconnected. Value of -1 means 'no limit'.
+
+[horizontal]
+Option value type:: int64_t
+Option value unit:: bytes
+Default value:: -1
+Applicable socket types:: all
+
+
+ZMQ_MULTICAST_HOPS: Maximum network hops for multicast packets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the time-to-live field in every multicast packet sent from this socket.
+The default is 1 which means that the multicast packets don't leave the local
+network.
+
+[horizontal]
+Option value type:: int
+Option value unit:: network hops
+Default value:: 1
+Applicable socket types:: all, when using multicast transports
+
+
+ZMQ_PLAIN_PASSWORD: Set PLAIN security password
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the password for outgoing connections over TCP or IPC. If you set this
+to a non-null value, the security mechanism used for connections shall be
+PLAIN, see linkzmq:zmq_plain[7]. If you set this to a null value, the security
+mechanism used for connections shall be NULL, see linkzmq:zmq_null[3].
+
+[horizontal]
+Option value type:: character string
+Option value unit:: N/A
+Default value:: not set
+Applicable socket types:: all, when using TCP transport
+
+
+ZMQ_PLAIN_SERVER: Set PLAIN server role
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Defines whether the socket will act as server for PLAIN security, see
+linkzmq:zmq_plain[7]. A value of '1' means the socket will act as
+PLAIN server. A value of '0' means the socket will not act as PLAIN
+server, and its security role then depends on other option settings.
+Setting this to '0' shall reset the socket security to NULL.
+
+[horizontal]
+Option value type:: int
+Option value unit:: 0, 1
+Default value:: 0
+Applicable socket types:: all, when using TCP transport
+
+
+ZMQ_PLAIN_USERNAME: Set PLAIN security username
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the username for outgoing connections over TCP or IPC. If you set this
+to a non-null value, the security mechanism used for connections shall be
+PLAIN, see linkzmq:zmq_plain[7]. If you set this to a null value, the security
+mechanism used for connections shall be NULL, see linkzmq:zmq_null[3].
+
+[horizontal]
+Option value type:: character string
+Option value unit:: N/A
+Default value:: not set
+Applicable socket types:: all, when using TCP transport
+
+
+ZMQ_PROBE_ROUTER: bootstrap connections to ROUTER sockets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+When set to 1, the socket will automatically send an empty message when a
+new connection is made or accepted. You may set this on REQ, DEALER, or
+ROUTER sockets connected to a ROUTER socket. The application must filter
+such empty messages. The ZMQ_PROBE_ROUTER option in effect provides the
+ROUTER application with an event signaling the arrival of a new peer.
+
+NOTE: do not set this option on a socket that talks to any other socket
+types: the results are undefined.
+
+[horizontal]
+Option value type:: int
+Option value unit:: 0, 1
+Default value:: 0
+Applicable socket types:: ZMQ_ROUTER, ZMQ_DEALER, ZMQ_REQ
+
+
+ZMQ_RATE: Set multicast data rate
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_RATE' option shall set the maximum send or receive data rate for
+multicast transports such as linkzmq:zmq_pgm[7] using the specified 'socket'.
+
+[horizontal]
+Option value type:: int
+Option value unit:: kilobits per second
+Default value:: 100
+Applicable socket types:: all, when using multicast transports
+
+
+ZMQ_RCVBUF: Set kernel receive buffer size
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_RCVBUF' option shall set the underlying kernel receive buffer size for
+the 'socket' to the specified size in bytes.  A value of zero means leave the
+OS default unchanged. For details refer to your operating system documentation
+for the 'SO_RCVBUF' socket option.
+
+[horizontal]
+Option value type:: int
+Option value unit:: bytes
+Default value:: 0
+Applicable socket types:: all
+
+
+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. 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
+blocking or dropping sent messages. Refer to the individual socket descriptions
+in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
+type.
+
+[horizontal]
+Option value type:: int
+Option value unit:: messages
+Default value:: 1000
+Applicable socket types:: all
+
+
+ZMQ_RCVTIMEO: Maximum time before a recv operation returns with EAGAIN
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the timeout for receive operation on the socket. If the value is `0`,
+_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
+message to receive. If the value is `-1`, it will block until a message is
+available. For all other values, it will wait for a message for that amount
+of time before returning with an EAGAIN error.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: -1 (infinite)
+Applicable socket types:: all
+
+
 ZMQ_RECONNECT_IVL: Set reconnection interval
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The 'ZMQ_RECONNECT_IVL' option shall set the initial reconnection interval for
@@ -276,225 +478,26 @@ Default value:: 0 (only use ZMQ_RECONNECT_IVL)
 Applicable socket types:: all, only for connection-oriented transports
 
 
-ZMQ_BACKLOG: Set maximum length of the queue of outstanding connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BACKLOG' option shall set the maximum length of the queue of
-outstanding peer connections for the specified 'socket'; this only applies to
-connection-oriented transports. For details refer to your operating system
-documentation for the 'listen' function.
+ZMQ_RECOVERY_IVL: Set multicast recovery interval
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_RECOVERY_IVL' option shall set the recovery interval for multicast
+transports using the specified 'socket'. The recovery interval determines the
+maximum time in milliseconds that a receiver can be absent from a multicast
+group before unrecoverable data loss will occur.
+
+CAUTION: Exercise care when setting large recovery intervals as the data
+needed for recovery will be held in memory. For example, a 1 minute recovery
+interval at a data rate of 1Gbps requires a 7GB in-memory buffer.
 
 [horizontal]
 Option value type:: int
-Option value unit:: connections
-Default value:: 100
-Applicable socket types:: all, only for connection-oriented transports.
-
-
-ZMQ_MAXMSGSIZE: Maximum acceptable inbound message size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Limits the size of the inbound message. If a peer sends a message larger than
-ZMQ_MAXMSGSIZE it is disconnected. Value of -1 means 'no limit'.
-
-[horizontal]
-Option value type:: int64_t
-Option value unit:: bytes
-Default value:: -1
-Applicable socket types:: all
-
-
-ZMQ_MULTICAST_HOPS: Maximum network hops for multicast packets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the time-to-live field in every multicast packet sent from this socket.
-The default is 1 which means that the multicast packets don't leave the local
-network.
-
-[horizontal]
-Option value type:: int
-Option value unit:: network hops
-Default value:: 1
+Option value unit:: milliseconds
+Default value:: 10000
 Applicable socket types:: all, when using multicast transports
 
 
-ZMQ_RCVTIMEO: Maximum time before a recv operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the timeout for receive operation on the socket. If the value is `0`,
-_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
-message to receive. If the value is `-1`, it will block until a message is
-available. For all other values, it will wait for a message for that amount
-of time before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_SNDTIMEO: Maximum time before a send operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the timeout for send operation on the socket. If the value is `0`,
-_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
-cannot be sent. If the value is `-1`, it will block until the message is sent.
-For all other values, it will try to send the message for that amount of time
-before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_IPV6: Enable IPv6 on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Set the IPv6 option for the socket. A value of `1` means IPv6 is
-enabled on the socket, while `0` means the socket will use only IPv4.
-When IPv6 is enabled the socket will connect to, or accept connections
-from, both IPv4 and IPv6 hosts.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_IPV4ONLY: Use IPv4-only on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Set the IPv4-only option for the socket. This option is deprecated.
-Please use the ZMQ_IPV6 option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 1 (true)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TOS: Set the Type-of-Service on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the ToS fields (Differentiated services (DS) and Explicit Congestion Notification
-(ECN) field of the IP header. The ToS field is typically used to specify a packets
-priority. The availability of this option is dependent on intermediate network
-equipment that inspect the ToS field andprovide a path for low-delay, high-throughput,
-highly-reliable service, etc.
-
-[horizontal]
-Option value type:: int
-Option value unit:: >0
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_IMMEDIATE: Queue messages only to completed connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default queues will fill on outgoing connections even if the connection has
-not completed. This can lead to "lost" messages on sockets with round-robin
-routing (REQ, PUSH, DEALER). If this option is set to `1`, messages shall be
-queued only to completed connections. This will cause the socket to block if
-there are no other connections, but will prevent queues from filling on pipes
-awaiting connection.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, only for connection-oriented transports.
-
-ZMQ_ROUTER_HANDOVER: handle peer identity name collisions on ROUTER sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the ROUTER socket behavior when it encounters peers with the same identity.
-By default, if two peers with the same identity connect to the same ROUTER
-socket the results will be undefined. A value of `1` will cause the ROUTER
-socket to reassign the identity upon encountering an identity name collision.
-Specifically, the first peer to connect with that identity will be terminated
-and the second peer will receive any subsequent messages routed to that
-identity.
-
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_ROUTER_MANDATORY: accept only routable messages on ROUTER sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the ROUTER socket behavior when an unroutable message is encountered. A
-value of `0` is the default and discards the message silently when it cannot be
-routed.  A value of `1` returns an 'EHOSTUNREACH' error code if the message
-cannot be routed.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_ROUTER_RAW: switch ROUTER socket to raw mode
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the raw mode on the ROUTER, when set to 1. When the ROUTER socket is in
-raw mode, and when using the tcp:// transport, it will read and write TCP data
-without 0MQ framing. This lets 0MQ applications talk to non-0MQ applications.
-When using raw mode, you cannot set explicit identities, and the ZMQ_SNDMORE
-flag is ignored when sending data messages. In raw mode you can close a specific
-connection by sending it a zero-length message (following the identity frame).
-
-NOTE: This option is deprecated, please use ZMQ_STREAM sockets instead.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_PROBE_ROUTER: bootstrap connections to ROUTER sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When set to 1, the socket will automatically send an empty message when a
-new connection is made or accepted. You may set this on REQ, DEALER, or
-ROUTER sockets connected to a ROUTER socket. The application must filter
-such empty messages. The ZMQ_PROBE_ROUTER option in effect provides the
-ROUTER application with an event signaling the arrival of a new peer.
-
-NOTE: do not set this option on a socket that talks to any other socket
-types: the results are undefined.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER, ZMQ_DEALER, ZMQ_REQ
-
-
-ZMQ_XPUB_VERBOSE: provide all subscription messages on XPUB sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the 'XPUB' socket behavior on new subscriptions and unsubscriptions.
-A value of '0' is the default and passes only new subscription messages to
-upstream. A value of '1' passes all subscription messages upstream.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB
-
-
 ZMQ_REQ_CORRELATE: match replies with requests
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 The default behavior of REQ sockets is to rely on the ordering of messages to
 match requests and responses and that is usually sufficient. When this option
 is set to 1, the REQ socket will prefix outgoing messages with an extra frame
@@ -511,7 +514,6 @@ Applicable socket types:: ZMQ_REQ
 
 ZMQ_REQ_RELAXED: relax strict alternation between request and reply
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 By default, a REQ socket does not allow initiating a new request with
 _zmq_send(3)_ until the reply to the previous one has been received.
 When set to 1, sending another message is allowed and has the effect of
@@ -531,62 +533,129 @@ Default value:: 0
 Applicable socket types:: ZMQ_REQ
 
 
-ZMQ_TCP_KEEPALIVE: Override SO_KEEPALIVE socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Override 'SO_KEEPALIVE' socket option (where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
+ZMQ_ROUTER_HANDOVER: handle duplicate client identities on ROUTER sockets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+If two clients use the same identity when connecting to a ROUTER, the
+results shall depend on the ZMQ_ROUTER_HANDOVER option setting. If that
+is not set (or set to the default of zero), the ROUTER socket shall reject
+clients trying to connect with an already-used identity. If that option
+is set to 1, the ROUTER socket shall hand-over the connection to the new
+client and disconnect the existing one.
 
 [horizontal]
 Option value type:: int
-Option value unit:: -1,0,1
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
+Option value unit:: 0, 1
+Default value:: 0
+Applicable socket types:: ZMQ_ROUTER
 
 
-ZMQ_TCP_KEEPALIVE_IDLE: Override TCP_KEEPCNT (or TCP_KEEPALIVE on some OS)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Override 'TCP_KEEPCNT'(or 'TCP_KEEPALIVE' on some OS) socket option (where
-supported by OS). The default value of `-1` means to skip any overrides and
-leave it to OS default.
+ZMQ_ROUTER_MANDATORY: accept only routable messages on ROUTER sockets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the ROUTER socket behavior when an unroutable message is encountered. A
+value of `0` is the default and discards the message silently when it cannot be
+routed.  A value of `1` returns an 'EHOSTUNREACH' error code if the message
+cannot be routed.
 
 [horizontal]
 Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
+Option value unit:: 0, 1
+Default value:: 0
+Applicable socket types:: ZMQ_ROUTER
 
 
-ZMQ_TCP_KEEPALIVE_CNT: Override TCP_KEEPCNT socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ZMQ_ROUTER_RAW: switch ROUTER socket to raw mode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the raw mode on the ROUTER, when set to 1. When the ROUTER socket is in
+raw mode, and when using the tcp:// transport, it will read and write TCP data
+without 0MQ framing. This lets 0MQ applications talk to non-0MQ applications.
+When using raw mode, you cannot set explicit identities, and the ZMQ_SNDMORE
+flag is ignored when sending data messages. In raw mode you can close a specific
+connection by sending it a zero-length message (following the identity frame).
 
-Override 'TCP_KEEPCNT' socket option (where supported by OS). The default
-value of `-1` means to skip any overrides and leave it to OS default.
+NOTE: This option is deprecated, please use ZMQ_STREAM sockets instead.
 
 [horizontal]
 Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
+Option value unit:: 0, 1
+Default value:: 0
+Applicable socket types:: ZMQ_ROUTER
 
 
-ZMQ_TCP_KEEPALIVE_INTVL: Override TCP_KEEPINTVL socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Override 'TCP_KEEPINTVL' socket option(where supported by OS). The default
-value of `-1` means to skip any overrides and leave it to OS default.
+ZMQ_SNDBUF: Set kernel transmit buffer size
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_SNDBUF' option shall set the underlying kernel transmit buffer size
+for the 'socket' to the specified size in bytes.  A value of zero means leave
+the OS default unchanged. For details please refer to your operating system
+documentation for the 'SO_SNDBUF' socket option.
 
 [horizontal]
 Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
+Option value unit:: bytes
+Default value:: 0
+Applicable socket types:: all
+
+
+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. 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
+blocking or dropping sent messages. Refer to the individual socket descriptions
+in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
+type.
+
+NOTE: 0MQ does not guarantee that the socket will accept as many as ZMQ_SNDHWM
+messages, and the actual limit may be as much as 60-70% lower depending on the
+flow of messages on the socket.
+
+[horizontal]
+Option value type:: int
+Option value unit:: messages
+Default value:: 1000
+Applicable socket types:: all
+
+
+ZMQ_SNDTIMEO: Maximum time before a send operation returns with EAGAIN
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the timeout for send operation on the socket. If the value is `0`,
+_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
+cannot be sent. If the value is `-1`, it will block until the message is sent.
+For all other values, it will try to send the message for that amount of time
+before returning with an EAGAIN error.
+
+[horizontal]
+Option value type:: int
+Option value unit:: milliseconds
+Default value:: -1 (infinite)
+Applicable socket types:: all
+
+
+ZMQ_SUBSCRIBE: Establish message filter
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_SUBSCRIBE' option shall establish a new message filter on a 'ZMQ_SUB'
+socket. Newly created 'ZMQ_SUB' sockets shall filter out all incoming messages,
+therefore you should call this option to establish an initial message filter.
+
+An empty 'option_value' of length zero shall subscribe to all incoming
+messages. A non-empty 'option_value' shall subscribe to all messages beginning
+with the specified prefix. Multiple filters may be attached to a single
+'ZMQ_SUB' socket, in which case a message shall be accepted if it matches at
+least one filter.
+
+[horizontal]
+Option value type:: binary data
+Option value unit:: N/A
+Default value:: N/A
+Applicable socket types:: ZMQ_SUB
 
 
 ZMQ_TCP_ACCEPT_FILTER: Assign filters to allow new TCP connections
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Assign an arbitrary number of filters that will be applied for each new TCP
 transport connection on a listening socket. If no filters are applied, then
 the TCP transport allows connections from any IP address. If at least one
@@ -601,202 +670,100 @@ Default value:: no filters (allow from all)
 Applicable socket types:: all listening sockets, when using TCP transports.
 
 
-ZMQ_IPC_FILTER_UID: Assign user ID filters to allow new IPC connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Assign an arbitrary number of filters that will be applied for each new IPC
-transport connection on a listening socket. If no IPC filters are applied, then
-the IPC transport allows connections from any process. If at least one UID,
-GID, or PID filter is applied then new connection credentials should be
-matched. To clear all UID filters call zmq_setsockopt(socket,
-ZMQ_IPC_FILTER_UID, NULL, 0).
-
-NOTE: UID filters are only available on platforms supporting SO_PEERCRED or
-LOCAL_PEERCRED socket options (currently only Linux and later versions of
-OS X).
+ZMQ_TCP_KEEPALIVE: Override SO_KEEPALIVE socket option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Override 'SO_KEEPALIVE' socket option (where supported by OS).
+The default value of `-1` means to skip any overrides and leave it to OS default.
 
 [horizontal]
-Option value type:: uid_t
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using IPC transports.
+Option value type:: int
+Option value unit:: -1,0,1
+Default value:: -1 (leave to OS default)
+Applicable socket types:: all, when using TCP transports.
 
 
-ZMQ_IPC_FILTER_GID: Assign group ID filters to allow new IPC connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Assign an arbitrary number of filters that will be applied for each new IPC
-transport connection on a listening socket. If no IPC filters are applied, then
-the IPC transport allows connections from any process. If at least one UID,
-GID, or PID filter is applied then new connection credentials should be
-matched. To clear all GID filters call zmq_setsockopt(socket,
-ZMQ_IPC_FILTER_GID, NULL, 0).
-
-NOTE: GID filters are only available on platforms supporting SO_PEERCRED or
-LOCAL_PEERCRED socket options (currently only Linux and later versions of
-OS X).
+ZMQ_TCP_KEEPALIVE_CNT: Override TCP_KEEPCNT socket option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Override 'TCP_KEEPCNT' socket option (where supported by OS). The default
+value of `-1` means to skip any overrides and leave it to OS default.
 
 [horizontal]
-Option value type:: gid_t
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using IPC transports.
+Option value type:: int
+Option value unit:: -1,>0
+Default value:: -1 (leave to OS default)
+Applicable socket types:: all, when using TCP transports.
 
 
-ZMQ_IPC_FILTER_PID: Assign process ID filters to allow new IPC connections
+ZMQ_TCP_KEEPALIVE_IDLE: Override TCP_KEEPCNT (or TCP_KEEPALIVE on some OS)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Assign an arbitrary number of filters that will be applied for each new IPC
-transport connection on a listening socket. If no IPC filters are applied, then
-the IPC transport allows connections from any process. If at least one UID,
-GID, or PID filter is applied then new connection credentials should be
-matched. To clear all PID filters call zmq_setsockopt(socket,
-ZMQ_IPC_FILTER_PID, NULL, 0).
-
-NOTE: PID filters are only available on platforms supporting the SO_PEERCRED
-socket option (currently only Linux).
+Override 'TCP_KEEPCNT' (or 'TCP_KEEPALIVE' on some OS) socket option (where
+supported by OS). The default value of `-1` means to skip any overrides and
+leave it to OS default.
 
 [horizontal]
-Option value type:: pid_t
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using IPC transports.
+Option value type:: int
+Option value unit:: -1,>0
+Default value:: -1 (leave to OS default)
+Applicable socket types:: all, when using TCP transports.
 
 
-ZMQ_ZAP_IPC_CREDS: Append IPC peer credentials to ZAP address
+ZMQ_TCP_KEEPALIVE_INTVL: Override TCP_KEEPINTVL socket option
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If set, the credentials of IPC peers will be appended to the address sent in
-ZAP request messages.  The new address will be formatted as ADDRESS:UID:GID:PID
-where UID and GID are the effective group and user IDs of the user owning the
-peer process and PID is the process ID.  PID will be empty on systems not
-supporting SO_PEERCRED.
-
-NOTE: IPC peer credentials are only available on platforms supporting the
-SO_PEERCRED or LOCAL_PEERCRED socket options.
+Override 'TCP_KEEPINTVL' socket option(where supported by OS). The default
+value of `-1` means to skip any overrides and leave it to OS default.
 
 [horizontal]
 Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all listening sockets, when using IPC transports.
+Option value unit:: -1,>0
+Default value:: -1 (leave to OS default)
+Applicable socket types:: all, when using TCP transports.
 
 
-ZMQ_PLAIN_SERVER: Set PLAIN server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ZMQ_TOS: Set the Type-of-Service on socket
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the ToS fields (Differentiated services (DS) and Explicit Congestion
+Notification (ECN) field of the IP header. The ToS field is typically used
+to specify a packets priority. The availability of this option is dependent
+on intermediate network equipment that inspect the ToS field andprovide a
+path for low-delay, high-throughput, highly-reliable service, etc.
 
-Defines whether the socket will act as server for PLAIN security, see
-linkzmq:zmq_plain[7]. A value of '1' means the socket will act as
-PLAIN server. A value of '0' means the socket will not act as PLAIN
-server, and its security role then depends on other option settings.
-Setting this to '0' shall reset the socket security to NULL.
+[horizontal]
+Option value type:: int
+Option value unit:: >0
+Default value:: 0
+Applicable socket types:: all, only for connection-oriented transports
+
+
+ZMQ_UNSUBSCRIBE: Remove message filter
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The 'ZMQ_UNSUBSCRIBE' option shall remove an existing message filter on a
+'ZMQ_SUB' socket. The filter specified must match an existing filter previously
+established with the 'ZMQ_SUBSCRIBE' option. If the socket has several
+instances of the same filter attached the 'ZMQ_UNSUBSCRIBE' option shall remove
+only one instance, leaving the rest in place and functional.
+
+[horizontal]
+Option value type:: binary data
+Option value unit:: N/A
+Default value:: N/A
+Applicable socket types:: ZMQ_SUB
+
+
+ZMQ_XPUB_VERBOSE: provide all subscription messages on XPUB sockets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets the 'XPUB' socket behavior on new subscriptions and unsubscriptions.
+A value of '0' is the default and passes only new subscription messages to
+upstream. A value of '1' passes all subscription messages upstream.
 
 [horizontal]
 Option value type:: int
 Option value unit:: 0, 1
 Default value:: 0
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_PLAIN_USERNAME: Set PLAIN security username
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the username for outgoing connections over TCP or IPC. If you set this
-to a non-null value, the security mechanism used for connections shall be
-PLAIN, see linkzmq:zmq_plain[7]. If you set this to a null value, the security
-mechanism used for connections shall be NULL, see linkzmq:zmq_null[3].
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_PLAIN_PASSWORD: Set PLAIN security password
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the password for outgoing connections over TCP or IPC. If you set this
-to a non-null value, the security mechanism used for connections shall be
-PLAIN, see linkzmq:zmq_plain[7]. If you set this to a null value, the security
-mechanism used for connections shall be NULL, see linkzmq:zmq_null[3].
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SERVER: Set CURVE server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Defines whether the socket will act as server for CURVE security, see
-linkzmq:zmq_curve[7]. A value of '1' means the socket will act as
-CURVE server. A value of '0' means the socket will not act as CURVE
-server, and its security role then depends on other option settings.
-Setting this to '0' shall reset the socket security to NULL. When you
-set this you must also set the server's secret key using the
-ZMQ_CURVE_SECRETKEY option. A server socket does not need to know
-its own public key.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_PUBLICKEY: Set CURVE public key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the socket's long term public key. You must set this on CURVE client
-sockets, see linkzmq:zmq_curve[7]. You can provide the key as 32 binary
-bytes, or as a 40-character string encoded in the Z85 encoding format.
-The public key must always be used with the matching secret key. To
-generate a public/secret key pair, use linkzmq:zmq_curve_keypair[3].
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 40
-Default value:: NULL
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SECRETKEY: Set CURVE secret key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the socket's long term secret key. You must set this on both CURVE
-client and server sockets, see linkzmq:zmq_curve[7]. You can provide the
-key as 32 binary bytes, or as a 40-character string encoded in the Z85
-encoding format. To generate a public/secret key pair, use
-linkzmq:zmq_curve_keypair[3].
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 40
-Default value:: NULL
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SERVERKEY: Set CURVE server key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sets the socket's long term server key. You must set this on CURVE client
-sockets, see linkzmq:zmq_curve[7]. You can provide the key as 32 binary
-bytes, or as a 40-character string encoded in the Z85 encoding format.
-This key must have been generated together with the server's secret key.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 40
-Default value:: NULL
-Applicable socket types:: all, when using TCP transport
+Applicable socket types:: ZMQ_XPUB
 
 
 ZMQ_ZAP_DOMAIN: Set RFC 27 authentication domain
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Sets the domain for ZAP (ZMQ RFC 27) authentication. For NULL security (the
 default on all tcp:// connections), ZAP authentication only happens if you
 set a non-empty domain. For PLAIN and CURVE security, ZAP requests are always
@@ -810,22 +777,6 @@ Default value:: not set
 Applicable socket types:: all, when using TCP transport
 
 
-ZMQ_CONFLATE: Keep only last message
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If set, a socket shall keep only one message in its inbound/outbound
-queue, this message being the last message received/the last message
-to be sent.
-Ignores 'ZMQ_RECVHWM' and 'ZMQ_SENDHWM' options.
-Does not supports multi-part messages, in particular, only one part of it
-is kept in the socket internal queue.
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: ZMQ_PULL, ZMQ_PUSH, ZMQ_SUB, ZMQ_PUB, ZMQ_DEALER
-
-
 RETURN VALUE
 ------------
 The _zmq_setsockopt()_ function shall return zero if successful. Otherwise it
diff --git a/include/zmq.h b/include/zmq.h
index 4c448fb2..d684e47f 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -293,7 +293,6 @@ ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg, int option, int optval);
 #define ZMQ_IPC_FILTER_PID 58
 #define ZMQ_IPC_FILTER_UID 59
 #define ZMQ_IPC_FILTER_GID 60
-#define ZMQ_ZAP_IPC_CREDS 61
 
 /*  Message options                                                           */
 #define ZMQ_MORE 1
diff --git a/include/zmq_utils.h b/include/zmq_utils.h
index 9b14aa72..bd1486c0 100644
--- a/include/zmq_utils.h
+++ b/include/zmq_utils.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/perf/inproc_lat.cpp b/perf/inproc_lat.cpp
index e5d080a6..5c221f15 100644
--- a/perf/inproc_lat.cpp
+++ b/perf/inproc_lat.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp
index 2f1a726a..683f730b 100644
--- a/perf/local_lat.cpp
+++ b/perf/local_lat.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp
index ab7a15e0..fb88ed83 100644
--- a/perf/local_thr.cpp
+++ b/perf/local_thr.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp
index a0659108..f292861c 100644
--- a/perf/remote_lat.cpp
+++ b/perf/remote_lat.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp
index a4a7b6a3..5a0072d4 100644
--- a/perf/remote_thr.cpp
+++ b/perf/remote_thr.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/address.cpp b/src/address.cpp
index 5fe6a3eb..829e0558 100644
--- a/src/address.cpp
+++ b/src/address.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/address.hpp b/src/address.hpp
index d3f9247f..88faf0b1 100644
--- a/src/address.hpp
+++ b/src/address.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/array.hpp b/src/array.hpp
index 0b5b4e39..c12c70ad 100644
--- a/src/array.hpp
+++ b/src/array.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp
index 45cfe88d..81536e29 100644
--- a/src/atomic_counter.hpp
+++ b/src/atomic_counter.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp
index 066d54be..88e36efd 100644
--- a/src/atomic_ptr.hpp
+++ b/src/atomic_ptr.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/blob.hpp b/src/blob.hpp
index 65d305b3..943106b4 100644
--- a/src/blob.hpp
+++ b/src/blob.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/clock.cpp b/src/clock.cpp
index 2ef0bad1..b63ba993 100644
--- a/src/clock.cpp
+++ b/src/clock.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/clock.hpp b/src/clock.hpp
index e0d0fb14..372bc82c 100644
--- a/src/clock.hpp
+++ b/src/clock.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/command.hpp b/src/command.hpp
index fc0181b4..038c1254 100644
--- a/src/command.hpp
+++ b/src/command.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/config.hpp b/src/config.hpp
index 6e5ef5ab..91263ebf 100644
--- a/src/config.hpp
+++ b/src/config.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ctx.cpp b/src/ctx.cpp
index 6d934cdc..1e0fad46 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ctx.hpp b/src/ctx.hpp
index 74733219..3846ab56 100644
--- a/src/ctx.hpp
+++ b/src/ctx.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/curve_client.cpp b/src/curve_client.cpp
index f8324668..2990bb4d 100644
--- a/src/curve_client.cpp
+++ b/src/curve_client.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/curve_client.hpp b/src/curve_client.hpp
index c1569d28..0c55cfcd 100644
--- a/src/curve_client.hpp
+++ b/src/curve_client.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/curve_server.cpp b/src/curve_server.cpp
index a3244418..cf11a90f 100644
--- a/src/curve_server.cpp
+++ b/src/curve_server.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/curve_server.hpp b/src/curve_server.hpp
index c165b541..d037ee76 100644
--- a/src/curve_server.hpp
+++ b/src/curve_server.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/dbuffer.hpp b/src/dbuffer.hpp
index 7929304d..573177b1 100644
--- a/src/dbuffer.hpp
+++ b/src/dbuffer.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/dealer.cpp b/src/dealer.cpp
index d330d0b1..8c9d142f 100644
--- a/src/dealer.cpp
+++ b/src/dealer.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/dealer.hpp b/src/dealer.hpp
index 0d6bb4c6..30d1e4ef 100644
--- a/src/dealer.hpp
+++ b/src/dealer.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/decoder.hpp b/src/decoder.hpp
index 3814d1ed..7ac827d6 100644
--- a/src/decoder.hpp
+++ b/src/decoder.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/devpoll.cpp b/src/devpoll.cpp
index 02b4a9c6..352a43dd 100644
--- a/src/devpoll.cpp
+++ b/src/devpoll.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/devpoll.hpp b/src/devpoll.hpp
index fbf93287..707ba95e 100644
--- a/src/devpoll.hpp
+++ b/src/devpoll.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/dist.cpp b/src/dist.cpp
index 5b195653..ec920058 100755
--- a/src/dist.cpp
+++ b/src/dist.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/dist.hpp b/src/dist.hpp
index 6ad8b855..e7d21d9a 100644
--- a/src/dist.hpp
+++ b/src/dist.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/encoder.hpp b/src/encoder.hpp
index beae44f3..8af61335 100644
--- a/src/encoder.hpp
+++ b/src/encoder.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/epoll.cpp b/src/epoll.cpp
index 492e06cd..324d4bd8 100644
--- a/src/epoll.cpp
+++ b/src/epoll.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/epoll.hpp b/src/epoll.hpp
index 0c89cb5b..fbf871c0 100644
--- a/src/epoll.hpp
+++ b/src/epoll.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/err.cpp b/src/err.cpp
index 8d829be6..3df5b839 100644
--- a/src/err.cpp
+++ b/src/err.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/err.hpp b/src/err.hpp
index 7076f112..18cf1a2f 100644
--- a/src/err.hpp
+++ b/src/err.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/fd.hpp b/src/fd.hpp
index 55a2e9b2..a2333e0e 100644
--- a/src/fd.hpp
+++ b/src/fd.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/fq.cpp b/src/fq.cpp
index aa099ebd..f43d7881 100644
--- a/src/fq.cpp
+++ b/src/fq.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/fq.hpp b/src/fq.hpp
index 843731ba..04fc28b1 100644
--- a/src/fq.hpp
+++ b/src/fq.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/i_decoder.hpp b/src/i_decoder.hpp
index db62dabe..1879c66e 100644
--- a/src/i_decoder.hpp
+++ b/src/i_decoder.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/i_encoder.hpp b/src/i_encoder.hpp
index 2cfa2a89..b80d68c5 100644
--- a/src/i_encoder.hpp
+++ b/src/i_encoder.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/i_engine.hpp b/src/i_engine.hpp
index 39266c41..49896c21 100644
--- a/src/i_engine.hpp
+++ b/src/i_engine.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/i_poll_events.hpp b/src/i_poll_events.hpp
index bcf496e4..1e033906 100644
--- a/src/i_poll_events.hpp
+++ b/src/i_poll_events.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/io_object.cpp b/src/io_object.cpp
index 258b52cd..03192a75 100644
--- a/src/io_object.cpp
+++ b/src/io_object.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/io_object.hpp b/src/io_object.hpp
index 16e0b5f0..af033691 100644
--- a/src/io_object.hpp
+++ b/src/io_object.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/io_thread.cpp b/src/io_thread.cpp
index 5633a022..b05b56bf 100644
--- a/src/io_thread.cpp
+++ b/src/io_thread.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/io_thread.hpp b/src/io_thread.hpp
index 32f51df8..49a2e80d 100644
--- a/src/io_thread.hpp
+++ b/src/io_thread.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ip.cpp b/src/ip.cpp
index 79bdc4b0..2a4f04e6 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ip.hpp b/src/ip.hpp
index 665535fb..82ebf0b6 100644
--- a/src/ip.hpp
+++ b/src/ip.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ipc_address.cpp b/src/ipc_address.cpp
index cc0a964c..88a6ca3f 100644
--- a/src/ipc_address.cpp
+++ b/src/ipc_address.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ipc_address.hpp b/src/ipc_address.hpp
index 1f527460..c8878084 100644
--- a/src/ipc_address.hpp
+++ b/src/ipc_address.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp
index 239d2be9..330dbffd 100644
--- a/src/ipc_connecter.cpp
+++ b/src/ipc_connecter.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ipc_connecter.hpp b/src/ipc_connecter.hpp
index ff2f31da..cb119c23 100644
--- a/src/ipc_connecter.hpp
+++ b/src/ipc_connecter.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ipc_listener.cpp b/src/ipc_listener.cpp
index b9d782d1..15520e92 100644
--- a/src/ipc_listener.cpp
+++ b/src/ipc_listener.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ipc_listener.hpp b/src/ipc_listener.hpp
index b1f90d8b..2a63a722 100644
--- a/src/ipc_listener.hpp
+++ b/src/ipc_listener.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/kqueue.cpp b/src/kqueue.cpp
index 8ecf8137..75cb4156 100644
--- a/src/kqueue.cpp
+++ b/src/kqueue.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/kqueue.hpp b/src/kqueue.hpp
index 20d256cc..49ce13c2 100644
--- a/src/kqueue.hpp
+++ b/src/kqueue.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/lb.cpp b/src/lb.cpp
index 213bdfb4..7fdd765b 100644
--- a/src/lb.cpp
+++ b/src/lb.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/lb.hpp b/src/lb.hpp
index 6904c892..6a64e1d8 100644
--- a/src/lb.hpp
+++ b/src/lb.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/likely.hpp b/src/likely.hpp
index fb189f05..b7f50c16 100644
--- a/src/likely.hpp
+++ b/src/likely.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/mailbox.cpp b/src/mailbox.cpp
index d1fd0653..044a853a 100644
--- a/src/mailbox.cpp
+++ b/src/mailbox.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/mailbox.hpp b/src/mailbox.hpp
index 926ea842..7aa9b471 100644
--- a/src/mailbox.hpp
+++ b/src/mailbox.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/mechanism.cpp b/src/mechanism.cpp
index 3c410f77..36b20956 100644
--- a/src/mechanism.cpp
+++ b/src/mechanism.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/mechanism.hpp b/src/mechanism.hpp
index 8b731635..c0638190 100644
--- a/src/mechanism.hpp
+++ b/src/mechanism.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/msg.cpp b/src/msg.cpp
index f83ca056..00063d98 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/msg.hpp b/src/msg.hpp
index fa3d76a9..095934ab 100644
--- a/src/msg.hpp
+++ b/src/msg.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/mtrie.cpp b/src/mtrie.cpp
index c09e2d28..a5b54a72 100644
--- a/src/mtrie.cpp
+++ b/src/mtrie.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/mtrie.hpp b/src/mtrie.hpp
index d6d52bad..6b89aebb 100644
--- a/src/mtrie.hpp
+++ b/src/mtrie.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/mutex.hpp b/src/mutex.hpp
index c72314df..26c30d37 100644
--- a/src/mutex.hpp
+++ b/src/mutex.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/null_mechanism.cpp b/src/null_mechanism.cpp
index f4ea9e75..07ec7b9a 100644
--- a/src/null_mechanism.cpp
+++ b/src/null_mechanism.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/null_mechanism.hpp b/src/null_mechanism.hpp
index ad168e56..6912e749 100644
--- a/src/null_mechanism.hpp
+++ b/src/null_mechanism.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/object.cpp b/src/object.cpp
index e658b287..6569c0b1 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/object.hpp b/src/object.hpp
index 7655c38f..4704c05d 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/options.cpp b/src/options.cpp
index edf8f67e..c04b0f9f 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -51,9 +51,6 @@ zmq::options_t::options_t () :
     tcp_keepalive_cnt (-1),
     tcp_keepalive_idle (-1),
     tcp_keepalive_intvl (-1),
-#   if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    zap_ipc_creds (false),
-#   endif
     mechanism (ZMQ_NULL),
     as_server (0),
     socket_id (0),
@@ -261,13 +258,6 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
             break;
 
 #       if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-        case ZMQ_ZAP_IPC_CREDS:
-            if (is_int && (value == 0 || value == 1)) {
-                zap_ipc_creds = (value != 0);
-                return 0;
-            }
-            break;
-
         case ZMQ_IPC_FILTER_UID:
             if (optvallen_ == 0 && optval_ == NULL) {
                 ipc_uid_accept_filters.clear ();
@@ -601,15 +591,6 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_)
             }
             break;
 
-#       if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-        case ZMQ_ZAP_IPC_CREDS:
-            if (is_int) {
-                *value = zap_ipc_creds;
-                return 0;
-            }
-            break;
-#       endif
-
         case ZMQ_MECHANISM:
             if (is_int) {
                 *value = mechanism;
diff --git a/src/options.hpp b/src/options.hpp
index 8f80e887..d4c7190b 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/own.cpp b/src/own.cpp
index bbde1c57..e3247aff 100644
--- a/src/own.cpp
+++ b/src/own.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/own.hpp b/src/own.hpp
index f14c578b..13f32a62 100644
--- a/src/own.hpp
+++ b/src/own.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pair.cpp b/src/pair.cpp
index 66efab92..1733d023 100644
--- a/src/pair.cpp
+++ b/src/pair.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pair.hpp b/src/pair.hpp
index 754c8ad8..83bc3314 100644
--- a/src/pair.hpp
+++ b/src/pair.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pgm_receiver.cpp b/src/pgm_receiver.cpp
index 40689692..2a9dc8b6 100644
--- a/src/pgm_receiver.cpp
+++ b/src/pgm_receiver.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pgm_receiver.hpp b/src/pgm_receiver.hpp
index 1f5d2d4e..89daf033 100644
--- a/src/pgm_receiver.hpp
+++ b/src/pgm_receiver.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pgm_sender.cpp b/src/pgm_sender.cpp
index 0be7c6dd..5d377f5e 100644
--- a/src/pgm_sender.cpp
+++ b/src/pgm_sender.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pgm_sender.hpp b/src/pgm_sender.hpp
index 045cd474..e58e4789 100644
--- a/src/pgm_sender.hpp
+++ b/src/pgm_sender.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp
index 7925c6ef..186e09ae 100644
--- a/src/pgm_socket.cpp
+++ b/src/pgm_socket.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pgm_socket.hpp b/src/pgm_socket.hpp
index 94309328..788cc3ff 100644
--- a/src/pgm_socket.hpp
+++ b/src/pgm_socket.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pipe.cpp b/src/pipe.cpp
index 5781417e..26505068 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pipe.hpp b/src/pipe.hpp
index dfb35d33..dfac285d 100644
--- a/src/pipe.hpp
+++ b/src/pipe.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/plain_mechanism.cpp b/src/plain_mechanism.cpp
index b18655f9..92b1db87 100644
--- a/src/plain_mechanism.cpp
+++ b/src/plain_mechanism.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/plain_mechanism.hpp b/src/plain_mechanism.hpp
index 02bb10f7..d43c5442 100644
--- a/src/plain_mechanism.hpp
+++ b/src/plain_mechanism.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/poll.cpp b/src/poll.cpp
index cf23afc0..49e82f94 100644
--- a/src/poll.cpp
+++ b/src/poll.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/poll.hpp b/src/poll.hpp
index a3311688..66d5b4ab 100644
--- a/src/poll.hpp
+++ b/src/poll.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/poller.hpp b/src/poller.hpp
index 2cad0e82..5c3adacf 100644
--- a/src/poller.hpp
+++ b/src/poller.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/poller_base.cpp b/src/poller_base.cpp
index 5b9f36af..a6d2f585 100644
--- a/src/poller_base.cpp
+++ b/src/poller_base.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/poller_base.hpp b/src/poller_base.hpp
index c122ab82..cd666d4b 100644
--- a/src/poller_base.hpp
+++ b/src/poller_base.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/precompiled.cpp b/src/precompiled.cpp
index b8183f99..37b9014a 100644
--- a/src/precompiled.cpp
+++ b/src/precompiled.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/precompiled.hpp b/src/precompiled.hpp
index 598e59ed..27187324 100644
--- a/src/precompiled.hpp
+++ b/src/precompiled.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/proxy.cpp b/src/proxy.cpp
index 118786fe..90658d55 100644
--- a/src/proxy.cpp
+++ b/src/proxy.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/proxy.hpp b/src/proxy.hpp
index efbdbe58..c055290b 100644
--- a/src/proxy.hpp
+++ b/src/proxy.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pub.cpp b/src/pub.cpp
index e84f3c30..d64bacba 100644
--- a/src/pub.cpp
+++ b/src/pub.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pub.hpp b/src/pub.hpp
index 4fe3a79d..4646c7bc 100644
--- a/src/pub.hpp
+++ b/src/pub.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pull.cpp b/src/pull.cpp
index a7d246d1..07552e10 100644
--- a/src/pull.cpp
+++ b/src/pull.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/pull.hpp b/src/pull.hpp
index bd0f68b9..9681a4b0 100644
--- a/src/pull.hpp
+++ b/src/pull.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/push.cpp b/src/push.cpp
index 673d2be6..92c57e99 100644
--- a/src/push.cpp
+++ b/src/push.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/push.hpp b/src/push.hpp
index 0f587b8a..7185722d 100644
--- a/src/push.hpp
+++ b/src/push.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/random.cpp b/src/random.cpp
index 06ed1de0..ab1e251d 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/random.hpp b/src/random.hpp
index 78ed55b1..b4ea8434 100644
--- a/src/random.hpp
+++ b/src/random.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/raw_decoder.cpp b/src/raw_decoder.cpp
index fe05ac59..72011888 100644
--- a/src/raw_decoder.cpp
+++ b/src/raw_decoder.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/raw_decoder.hpp b/src/raw_decoder.hpp
index 0e4692c3..000397c8 100644
--- a/src/raw_decoder.hpp
+++ b/src/raw_decoder.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/raw_encoder.cpp b/src/raw_encoder.cpp
index dbf8545f..a7a0f043 100644
--- a/src/raw_encoder.cpp
+++ b/src/raw_encoder.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/raw_encoder.hpp b/src/raw_encoder.hpp
index fec36d31..f568724b 100644
--- a/src/raw_encoder.hpp
+++ b/src/raw_encoder.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/reaper.cpp b/src/reaper.cpp
index 62fa8e85..379e46d1 100644
--- a/src/reaper.cpp
+++ b/src/reaper.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/reaper.hpp b/src/reaper.hpp
index 5e6b3ad1..b5b67cf8 100644
--- a/src/reaper.hpp
+++ b/src/reaper.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/rep.cpp b/src/rep.cpp
index a45e6352..58d49031 100644
--- a/src/rep.cpp
+++ b/src/rep.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/rep.hpp b/src/rep.hpp
index 027b4643..5a433eb4 100644
--- a/src/rep.hpp
+++ b/src/rep.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/req.cpp b/src/req.cpp
index 0fa36aa4..4c510526 100644
--- a/src/req.cpp
+++ b/src/req.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/req.hpp b/src/req.hpp
index 6f079c30..ce78dce7 100644
--- a/src/req.hpp
+++ b/src/req.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/router.cpp b/src/router.cpp
index 0d010136..1bdfa157 100644
--- a/src/router.cpp
+++ b/src/router.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -36,7 +36,7 @@ zmq::router_t::router_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
     //  raw_sock functionality in ROUTER is deprecated
     raw_sock (false),       
     probe_router (false),
-    handover(false)
+    handover (false)
 {
     options.type = ZMQ_ROUTER;
     options.recv_identity = true;
@@ -112,6 +112,7 @@ int zmq::router_t::xsetsockopt (int option_, const void *optval_,
                 return 0;
             }
             break;
+            
         case ZMQ_ROUTER_HANDOVER: 
             if (is_int && value >= 0) {
                 handover = (value != 0);
@@ -401,14 +402,11 @@ bool zmq::router_t::identify_peer (pipe_t *pipe_)
             outpipes_t::iterator it = outpipes.find (identity);
             msg.close ();
 
-            if (it != outpipes.end ())
-            {
-                if (!handover) {
-                    //  Ignore peers with duplicate ID.
+            if (it != outpipes.end ()) {
+                if (!handover)
+                    //  Ignore peers with duplicate ID
                     return false;
-                }
-                else
-                {
+                else {
                     //  We will allow the new connection to take over this
                     //  identity. Temporarily assign a new identity to the 
                     //  existing pipe so we can terminate it asynchronously.
diff --git a/src/router.hpp b/src/router.hpp
index 8c88098d..43731c30 100644
--- a/src/router.hpp
+++ b/src/router.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/select.cpp b/src/select.cpp
index b5cb972c..9b2e9774 100644
--- a/src/select.cpp
+++ b/src/select.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/select.hpp b/src/select.hpp
index 9c3ef472..0a75bcda 100644
--- a/src/select.hpp
+++ b/src/select.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/session_base.cpp b/src/session_base.cpp
index b760db8c..f98e265a 100644
--- a/src/session_base.cpp
+++ b/src/session_base.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/session_base.hpp b/src/session_base.hpp
index 7cd8c192..c2a2f36f 100644
--- a/src/session_base.hpp
+++ b/src/session_base.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/signaler.cpp b/src/signaler.cpp
index a2a94fc5..022cda3f 100644
--- a/src/signaler.cpp
+++ b/src/signaler.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/signaler.hpp b/src/signaler.hpp
index 3e0d4f6d..44bc903d 100644
--- a/src/signaler.hpp
+++ b/src/signaler.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index f9057d71..c824d289 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/socket_base.hpp b/src/socket_base.hpp
index 8fbfa069..9cc128b5 100644
--- a/src/socket_base.hpp
+++ b/src/socket_base.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/stdint.hpp b/src/stdint.hpp
index 60c29c60..2d8fb238 100644
--- a/src/stdint.hpp
+++ b/src/stdint.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/stream.cpp b/src/stream.cpp
index 987a2679..74d8a99e 100644
--- a/src/stream.cpp
+++ b/src/stream.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/stream.hpp b/src/stream.hpp
index 41171938..cbdd1eff 100644
--- a/src/stream.hpp
+++ b/src/stream.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/stream_engine.cpp b/src/stream_engine.cpp
index 07612d7d..356db3f0 100644
--- a/src/stream_engine.cpp
+++ b/src/stream_engine.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -89,7 +89,8 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_,
     if (family == 0)
         peer_address = "";
 #if defined ZMQ_HAVE_SO_PEERCRED
-    else if (family == PF_UNIX && options.zap_ipc_creds) {
+    else
+    if (family == PF_UNIX) {
         struct ucred cred;
         socklen_t size = sizeof (cred);
         if (!getsockopt (s, SOL_SOCKET, SO_PEERCRED, &cred, &size)) {
@@ -99,7 +100,8 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_,
         }
     }
 #elif defined ZMQ_HAVE_LOCAL_PEERCRED
-    else if (family == PF_UNIX && options.zap_ipc_creds) {
+    else
+    if (family == PF_UNIX) {
         struct xucred cred;
         socklen_t size = sizeof (cred);
         if (!getsockopt (s, 0, LOCAL_PEERCRED, &cred, &size)
diff --git a/src/stream_engine.hpp b/src/stream_engine.hpp
index 2b3857d5..a604ef44 100644
--- a/src/stream_engine.hpp
+++ b/src/stream_engine.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/sub.cpp b/src/sub.cpp
index 6edb7bb4..79619336 100644
--- a/src/sub.cpp
+++ b/src/sub.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/sub.hpp b/src/sub.hpp
index 0a4df73d..6360b479 100644
--- a/src/sub.hpp
+++ b/src/sub.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tcp.cpp b/src/tcp.cpp
index b33cbef3..779d8dc8 100755
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tcp.hpp b/src/tcp.hpp
index 28d6af77..e5b5daca 100644
--- a/src/tcp.hpp
+++ b/src/tcp.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tcp_address.cpp b/src/tcp_address.cpp
index 1c758125..51b35d0e 100644
--- a/src/tcp_address.cpp
+++ b/src/tcp_address.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tcp_address.hpp b/src/tcp_address.hpp
index 4aa95b2f..ccd3dec2 100644
--- a/src/tcp_address.hpp
+++ b/src/tcp_address.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp
index 4c7f3afe..7d36d010 100644
--- a/src/tcp_connecter.cpp
+++ b/src/tcp_connecter.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tcp_connecter.hpp b/src/tcp_connecter.hpp
index 5de3a482..2fe8f825 100644
--- a/src/tcp_connecter.hpp
+++ b/src/tcp_connecter.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp
index 3ad5c67e..a3888abc 100644
--- a/src/tcp_listener.cpp
+++ b/src/tcp_listener.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tcp_listener.hpp b/src/tcp_listener.hpp
index 80633053..22cdc364 100644
--- a/src/tcp_listener.hpp
+++ b/src/tcp_listener.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/thread.cpp b/src/thread.cpp
index e9eecebb..f5f45b7f 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/thread.hpp b/src/thread.hpp
index 0acb7d95..bdf6fe2b 100644
--- a/src/thread.hpp
+++ b/src/thread.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tipc_address.cpp b/src/tipc_address.cpp
index ff6700f4..509e8997 100644
--- a/src/tipc_address.cpp
+++ b/src/tipc_address.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 Ericsson AB
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tipc_address.hpp b/src/tipc_address.hpp
index a0d64371..b452cb23 100644
--- a/src/tipc_address.hpp
+++ b/src/tipc_address.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 Ericsson AB
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tipc_connecter.cpp b/src/tipc_connecter.cpp
index e6108650..66707baa 100644
--- a/src/tipc_connecter.cpp
+++ b/src/tipc_connecter.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 Ericsson AB
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tipc_connecter.hpp b/src/tipc_connecter.hpp
index d23cc91c..50843f6a 100644
--- a/src/tipc_connecter.hpp
+++ b/src/tipc_connecter.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 Ericsson AB
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tipc_listener.cpp b/src/tipc_listener.cpp
index b5956d82..821cfa99 100644
--- a/src/tipc_listener.cpp
+++ b/src/tipc_listener.cpp
@@ -1,5 +1,5 @@
  /*
-    Copyright (c) 2013 Ericsson AB
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/tipc_listener.hpp b/src/tipc_listener.hpp
index 6cd622c3..1d86db19 100644
--- a/src/tipc_listener.hpp
+++ b/src/tipc_listener.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 Ericsson AB
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/trie.cpp b/src/trie.cpp
index e495499e..e516c351 100644
--- a/src/trie.cpp
+++ b/src/trie.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/trie.hpp b/src/trie.hpp
index 43ae1de0..0bfd602c 100644
--- a/src/trie.hpp
+++ b/src/trie.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/v1_decoder.cpp b/src/v1_decoder.cpp
index b50f67f9..388fe074 100644
--- a/src/v1_decoder.cpp
+++ b/src/v1_decoder.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/v1_decoder.hpp b/src/v1_decoder.hpp
index 17081182..3540e5e8 100644
--- a/src/v1_decoder.hpp
+++ b/src/v1_decoder.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/v1_encoder.cpp b/src/v1_encoder.cpp
index e2b6fd00..bbae005f 100644
--- a/src/v1_encoder.cpp
+++ b/src/v1_encoder.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/v1_encoder.hpp b/src/v1_encoder.hpp
index 7d5ab7dc..00a63ded 100644
--- a/src/v1_encoder.hpp
+++ b/src/v1_encoder.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/v2_decoder.cpp b/src/v2_decoder.cpp
index a4f36e98..e2d716b4 100644
--- a/src/v2_decoder.cpp
+++ b/src/v2_decoder.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/v2_decoder.hpp b/src/v2_decoder.hpp
index a370dda1..30bf1afc 100644
--- a/src/v2_decoder.hpp
+++ b/src/v2_decoder.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/v2_encoder.cpp b/src/v2_encoder.cpp
index d6c36131..ff30119a 100644
--- a/src/v2_encoder.cpp
+++ b/src/v2_encoder.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/v2_encoder.hpp b/src/v2_encoder.hpp
index 12ec1759..bc70d06a 100644
--- a/src/v2_encoder.hpp
+++ b/src/v2_encoder.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/v2_protocol.hpp b/src/v2_protocol.hpp
index 308b2938..365e6879 100644
--- a/src/v2_protocol.hpp
+++ b/src/v2_protocol.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/windows.hpp b/src/windows.hpp
index f54f735a..9177890c 100755
--- a/src/windows.hpp
+++ b/src/windows.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/wire.hpp b/src/wire.hpp
index 7aec7b8b..3bc8ee4d 100644
--- a/src/wire.hpp
+++ b/src/wire.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/xpub.cpp b/src/xpub.cpp
index 99a699d0..ef0464ec 100644
--- a/src/xpub.cpp
+++ b/src/xpub.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/xpub.hpp b/src/xpub.hpp
index 362425a3..76fcf74f 100644
--- a/src/xpub.hpp
+++ b/src/xpub.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/xsub.cpp b/src/xsub.cpp
index c4381a26..e72088e8 100644
--- a/src/xsub.cpp
+++ b/src/xsub.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/xsub.hpp b/src/xsub.hpp
index af7d0c94..732dbf83 100644
--- a/src/xsub.hpp
+++ b/src/xsub.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ypipe.hpp b/src/ypipe.hpp
index 86e5d01c..0f9ac91e 100644
--- a/src/ypipe.hpp
+++ b/src/ypipe.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ypipe_base.hpp b/src/ypipe_base.hpp
index b7e7081b..5ad9a114 100644
--- a/src/ypipe_base.hpp
+++ b/src/ypipe_base.hpp
@@ -1,6 +1,6 @@
 
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/ypipe_conflate.hpp b/src/ypipe_conflate.hpp
index 6dc20ef9..a9a87b32 100644
--- a/src/ypipe_conflate.hpp
+++ b/src/ypipe_conflate.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/yqueue.hpp b/src/yqueue.hpp
index 56046dab..583d3679 100644
--- a/src/yqueue.hpp
+++ b/src/yqueue.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/zmq.cpp b/src/zmq.cpp
index daf4f085..7ae8bc16 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/src/zmq_utils.cpp b/src/zmq_utils.cpp
index 148ef95f..d6b3b650 100644
--- a/src/zmq_utils.cpp
+++ b/src/zmq_utils.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 42ee17aa..76c3d38f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -53,8 +53,7 @@ noinst_PROGRAMS += test_shutdown_stress \
                    test_reqrep_ipc \
                    test_timeo \
                    test_fork \
-                   test_filter_ipc \
-                   test_zap_ipc_creds
+                   test_filter_ipc 
 endif
 
 if BUILD_TIPC
diff --git a/tests/test_abstract_ipc.cpp b/tests/test_abstract_ipc.cpp
index 3c91f32d..8e43b15f 100644
--- a/tests/test_abstract_ipc.cpp
+++ b/tests/test_abstract_ipc.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_conflate.cpp b/tests/test_conflate.cpp
index 9c3ba5ae..647ad0f3 100644
--- a/tests/test_conflate.cpp
+++ b/tests/test_conflate.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_connect_delay_tipc.cpp b/tests/test_connect_delay_tipc.cpp
index 30a32f44..7340ee8d 100644
--- a/tests/test_connect_delay_tipc.cpp
+++ b/tests/test_connect_delay_tipc.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_connect_resolve.cpp b/tests/test_connect_resolve.cpp
index 4c49e8f3..9a26c4f8 100644
--- a/tests/test_connect_resolve.cpp
+++ b/tests/test_connect_resolve.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_ctx_destroy.cpp b/tests/test_ctx_destroy.cpp
index a269b2bd..d8ce961d 100644
--- a/tests/test_ctx_destroy.cpp
+++ b/tests/test_ctx_destroy.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_ctx_options.cpp b/tests/test_ctx_options.cpp
index 900e1250..1e598386 100644
--- a/tests/test_ctx_options.cpp
+++ b/tests/test_ctx_options.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_diffserv.cpp b/tests/test_diffserv.cpp
index e6ad725b..518a5f7c 100644
--- a/tests/test_diffserv.cpp
+++ b/tests/test_diffserv.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_disconnect_inproc.cpp b/tests/test_disconnect_inproc.cpp
index 1b0fd317..b6381d34 100644
--- a/tests/test_disconnect_inproc.cpp
+++ b/tests/test_disconnect_inproc.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_filter_ipc.cpp b/tests/test_filter_ipc.cpp
index 3c7b0bf1..9e748073 100644
--- a/tests/test_filter_ipc.cpp
+++ b/tests/test_filter_ipc.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_fork.cpp b/tests/test_fork.cpp
index 637b6e98..59fab3e7 100644
--- a/tests/test_fork.cpp
+++ b/tests/test_fork.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_hwm.cpp b/tests/test_hwm.cpp
index b1d871ee..f7bbf170 100644
--- a/tests/test_hwm.cpp
+++ b/tests/test_hwm.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_immediate.cpp b/tests/test_immediate.cpp
index c5c04d01..863b7463 100644
--- a/tests/test_immediate.cpp
+++ b/tests/test_immediate.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
     
     This file is part of 0MQ.
 
diff --git a/tests/test_inproc_connect.cpp b/tests/test_inproc_connect.cpp
index 10d828f4..4dabace6 100644
--- a/tests/test_inproc_connect.cpp
+++ b/tests/test_inproc_connect.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_invalid_rep.cpp b/tests/test_invalid_rep.cpp
index 8f166422..810eb7ad 100644
--- a/tests/test_invalid_rep.cpp
+++ b/tests/test_invalid_rep.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_iov.cpp b/tests/test_iov.cpp
index 718b318f..5dd4f74c 100644
--- a/tests/test_iov.cpp
+++ b/tests/test_iov.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_ipc_wildcard.cpp b/tests/test_ipc_wildcard.cpp
index a49e92ca..73b8bb87 100644
--- a/tests/test_ipc_wildcard.cpp
+++ b/tests/test_ipc_wildcard.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_issue_566.cpp b/tests/test_issue_566.cpp
index 068f45b9..8500a867 100644
--- a/tests/test_issue_566.cpp
+++ b/tests/test_issue_566.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_last_endpoint.cpp b/tests/test_last_endpoint.cpp
index 2343c753..6722951b 100644
--- a/tests/test_last_endpoint.cpp
+++ b/tests/test_last_endpoint.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_many_sockets.cpp b/tests/test_many_sockets.cpp
index e98a030d..5d3cf1b8 100644
--- a/tests/test_many_sockets.cpp
+++ b/tests/test_many_sockets.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_monitor.cpp b/tests/test_monitor.cpp
index 84376193..6a16a8ed 100644
--- a/tests/test_monitor.cpp
+++ b/tests/test_monitor.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_msg_flags.cpp b/tests/test_msg_flags.cpp
index 9bdd9c4a..601c9fad 100644
--- a/tests/test_msg_flags.cpp
+++ b/tests/test_msg_flags.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_pair_inproc.cpp b/tests/test_pair_inproc.cpp
index 4eac5f5f..d6637c0f 100644
--- a/tests/test_pair_inproc.cpp
+++ b/tests/test_pair_inproc.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_pair_ipc.cpp b/tests/test_pair_ipc.cpp
index 31b534b1..819a7b3d 100644
--- a/tests/test_pair_ipc.cpp
+++ b/tests/test_pair_ipc.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_pair_tcp.cpp b/tests/test_pair_tcp.cpp
index f7e5aee5..a007c397 100644
--- a/tests/test_pair_tcp.cpp
+++ b/tests/test_pair_tcp.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_probe_router.cpp b/tests/test_probe_router.cpp
index 71884575..093f41a8 100644
--- a/tests/test_probe_router.cpp
+++ b/tests/test_probe_router.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_proxy.cpp b/tests/test_proxy.cpp
index 83eecddd..83d95741 100644
--- a/tests/test_proxy.cpp
+++ b/tests/test_proxy.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_req_correlate.cpp b/tests/test_req_correlate.cpp
index 344926c5..af5a583b 100644
--- a/tests/test_req_correlate.cpp
+++ b/tests/test_req_correlate.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_req_relaxed.cpp b/tests/test_req_relaxed.cpp
index 7970ed41..03915d0d 100644
--- a/tests/test_req_relaxed.cpp
+++ b/tests/test_req_relaxed.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_reqrep_device.cpp b/tests/test_reqrep_device.cpp
index 9eb1db19..4ea8d0c6 100644
--- a/tests/test_reqrep_device.cpp
+++ b/tests/test_reqrep_device.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_reqrep_inproc.cpp b/tests/test_reqrep_inproc.cpp
index addf2f7d..acecafce 100644
--- a/tests/test_reqrep_inproc.cpp
+++ b/tests/test_reqrep_inproc.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_reqrep_ipc.cpp b/tests/test_reqrep_ipc.cpp
index f05f0e0f..8c0837ee 100644
--- a/tests/test_reqrep_ipc.cpp
+++ b/tests/test_reqrep_ipc.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_reqrep_tcp.cpp b/tests/test_reqrep_tcp.cpp
index 275f7537..f6f180e5 100644
--- a/tests/test_reqrep_tcp.cpp
+++ b/tests/test_reqrep_tcp.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_resource.cpp b/tests/test_resource.cpp
index 58b3118a..b0254694 100644
--- a/tests/test_resource.cpp
+++ b/tests/test_resource.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_router_handover.cpp b/tests/test_router_handover.cpp
index 3afc1c3c..bed2d636 100644
--- a/tests/test_router_handover.cpp
+++ b/tests/test_router_handover.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_router_mandatory.cpp b/tests/test_router_mandatory.cpp
index dcc6114f..ca8fb24e 100644
--- a/tests/test_router_mandatory.cpp
+++ b/tests/test_router_mandatory.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_security_curve.cpp b/tests/test_security_curve.cpp
index 788fb2c1..7aba2a92 100644
--- a/tests/test_security_curve.cpp
+++ b/tests/test_security_curve.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_security_null.cpp b/tests/test_security_null.cpp
index 8a55632d..7790ae5c 100644
--- a/tests/test_security_null.cpp
+++ b/tests/test_security_null.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_security_plain.cpp b/tests/test_security_plain.cpp
index 74973fdf..7ec77cac 100644
--- a/tests/test_security_plain.cpp
+++ b/tests/test_security_plain.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_shutdown_stress.cpp b/tests/test_shutdown_stress.cpp
index 39b42da2..27dd605a 100644
--- a/tests/test_shutdown_stress.cpp
+++ b/tests/test_shutdown_stress.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_spec_dealer.cpp b/tests/test_spec_dealer.cpp
index 7d36d869..e9294889 100644
--- a/tests/test_spec_dealer.cpp
+++ b/tests/test_spec_dealer.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_spec_pushpull.cpp b/tests/test_spec_pushpull.cpp
index 42305d9e..35b694c3 100644
--- a/tests/test_spec_pushpull.cpp
+++ b/tests/test_spec_pushpull.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_spec_rep.cpp b/tests/test_spec_rep.cpp
index c5b291ee..9bdb8aab 100644
--- a/tests/test_spec_rep.cpp
+++ b/tests/test_spec_rep.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_spec_req.cpp b/tests/test_spec_req.cpp
index 8e3e7218..d8a9a3a1 100644
--- a/tests/test_spec_req.cpp
+++ b/tests/test_spec_req.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_spec_router.cpp b/tests/test_spec_router.cpp
index e85d3c95..39984ffc 100644
--- a/tests/test_spec_router.cpp
+++ b/tests/test_spec_router.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_stream.cpp b/tests/test_stream.cpp
index 5e80f011..02408d70 100644
--- a/tests/test_stream.cpp
+++ b/tests/test_stream.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_stream_empty.cpp b/tests/test_stream_empty.cpp
index a4b875e3..a8f88ee6 100644
--- a/tests/test_stream_empty.cpp
+++ b/tests/test_stream_empty.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_sub_forward.cpp b/tests/test_sub_forward.cpp
index e77ed3b8..f480ba2f 100644
--- a/tests/test_sub_forward.cpp
+++ b/tests/test_sub_forward.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_system.cpp b/tests/test_system.cpp
index bbea6541..e1d72732 100644
--- a/tests/test_system.cpp
+++ b/tests/test_system.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_term_endpoint.cpp b/tests/test_term_endpoint.cpp
index 186d3773..5ec9e4bf 100644
--- a/tests/test_term_endpoint.cpp
+++ b/tests/test_term_endpoint.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_timeo.cpp b/tests/test_timeo.cpp
index f47e0b56..1ddaec38 100644
--- a/tests/test_timeo.cpp
+++ b/tests/test_timeo.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tests/test_zap_ipc_creds.cpp b/tests/test_zap_ipc_creds.cpp
deleted file mode 100644
index 10dccb6c..00000000
--- a/tests/test_zap_ipc_creds.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
-
-    This file is part of 0MQ.
-
-    0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    0MQ is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string.h>
-
-#include <sstream>
-
-#include "testutil.hpp"
-
-static void zap_handler (void *handler)
-{
-    //  Process ZAP requests forever
-    while (true) {
-        char *version = s_recv (handler);
-        if (!version)
-            break;          //  Terminating
-        char *sequence = s_recv (handler);
-        char *domain = s_recv (handler);
-        char *address = s_recv (handler);
-        char *identity = s_recv (handler);
-        char *mechanism = s_recv (handler);
-
-        assert (streq (version, "1.0"));
-        assert (streq (mechanism, "NULL"));
-        
-        if (streq (domain, "creds")) {
-            std::ostringstream buf;
-            buf << "localhost:" << getuid () << ":" << getgid () << ":";
-#           ifdef ZMQ_HAVE_SO_PEERCRED
-            buf << getpid ();
-#           endif
-            assert (streq (address, buf.str ().c_str ()));
-        } else
-            assert (streq (address, "localhost"));
-
-        s_sendmore (handler, version);
-        s_sendmore (handler, sequence);
-        s_sendmore (handler, "200");
-        s_sendmore (handler, "OK");
-        s_sendmore (handler, "anonymous");
-        s_send     (handler, "");
-
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (identity);
-        free (mechanism);
-    }
-    zmq_close (handler);
-}
-
-static void run_test (bool with_creds)
-{
-    void *ctx = zmq_ctx_new ();
-    assert (ctx);
-
-    //  Spawn ZAP handler
-    //  We create and bind ZAP socket in main thread to avoid case
-    //  where child thread does not start up fast enough.
-    void *handler = zmq_socket (ctx, ZMQ_REP);
-    assert (handler);
-    int rc = zmq_bind (handler, "inproc://zeromq.zap.01");
-    assert (rc == 0);
-    void *zap_thread = zmq_threadstart (&zap_handler, handler);
-
-    void *sb = zmq_socket (ctx, ZMQ_PAIR);
-    assert (sb);
-
-    void *sc = zmq_socket (ctx, ZMQ_PAIR);
-    assert (sc);
-
-    //  Now use the right domain, the test must pass
-    if (with_creds) {
-        rc = zmq_setsockopt (sb, ZMQ_ZAP_DOMAIN, "creds", 5);
-        assert (rc == 0);
-        int ipc_creds = 1;
-        rc = zmq_setsockopt (sb, ZMQ_ZAP_IPC_CREDS, &ipc_creds, sizeof (int));
-        assert (rc == 0);
-    } else {
-        rc = zmq_setsockopt (sb, ZMQ_ZAP_DOMAIN, "none", 4);
-        assert (rc == 0);
-        int ipc_creds = 1;
-        size_t size = sizeof (int);
-        rc = zmq_getsockopt (sb, ZMQ_ZAP_IPC_CREDS, &ipc_creds, &size);
-        assert (rc == 0);
-        assert (ipc_creds == 0);
-    }
-
-    rc = zmq_bind (sb, "ipc://@/tmp/test");
-    assert (rc == 0);
-
-    rc = zmq_connect (sc, "ipc://@/tmp/test");
-    assert (rc == 0);
-        
-    bounce (sb, sc);
-
-    rc = zmq_close (sc);
-    assert (rc == 0);
-    rc = zmq_close (sb);
-    assert (rc == 0);
-
-    rc = zmq_ctx_term (ctx);
-    assert (rc == 0);
-
-    //  Wait until ZAP handler terminates.
-    zmq_threadclose (zap_thread);
-}
-
-int main (void)
-{
-    setup_test_environment();
-
-    run_test(false);
-    run_test(true);
-
-    return 0 ;
-}
-
diff --git a/tests/testutil.hpp b/tests/testutil.hpp
index 31db1e40..a91de782 100644
--- a/tests/testutil.hpp
+++ b/tests/testutil.hpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
diff --git a/tools/curve_keygen.cpp b/tools/curve_keygen.cpp
index 27d63221..be2fd046 100644
--- a/tools/curve_keygen.cpp
+++ b/tools/curve_keygen.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.