update to plain zlib license

2 files changed, 22 insertions, 18 deletions

diff --git a/COPYING b/COPYING
index 8f2dc71..8d93017 100644
--- a/COPYING
+++ b/COPYING
@@ -1,24 +1,22 @@
-/*
-Copyright (c) 1991, 1999, 2001-2003, 2014, 2015 Byron Rakitzis
+/* rc -- the Plan 9 shell, reimplemented for Unix
 
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
+  Copyright (c) 1991, 1999, 2001-2003, 2014, 2015 Byron Rakitzis
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
 
-1. The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software
-in a product, an acknowledgment (see the following) in the product
-documentation is required.
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
 
-  Portions Copyright (c) 1991, 1999, 2001-2003, 2014, 2015 Byron Rakitzis
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
 
-2. Altered source versions must be plainly marked as such, and must not
-be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
+  Byron Rakitzis <byron@rakitzis.com>
 */
diff --git a/ChangeLog b/ChangeLog
index f1066c5..a7106dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -890,3 +890,9 @@ Changes since rc-1.5b2
 2015-04-20
 
   Release: rc-1.7.3.
+
+2015-05-12
+
+  Licensing: due to GPL compatibility concerns, the license is changed
+  again to the "zlib" license. (N.B. This license change was agreed and
+  approved by Byron Rakitzis, who is the copyright holder.)