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/zmq_pgm.txt | |
| 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/zmq_pgm.txt')
| -rw-r--r-- | doc/zmq_pgm.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/zmq_pgm.txt b/doc/zmq_pgm.txt index abc943e..4017db2 100644 --- a/doc/zmq_pgm.txt +++ b/doc/zmq_pgm.txt @@ -55,7 +55,7 @@ and a port number. An 'interface' may be specified by either of the following: * The interface name as defined by the operating system. -* The primary IPv4 address assigned to the interface, in its numeric +* The primary IPv4 address assigned to the interface, in it's numeric representation. NOTE: Interface names are not standardised in any way and should be assumed to @@ -63,7 +63,7 @@ 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'. -A 'multicast address' is specified by an IPv4 multicast address in its numeric +A 'multicast address' is specified by an IPv4 multicast address in it's numeric representation. @@ -151,4 +151,7 @@ linkzmq:zmq_ipc[7] linkzmq:zmq_inproc[7] linkzmq:zmq[7] - +AUTHORS +------- +The 0MQ documentation was written by Martin Sustrik <sustrik@250bpm.com> and +Martin Lucina <mato@kotelna.sk>. |