Imported Upstream version 2.1.6upstream/2.1.6

49 files changed, 273 insertions, 125 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 35bf698..2db8cb3 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -142,6 +142,8 @@ OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
+OpenPGM_CFLAGS = @OpenPGM_CFLAGS@
+OpenPGM_LIBS = @OpenPGM_LIBS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -150,6 +152,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -164,8 +169,6 @@ abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_zmq_have_asciidoc = @ac_zmq_have_asciidoc@
-ac_zmq_have_xmlto = @ac_zmq_have_xmlto@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -194,6 +197,8 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+libzmq_have_asciidoc = @libzmq_have_asciidoc@
+libzmq_have_xmlto = @libzmq_have_xmlto@
 localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
diff --git a/doc/zmq.7 b/doc/zmq.7
index d7fa3be..b5f0d27 100644
--- a/doc/zmq.7
+++ b/doc/zmq.7
@@ -2,12 +2,12 @@
 .\"     Title: zmq
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ" "7" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ" "7" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_bind.3 b/doc/zmq_bind.3
index 9ff1109..8412806 100644
--- a/doc/zmq_bind.3
+++ b/doc/zmq_bind.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_bind
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_BIND" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_BIND" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_close.3 b/doc/zmq_close.3
index 520f0ac..43f47b3 100644
--- a/doc/zmq_close.3
+++ b/doc/zmq_close.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_close
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_CLOSE" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_CLOSE" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_connect.3 b/doc/zmq_connect.3
index 06435e8..534abb4 100644
--- a/doc/zmq_connect.3
+++ b/doc/zmq_connect.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_connect
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_CONNECT" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_CONNECT" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_cpp.7 b/doc/zmq_cpp.7
index c61797e..b5fb80a 100644
--- a/doc/zmq_cpp.7
+++ b/doc/zmq_cpp.7
@@ -2,12 +2,12 @@
 .\"     Title: zmq_cpp
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_CPP" "7" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_CPP" "7" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_device.3 b/doc/zmq_device.3
index 329360d..67ab7bb 100644
--- a/doc/zmq_device.3
+++ b/doc/zmq_device.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_device
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_DEVICE" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_DEVICE" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_epgm.7 b/doc/zmq_epgm.7
index 1559950..3c4c7d1 100644
--- a/doc/zmq_epgm.7
+++ b/doc/zmq_epgm.7
@@ -2,12 +2,12 @@
 .\"     Title: zmq_pgm
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_PGM" "7" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_PGM" "7" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -124,6 +124,8 @@ data                   = *OCTET
 .sp
 In order for late joining consumers to be able to identify message boundaries, each PGM datagram payload starts with a 16\-bit unsigned integer in network byte order specifying either the offset of the first message \fIframe\fR in the datagram or containing the value 0xFFFF if the datagram contains solely an intermediate part of a larger message\&.
 .sp
