From c6f8093bfb79fd3b11976f30c362bb5160d3e0bf Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Tue, 29 Apr 2014 12:06:57 +0200 Subject: [PATCH] Added zmq_ctx_shutdown to Makefile - also removed deprecated man pages from Makefile - they remain in repository for reference --- doc/Makefile.am | 6 +++--- doc/zmq.txt | 10 +--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index b139b2ca..dd4e014b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ MAN3 = zmq_bind.3 zmq_unbind.3 zmq_connect.3 zmq_disconnect.3 zmq_close.3 \ - zmq_ctx_new.3 zmq_ctx_term.3 zmq_ctx_destroy.3 zmq_ctx_get.3 zmq_ctx_set.3 \ + zmq_ctx_new.3 zmq_ctx_term.3 zmq_ctx_get.3 zmq_ctx_set.3 zmq_ctx_shutdown.3 \ zmq_msg_init.3 zmq_msg_init_data.3 zmq_msg_init_size.3 \ zmq_msg_move.3 zmq_msg_copy.3 zmq_msg_size.3 zmq_msg_data.3 zmq_msg_close.3 \ zmq_msg_send.3 zmq_msg_recv.3 \ @@ -8,8 +8,8 @@ MAN3 = zmq_bind.3 zmq_unbind.3 zmq_connect.3 zmq_disconnect.3 zmq_close.3 \ zmq_getsockopt.3 zmq_setsockopt.3 \ zmq_socket.3 zmq_socket_monitor.3 zmq_poll.3 \ zmq_errno.3 zmq_strerror.3 zmq_version.3 \ - zmq_sendmsg.3 zmq_recvmsg.3 zmq_init.3 zmq_term.3 \ - zmq_proxy.3 zmq_proxy_steerable.3 \ + zmq_sendmsg.3 zmq_recvmsg.3 \ + zmq_proxy.3 zmq_proxy_steerable.3 \ zmq_z85_encode.3 zmq_z85_decode.3 zmq_curve_keypair.3 MAN7 = zmq.7 zmq_tcp.7 zmq_pgm.7 zmq_epgm.7 zmq_inproc.7 zmq_ipc.7 \ diff --git a/doc/zmq.txt b/doc/zmq.txt index 7dd17c14..fbed9ed3 100644 --- a/doc/zmq.txt +++ b/doc/zmq.txt @@ -42,17 +42,9 @@ Work with context properties:: linkzmq:zmq_ctx_get[3] Destroy a 0MQ context:: + linkzmq:zmq_ctx_shutdown[3] linkzmq:zmq_ctx_term[3] -These deprecated functions let you create and destroy 'contexts': - -Initialise 0MQ context:: - linkzmq:zmq_init[3] - -Terminate 0MQ context:: - linkzmq:zmq_term[3] - - Thread safety ^^^^^^^^^^^^^ A 0MQ 'context' is thread safe and may be shared among as many application