From 1b3df75b8715f3c525bac5c439fb81ce8c3a89ea Mon Sep 17 00:00:00 2001 From: Patrik Wenger Date: Tue, 3 Jan 2017 12:45:21 +0100 Subject: [PATCH] fix typos --- doc/zmq_gssapi.txt | 4 ++-- doc/zmq_setsockopt.txt | 2 +- src/socket_base.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/zmq_gssapi.txt b/doc/zmq_gssapi.txt index 8268cc3b..3b32ec84 100644 --- a/doc/zmq_gssapi.txt +++ b/doc/zmq_gssapi.txt @@ -29,9 +29,9 @@ for whom GSSAPI credentials should be acquired. To become a GSSAPI server, the application additionally sets the ZMQ_GSSAPI_SERVER option on the socket. -To become a GSSAPI client, the application sets additionally sets the +To become a GSSAPI client, the application additionally sets the ZMQ_GSSAPI_SERVICE_PRINCIPAL option to the name of the principal of the server -to which it intends to connect. +to which it intends to connect. OPTIONAL ENCRYPTION diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt index 1e43b532..c79f7cb2 100644 --- a/doc/zmq_setsockopt.txt +++ b/doc/zmq_setsockopt.txt @@ -203,7 +203,7 @@ Applicable socket types:: all, when using TCP transport ZMQ_GSSAPI_PLAINTEXT: Disable GSSAPI encryption ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Defines whether communications on the socket will encrypted, see +Defines whether communications on the socket will be encrypted, see linkzmq:zmq_gssapi[7]. A value of '1' means that communications will be plaintext. A value of '0' means communications will be encrypted. diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 27fdfb32..7508f189 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -1205,7 +1205,7 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_) // If the message cannot be fetched immediately, there are two scenarios. // For non-blocking recv, commands are processed in case there's an - // activate_reader command already waiting int a command pipe. + // activate_reader command already waiting in a command pipe. // If it's not, return EAGAIN. if (flags_ & ZMQ_DONTWAIT || options.rcvtimeo == 0) { if (unlikely (process_commands (0, false) != 0)) {