+Note that offset specifies where the first message begins rather than the first message part\&. Thus, if there are trailing message parts at the beginning of the packet the offset ignores them and points to first initial message part in the packet\&.
+.sp
 The following diagram illustrates the layout of a single PGM datagram payload:
 .sp
 .if n \{\
diff --git a/doc/zmq_epgm.html b/doc/zmq_epgm.html
index 5506fa1..9383d71 100644
--- a/doc/zmq_epgm.html
+++ b/doc/zmq_epgm.html
@@ -672,6 +672,10 @@ each PGM datagram payload starts with a 16-bit unsigned integer in network byte
 order specifying either the offset of the first message <em>frame</em> in the datagram

 or containing the value <tt>0xFFFF</tt> if the datagram contains solely an

 intermediate part of a larger message.</p></div>

+<div class="paragraph"><p>Note that offset specifies where the first message begins rather than the first

+message part. Thus, if there are trailing message parts at the beginning of

+the packet the offset ignores them and points to first initial message part

+in the packet.</p></div>

 <div class="paragraph"><p>The following diagram illustrates the layout of a single PGM datagram payload:</p></div>

 <div class="literalblock">

 <div class="content">

@@ -737,8 +741,8 @@ Martin Lucina &lt;<a href="mailto:mato@kotelna.sk">mato@kotelna.sk</a>&gt;.</p><
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-ØMQ 2.1.4<br />

-Last updated 2011-03-13 17:59:17 CEST

+ØMQ 2.1.5<br />

+Last updated 2011-04-16 10:29:20 CEST

 </div>

 </div>

 </body>

diff --git a/doc/zmq_epgm.txt b/doc/zmq_epgm.txt
index 72ae24f..9a48afd 100644
--- a/doc/zmq_epgm.txt
+++ b/doc/zmq_epgm.txt
@@ -93,6 +93,11 @@ order specifying either the offset of the first message 'frame' in the datagram
 or containing the value `0xFFFF` if the datagram contains solely an
 intermediate part of a larger message.
 
+Note that offset specifies where the first message begins rather than the first
+message part. Thus, if there are trailing message parts at the beginning of
+the packet the offset ignores them and points to first initial message part
+in the packet.
+
 The following diagram illustrates the layout of a single PGM datagram payload:
 
 ....
diff --git a/doc/zmq_errno.3 b/doc/zmq_errno.3
index 407ca79..9ebec08 100644
--- a/doc/zmq_errno.3
+++ b/doc/zmq_errno.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_errno
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_ERRNO" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_ERRNO" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_getsockopt.3 b/doc/zmq_getsockopt.3
index 774dca8..1760fa2 100644
--- a/doc/zmq_getsockopt.3
+++ b/doc/zmq_getsockopt.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_getsockopt
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_GETSOCKOPT" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_GETSOCKOPT" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_init.3 b/doc/zmq_init.3
index d52d393..dd0bed5 100644
--- a/doc/zmq_init.3
+++ b/doc/zmq_init.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_init
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_INIT" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_INIT" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_inproc.7 b/doc/zmq_inproc.7
index 830d1fa..0f0ea78 100644
--- a/doc/zmq_inproc.7
+++ b/doc/zmq_inproc.7
@@ -2,12 +2,12 @@
 .\"     Title: zmq_inproc
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_INPROC" "7" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_INPROC" "7" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_ipc.7 b/doc/zmq_ipc.7
index a0ef8bd..e3b0652 100644
--- a/doc/zmq_ipc.7
+++ b/doc/zmq_ipc.7
@@ -2,12 +2,12 @@
 .\"     Title: zmq_ipc
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_IPC" "7" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_IPC" "7" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_msg_close.3 b/doc/zmq_msg_close.3
index 76d5cb8..3201edb 100644
--- a/doc/zmq_msg_close.3
+++ b/doc/zmq_msg_close.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_msg_close
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_MSG_CLOSE" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_MSG_CLOSE" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -57,8 +57,11 @@ Never access \fIzmq_msg_t\fR members directly, instead always use the \fIzmq_msg
 .sp
 The \fIzmq_msg_close()\fR function shall return zero if successful\&. Otherwise it shall return \-1 and set \fIerrno\fR to one of the values defined below\&.
 .SH "ERRORS"
-.sp
-No errors are defined\&.
+.PP
+\fBEFAULT\fR
+.RS 4
+Invalid message\&.
+.RE
 .SH "SEE ALSO"
 .sp
 \fBzmq_msg_init\fR(3) \fBzmq_msg_init_size\fR(3) \fBzmq_msg_init_data\fR(3) \fBzmq_msg_data\fR(3) \fBzmq_msg_size\fR(3) \fBzmq\fR(7)
diff --git a/doc/zmq_msg_close.html b/doc/zmq_msg_close.html
index 7942587..caa7741 100644
--- a/doc/zmq_msg_close.html
+++ b/doc/zmq_msg_close.html
@@ -610,7 +610,16 @@ it shall return <tt>-1</tt> and set <em>errno</em> to one of the values defined
 </div>

 <h2 id="_errors">ERRORS</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>No errors are defined.</p></div>

+<div class="dlist"><dl>

+<dt class="hdlist1">

+<strong>EFAULT</strong>

+</dt>

+<dd>

+<p>

+Invalid message.

+</p>

+</dd>

+</dl></div>

 </div>

 <h2 id="_see_also">SEE ALSO</h2>

 <div class="sectionbody">

@@ -630,8 +639,8 @@ Martin Lucina &lt;<a href="mailto:mato@kotelna.sk">mato@kotelna.sk</a>&gt;.</p><
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-ØMQ 2.1.4<br />

-Last updated 2011-03-13 17:59:17 CEST

+ØMQ 2.1.5<br />

+Last updated 2011-04-20 12:15:32 CEST

 </div>

 </div>

 </body>

diff --git a/doc/zmq_msg_close.txt b/doc/zmq_msg_close.txt
index f72251a..025302b 100644
--- a/doc/zmq_msg_close.txt
+++ b/doc/zmq_msg_close.txt
@@ -35,7 +35,8 @@ it shall return `-1` and set 'errno' to one of the values defined below.
 
 ERRORS
 ------
-No errors are defined.
+*EFAULT*::
+Invalid message.
 
 
 SEE ALSO
diff --git a/doc/zmq_msg_copy.3 b/doc/zmq_msg_copy.3
index 2471cdc..3c19ef3 100644
--- a/doc/zmq_msg_copy.3
+++ b/doc/zmq_msg_copy.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_msg_copy
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_MSG_COPY" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_MSG_COPY" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -71,8 +71,11 @@ Never access \fIzmq_msg_t\fR members directly, instead always use the \fIzmq_msg
 .sp
 The \fIzmq_msg_copy()\fR function shall return zero if successful\&. Otherwise it shall return \-1 and set \fIerrno\fR to one of the values defined below\&.
 .SH "ERRORS"
-.sp
-No errors are defined\&.
+.PP
+\fBEFAULT\fR
+.RS 4
+Invalid message\&.
+.RE
 .SH "SEE ALSO"
 .sp
 \fBzmq_msg_move\fR(3) \fBzmq_msg_init\fR(3) \fBzmq_msg_init_size\fR(3) \fBzmq_msg_init_data\fR(3) \fBzmq_msg_close\fR(3) \fBzmq\fR(7)
diff --git a/doc/zmq_msg_copy.html b/doc/zmq_msg_copy.html
index 5017c3c..d492905 100644
--- a/doc/zmq_msg_copy.html
+++ b/doc/zmq_msg_copy.html
@@ -619,7 +619,16 @@ shall return <tt>-1</tt> and set <em>errno</em> to one of the values defined bel
 </div>

 <h2 id="_errors">ERRORS</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>No errors are defined.</p></div>

+<div class="dlist"><dl>

+<dt class="hdlist1">

+<strong>EFAULT</strong>

+</dt>

+<dd>

+<p>

+Invalid message.

+</p>

+</dd>

+</dl></div>

 </div>

 <h2 id="_see_also">SEE ALSO</h2>

 <div class="sectionbody">

@@ -639,8 +648,8 @@ Martin Lucina &lt;<a href="mailto:mato@kotelna.sk">mato@kotelna.sk</a>&gt;.</p><
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-ØMQ 2.1.4<br />

-Last updated 2011-03-13 17:59:17 CEST

+ØMQ 2.1.5<br />

+Last updated 2011-04-20 12:15:32 CEST

 </div>

 </div>

 </body>

diff --git a/doc/zmq_msg_copy.txt b/doc/zmq_msg_copy.txt
index d23dcdb..d6ce1b9 100644
--- a/doc/zmq_msg_copy.txt
+++ b/doc/zmq_msg_copy.txt
@@ -37,7 +37,8 @@ shall return `-1` and set 'errno' to one of the values defined below.
 
 ERRORS
 ------
-No errors are defined.
+*EFAULT*::
+Invalid message.
 
 
 SEE ALSO
diff --git a/doc/zmq_msg_data.3 b/doc/zmq_msg_data.3
index 6470f6b..e619197 100644
--- a/doc/zmq_msg_data.3
+++ b/doc/zmq_msg_data.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_msg_data
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_MSG_DATA" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_MSG_DATA" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_msg_init.3 b/doc/zmq_msg_init.3
index f4cc7c7..8fe45bf 100644
--- a/doc/zmq_msg_init.3
+++ b/doc/zmq_msg_init.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_msg_init
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_MSG_INIT" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_MSG_INIT" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/zmq_msg_init_data.3 b/doc/zmq_msg_init_data.3
index b89821f..c042a87 100644
--- a/doc/zmq_msg_init_data.3
+++ b/doc/zmq_msg_init_data.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_msg_init_data
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/30/2011
+.\"      Date: 04/20/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.4
+.\"    Source: 0MQ 2.1.5
 .\"  Language: English
 .\"
-.TH "ZMQ_MSG_INIT_DATA" "3" "03/30/2011" "0MQ 2\&.1\&.4" "0MQ Manual"
+.TH "ZMQ_MSG_INIT_DATA" "3" "04/20/2011" "0MQ 2\&.1\&.5" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -68,6 +68,22 @@ Never access \fIzmq_msg_t\fR members directly, instead always use the \fIzmq_msg
 .ps -1
 .br
 .sp
+The deallocation function \fIffn\fR needs to be thread\-safe, since it will be called from an arbitrary thread\&.
+.sp .5v
+.RE
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBCaution\fR
+.ps -1
+.br
+.sp
 The functions \fIzmq_msg_init()\fR, \fIzmq_msg_init_data()\fR and \fIzmq_msg_init_size()\fR are mutually exclusive\&. Never initialize the same \fIzmq_msg_t\fR twice\&.
 .sp .5v
 .RE
diff --git a/doc/zmq_msg_init_data.html b/doc/zmq_msg_init_data.html
index efc259f..aebd2a7 100644
--- a/doc/zmq_msg_init_data.html
+++ b/doc/zmq_msg_init_data.html
@@ -608,6 +608,15 @@ supplied to <em>zmq_msg_init_data()</em>.</p></div>
 <td class="icon">

 <div class="title">Caution</div>

 </td>

+<td class="content">The deallocation function <em>ffn</em> needs to be thread-safe, since it

+will be called from an arbitrary thread.</td>

+</tr></table>

+</div>

+<div class="admonitionblo