BSD license disambiguation

diff --git a/README b/README
index d56e5dc37c680cc07af4fe874d2e1d7afb3bb988..4aad1d0890ab9a4d1ab703968a9ae79c78278eb2 100644 (file)
--- a/README
+++ b/README
@@ -1,3 +1,5 @@
 
 For documentation, please see the docs directory.
 
+Alternatively, visit http://f-droid.org/manual/
+

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 5a7fb5bd0012fc1c4cd11c0bfd6ab77d700a60e0..3a328cd4547010ae1eaaca413aab4df3b6d8d9c6 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -484,7 +484,11 @@ MIT X11 license
 
 @item
 @samp{BSD}
-BSD license. Some disambiguation is needed here, regarding original versions modfied versions of this license.
+BSD license - the original '4-clause' version.
+
+@item
+@samp{NewBSD}
+BSD license - the new, or modified, version.
 
 @end itemize
 
@@ -966,7 +970,7 @@ Integrating the build server setup into the main scripts is a work in progress.
 Some things may not work properly yet. Talk to CiaranG if you're trying to use
 this and have problems.
 
-In addition to the basic setup sets previously described, you will also need
+In addition to the basic setup previously described, you will also need
 a Vagrant-compatible Debian Squeeze base box called 'debian6-32'. You can
 create one of these for yourself from standard Debian installation media, as
 the specification for what's required to be Vagrant-compatible is very well

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 29884e1bdf61a7c67602b25013b36032dc398728..0ef5df59ab46f6535660c7f36c439d9a1b00bd61 100644 (file)
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -120,8 +120,10 @@ class FDroid
            switch($license) {
                    case 'MIT':
                        return 'http://www.gnu.org/licenses/license-list.html#X11License';
-                   case 'BSD':
+                   case 'NewBSD':
                        return 'http://www.gnu.org/licenses/license-list.html#ModifiedBSD';
+                   case 'BSD':
+                       return 'http://www.gnu.org/licenses/license-list.html#OriginalBSD';
                    case 'GPLv3':
                    case 'GPLv3+':
                        return 'http://www.gnu.org/licenses/license-list.html#GNUGPL';