From 7515323295e9e6d5bca1706fb4d0050cd0828741 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Tue, 2 Jun 2015 23:46:05 +0200 Subject: [PATCH] Fixes to README --- README.md | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 89df7d2b..74d8ccfd 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,16 @@ # ZeroMQ -[![Build Status](https://travis-ci.org/zeromq/libzmq.png?branch=master)](https://travis-ci.org/zeromq/libzmq) +[![Build Status](https://travis-ci.org/zeromq/zeromq4-1.png?branch=master)](https://travis-ci.org/zeromq/zeromq4-1) ## Welcome -The 0MQ lightweight messaging kernel is a library which extends the +The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by -specialised messaging middleware products. 0MQ sockets provide an +specialised messaging middleware products. ZeroMQ sockets provide an abstraction of asynchronous message queues, multiple messaging patterns, message filtering (subscriptions), seamless access to multiple transport protocols and more. - ## Building and installation See the INSTALL file included with the distribution. @@ -19,7 +18,7 @@ See the INSTALL file included with the distribution. ## Resources Extensive documentation is provided with the distribution. Refer to -doc/zmq.html, or "man zmq" after you have installed 0MQ on your system. +doc/zmq.html, or "man zmq" after you have installed libzmq on your system. Website: http://www.zeromq.org/ @@ -28,11 +27,29 @@ Announcements mailing list: zeromq-announce@lists.zeromq.org Git repository: http://github.com/zeromq/libzmq -0MQ developers can also be found on the IRC channel #zeromq, on the +ZeroMQ developers can also be found on the IRC channel #zeromq, on the Freenode network (irc.freenode.net). -## Copying +## License -Free use of this software is granted under the terms of the GNU Lesser General -Public License (LGPL). For details see the files `COPYING` and `COPYING.LESSER` -included with the 0MQ distribution. +The project license is specified in COPYING and COPYING.LESSER. + +libzmq is free software; you can redistribute it and/or modify it under +the terms of the GNU Lesser General Public License (LGPL) as published +by the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +As a special exception, the Contributors give you permission to link +this library with independent modules to produce an executable, +regardless of the license terms of these independent modules, and to +copy and distribute the resulting executable under terms of your choice, +provided that you also meet, for each linked independent module, the +terms and conditions of the license of that module. An independent +module is a module which is not derived from or based on this library. +If you modify this library, you must extend this exception to your +version of the library. + +libzmq is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +License for more details.