Merge branch 'master' into monitor-regressions

doc/zmq.txt

@@ -211,8 +211,8 @@ by C programmers. The intent is that programmers using 0MQ from other languages
 shall refer to this documentation alongside any documentation provided by the
 vendor of their language binding.
 
-Language bindings (Python, PHP, Ruby, Java and more) are provided by members
-of the 0MQ community and pointers can be found on the 0MQ website.
+Language bindings ($$C++$$, Python, PHP, Ruby, Java and more) are provided by
+members of the 0MQ community and pointers can be found on the 0MQ website.
 
 
 AUTHORS

doc/zmq_ctx_new.txt

@@ -39,7 +39,7 @@ No error values are defined for this function.
 SEE ALSO
 --------
 linkzmq:zmq[7]
-linkzmq:zmq_ctx_put[3]
+linkzmq:zmq_ctx_set[3]
 linkzmq:zmq_ctx_get[3]
 linkzmq:zmq_ctx_destroy[3]
 

doc/zmq_pgm.txt

@@ -60,7 +60,8 @@ An 'interface' may be specified by either of the following:
 NOTE: Interface names are not standardised in any way and should be assumed to
 be arbitrary and platform dependent. On Win32 platforms no short interface
 names exist, thus only the primary IPv4 address may be used to specify an
-'interface'.
+'interface'. The 'interface' part can be omitted, in that case the default one
+will be selected.
 
 A 'multicast address' is specified by an IPv4 multicast address in it's numeric
 representation.

src/socket_base.cpp

@@ -547,7 +547,7 @@ void zmq::socket_base_t::add_endpoint (const char *addr_, own_t *endpoint_)
 {
     //  Activate the session. Make it a child of this socket.
     launch_child (endpoint_);
-    endpoints.insert (std::make_pair (std::string (addr_), endpoint_));
+    endpoints.insert (endpoints_t::value_type (std::string (addr_), endpoint_));
 }
 
 int zmq::socket_base_t::term_endpoint (const char *addr_)