Fix output module enumeration + code cleanup.

[sigrok-cli.git] / README

diff --git a/README b/README
index d5c2422d6e7e532a8c45f62f139592fa9468aad7..3cb073191f3c7c8d25a1528dad1f9a600c150af5 100644 (file)
--- a/README
+++ b/README
@@ -28,8 +28,8 @@ Requirements
  - libtool
  - pkg-config >= 0.22
  - libglib >= 2.28.0
- - libsigrok >= 0.2.0
- - libsigrokdecode >= 0.1.0
+ - libsigrok >= 0.3.0
+ - libsigrokdecode >= 0.3.0
 
 
 Building and installing
@@ -47,21 +47,28 @@ For installing sigrok-cli:
 
  $ make install
 
-Please see the following wiki pages for more detailed instructions:
+See INSTALL or the following wiki page for more (OS-specific) instructions:
 
- http://sigrok.org/wiki/Linux
- http://sigrok.org/wiki/Mac_OS_X
- http://sigrok.org/wiki/Windows
- http://sigrok.org/wiki/FreeBSD
+ http://sigrok.org/wiki/Building
 
 
-Mailing lists
--------------
+Copyright and license
+---------------------
 
-There are two mailing lists for sigrok/sigrok-cli:
+sigrok-cli is licensed under the terms of the GNU General Public License
+(GPL), version 3 or later.
+
+While some individual source code files are licensed under the GPLv2+, and
+some files are licensed under the GPLv3+, this doesn't change the fact that
+the program as a whole is licensed under the terms of the GPLv3+.
+
+Please see the individual source files for the full list of copyright holders.
+
+
+Mailing list
+------------
 
  https://lists.sourceforge.net/lists/listinfo/sigrok-devel
- https://lists.sourceforge.net/lists/listinfo/sigrok-commits
 
 
 IRC