Imported Upstream version 2.1.11upstream/2.1.11

1 files changed, 10 insertions, 10 deletions

diff --git a/doc/zmq_socket.3 b/doc/zmq_socket.3
index 4fa0e54..6b5e23b 100644
--- a/doc/zmq_socket.3
+++ b/doc/zmq_socket.3
@@ -2,12 +2,12 @@
 .\"     Title: zmq_socket
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/08/2011
+.\"      Date: 11/22/2011
 .\"    Manual: 0MQ Manual
-.\"    Source: 0MQ 2.1.10
+.\"    Source: 0MQ 2.1.11
 .\"  Language: English
 .\"
-.TH "ZMQ_SOCKET" "3" "09/08/2011" "0MQ 2\&.1\&.10" "0MQ Manual"
+.TH "ZMQ_SOCKET" "3" "11/22/2011" "0MQ 2\&.1\&.11" "0MQ Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -69,7 +69,7 @@ The request\-reply pattern is used for sending requests from a \fIclient\fR to o
 \fBZMQ_REQ\fR
 .RS 4
 .sp
-A socket of type \fIZMQ_REQ\fR is used by a \fIclient\fR to send requests to and receive replies from a \fIservice\fR\&. This socket type allows only an alternating sequence of \fIzmq_send(request)\fR and subsequent \fIzmq_recv(reply)\fR calls\&. Each request sent is load\-balanced among all \fIservices\fR, and each reply received is matched with the last issued request\&.
+A socket of type \fIZMQ_REQ\fR is used by a \fIclient\fR to send requests to and receive replies from a \fIservice\fR\&. This socket type allows only an alternating sequence of \fIzmq_send(request)\fR and subsequent \fIzmq_recv(reply)\fR calls\&. Each request sent is round\-robined among all \fIservices\fR, and each reply received is matched with the last issued request\&.
 .sp
 When a \fIZMQ_REQ\fR socket enters an exceptional state due to having reached the high water mark for all \fIservices\fR, or if there are no \fIservices\fR at all, then any \fBzmq_send\fR(3) operations on the socket shall block until the exceptional state ends or at least one \fIservice\fR becomes available for sending; messages are not discarded\&.
 .sp
@@ -112,7 +112,7 @@ T{
 Outgoing routing strategy
 T}:T{
 .sp
-Load\-balanced
+Round\-robin
 T}
 T{
 .sp
@@ -211,7 +211,7 @@ T}
 \fBZMQ_DEALER\fR
 .RS 4
 .sp
-A socket of type \fIZMQ_DEALER\fR is an advanced pattern used for extending request/reply sockets\&. Each message sent is load\-balanced among all connected peers, and each message received is fair\-queued from all connected peers\&.
+A socket of type \fIZMQ_DEALER\fR is an advanced pattern used for extending request/reply sockets\&. Each message sent is round\-robined among all connected peers, and each message received is fair\-queued from all connected peers\&.
 .sp
 Previously this socket was called \fIZMQ_XREQ\fR and that name remains available for backwards compatibility\&.
 .sp
@@ -258,7 +258,7 @@ T{
 Outgoing routing strategy
 T}:T{
 .sp
-Load\-balanced
+Round\-robin
 T}
 T{
 .sp
@@ -497,7 +497,7 @@ T}
 .RE
 .SS "Pipeline pattern"
 .sp
-The pipeline pattern is used for distributing data to \fInodes\fR arranged in a pipeline\&. Data always flows down the pipeline, and each stage of the pipeline is connected to at least one \fInode\fR\&. When a pipeline stage is connected to multiple \fInodes\fR data is load\-balanced among all connected \fInodes\fR\&.
+The pipeline pattern is used for distributing data to \fInodes\fR arranged in a pipeline\&. Data always flows down the pipeline, and each stage of the pipeline is connected to at least one \fInode\fR\&. When a pipeline stage is connected to multiple \fInodes\fR data is round\-robined among all connected \fInodes\fR\&.
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
@@ -507,7 +507,7 @@ The pipeline pattern is used for distributing data to \fInodes\fR arranged in a
 \fBZMQ_PUSH\fR
 .RS 4
 .sp
-A socket of type \fIZMQ_PUSH\fR is used by a pipeline \fInode\fR to send messages to downstream pipeline \fInodes\fR\&. Messages are load\-balanced to all connected downstream \fInodes\fR\&. The \fIzmq_recv()\fR function is not implemented for this socket type\&.
+A socket of type \fIZMQ_PUSH\fR is used by a pipeline \fInode\fR to send messages to downstream pipeline \fInodes\fR\&. Messages are round\-robined to all connected downstream \fInodes\fR\&. The \fIzmq_recv()\fR function is not implemented for this socket type\&.
 .sp
 When a \fIZMQ_PUSH\fR socket enters an exceptional state due to having reached the high water mark for all downstream \fInodes\fR, or if there are no downstream \fInodes\fR at all, then any \fBzmq_send\fR(3) operations on the socket shall block until the exceptional state ends or at least one downstream \fInode\fR becomes available for sending; messages are not discarded\&.
 .sp
@@ -559,7 +559,7 @@ T{
 Outgoing routing strategy
 T}:T{
 .sp
-Load\-balanced
+Round\-robin
 T}
 T{
 .sp