diff options
| author | Martin Lucina <mato@kotelna.sk> | 2010-09-04 16:01:31 +0200 |
|---|---|---|
| committer | Martin Lucina <mato@kotelna.sk> | 2010-09-04 16:01:31 +0200 |
| commit | 2673a84e07b93b8607958516c55341c2eb220a6e (patch) | |
| tree | f92a010ef03d459b8c3087efd5a629d8a99a9af1 /doc/Makefile.am | |
| parent | 0a1f7e3524338690551c04ebfccd896a0b96f399 (diff) | |
| parent | ee3444ff93888a052cd1ba48aa22892f7077a7a0 (diff) | |
Merge branch 'maint'
* maint:
doc: Update zmq_socket(3) for 2.0.8 API changes
Revert "Added man page for the zmq_device method"
Revert "Added clean target that deletes generated man pages"
Revert "Various changes to documentation project:"
Revert "Reverting 'clean' change to Makefile"
Revert "Removed empty man pages for old standalone devices"
Revert "Further cleanups on reference manual"
Revert "Small improvements to zmq_device(3) page"
Revert "Removed wip zmq_deviced from master"
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 05cb3dc..ba2b64a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,10 +1,9 @@ -MAN1 = +MAN1 = zmq_forwarder.1 zmq_streamer.1 zmq_queue.1 MAN3 = zmq_bind.3 zmq_close.3 zmq_connect.3 zmq_init.3 \ zmq_msg_close.3 zmq_msg_copy.3 zmq_msg_data.3 zmq_msg_init.3 \ zmq_msg_init_data.3 zmq_msg_init_size.3 zmq_msg_move.3 zmq_msg_size.3 \ zmq_poll.3 zmq_recv.3 zmq_send.3 zmq_setsockopt.3 zmq_socket.3 \ - zmq_strerror.3 zmq_term.3 zmq_version.3 zmq_getsockopt.3 zmq_errno.3 \ - zmq_device.3 + zmq_strerror.3 zmq_term.3 zmq_version.3 zmq_getsockopt.3 zmq_errno.3 MAN7 = zmq.7 zmq_tcp.7 zmq_pgm.7 zmq_epgm.7 zmq_inproc.7 zmq_ipc.7 \ zmq_cpp.7 MAN_DOC = $(MAN1) $(MAN3) $(MAN7) |