Update release notes and docs for 2.2 release

[weather.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index 1f63def..1b789fb 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,22 +1,40 @@
-Copyright (c) 2006 Jeremy Stanley <fungi@yuggoth.org>, all rights reserved.
+=================
+ Weather License
+=================
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+The weather project employs the ISC license, a permissive free software
+license written by the Internet Systems Consortium and functionally
+equivalent to the 2-clause BSD license. Initially used for the ISC's own
+software releases, it has since become the preferred license of many
+other projects.
 
-   - Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   - Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
+The correlation data provided is augmented by manual research but built
+primarily by aggregating sources within the USA Public Domain (U.S.
+Census Bureau Gazetteer and publications of the National Oceanic and
+Atmospheric Administration's National Climatic Data Center and National
+Weather Service including its National Centers for Environmental
+Prediction and Office of Science and Technology/Systems Engineering
+Center Geographic Information Systems Map Group). Copies of the original
+external data sources have been provided with this software for
+reference, but are not covered by the copyright or permission notices
+which follow.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright Notice
+----------------
+Copyright (c) 2006-2012 Jeremy Stanley <fungi@yuggoth.org>
 
+Permission Notice
+-----------------
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+Disclaimer
+----------
+The software is provided "as is" and the author disclaims all warranties
+with regard to this software including all implied warranties of
+merchantability and fitness. In no event shall the author be liable for
+any special, direct, indirect, or consequential damages or any damages
+whatsoever resulting from loss of use, data or profits, whether in an
+action of contract, negligence or other tortious action, arising out of
+or in connection with the use or performance of this software.