licensing cleanup and slightly updated readme.

diff --git a/license.txt b/license.txt
index 8c9c309be27fdc3e634a1486d557a8ae514585ed..7b92f8357b687ace2bfff99892a0de4673cbe2df 100644 (file)
--- a/license.txt
+++ b/license.txt
@@ -1,13 +1,29 @@
 
+====
 All of the code in this collection is...
-
   [Copyright (C) 1987-$now by Chris Koeritz et al]
-
 ...unless otherwise marked.
+====
 
-This software is distributed under the terms of the Free Software
-Foundation's General Public License.  A copy of this can be found at:
+====
+The majority of this source code is distributed under the terms of the Free
+Software Foundation's General Public License v3.0.  A copy of this license can
+be found at:
   http://www.gnu.org/licenses/gpl.html
+====
+
+====
+Some of this source code is distributed under the Apache License v2.0.  A copy
+of this license can be found at:
+  http://www.apache.org/licenses/LICENSE-2.0
+====
+
+==> To determine which license is applicable, consult the individual source
+    code files in this collection.  If a file does not include a license,
+    then the default license is the GNU GPL v3.0.
+
+====
 The software has no warranty whatsoever; you are free to use it as needed,
 although we suggest peaceful purposes.
+====
 

diff --git a/readme.txt b/readme.txt
index 57c4bd1cfe0a9adc11693ae24fc8231d416fe375..fe0cc5c35bb4b70766036e28ba13f28dbcee5766 100644 (file)
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,12 @@
 
 This is the "feisty meow® concerns" codebase top folder.
 
+This software is licensed *per* *file* using either the GNU General Public
+License (GNU GPL) version 3 *or* the Apache Software License version 2.0.
+If a file does not have a license statement attached and it is part of the
+feisty meow® codebase (rather than attributed to some other author), then the
+default license is the GNU GPL.
+
 For information on building the source code, see the file "building.txt".
 
 ####