2 files changed, 39 insertions(+), 36 deletions(-)

M README.rdoc
M wordnet-defaultdb/README.rdoc
M README.rdoc +2 -2
@@ 1,6 1,6 @@ 
 = Ruby-WordNet
 
-* http://deveiate.org/projects/Ruby-WordNet
+* https://bitbucket.org/ged/ruby-wordnet/
 
 == Description
 

          
@@ 72,7 72,7 @@ for at minimum VerbNet, FrameNet, and Pr
 
 == License
 
-Copyright (c) 2002-2017, The FaerieMUD Consortium
+Copyright (c) 2002-2017, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

          
M wordnet-defaultdb/README.rdoc +37 -34
@@ 1,15 1,15 @@ 
 = wordnet_defaultdb
 
-* http://deveiate.org/projects/Ruby-WordNet/wiki/Databases
+* https://bitbucket.org/ged/ruby-wordnet/
 
 
 == Description
 
-This gem is a container for the default WordNetSQL database files loaded by 
-the 'wordnet' gem if you don't have your own installation of the WordNet 
+This gem is a container for the default SQLUNet database files loaded by
+the 'wordnet' gem if you don't have your own installation of the WordNet
 databases. It's mostly just a wrapper around the Sqlite database from:
 
-  http://sourceforge.net/projects/wnsql/
+  http://sqlunet.sourceforge.net/
 
 To use it, just install the gem and then create the WordNet::Lexicon with
 no arguments.

          
@@ 22,34 22,37 @@ no arguments.
 
 == License
 
-WordNet Release 3.0
+This uses the output generated from the SQLUNet project from copyrighted data
+distributed under various other licenses. You can find the licenses of the
+original projects in the various LICENSE-*.txt files included with the
+distribution.
+
+The Ruby code included as part of this distribution is:
+
+Copyright (c) 2017, Michael Granger
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
 
-This software and database is being provided to you, the LICENSEE, by  
-Princeton University under the following license.  By obtaining, using  
-and/or copying this software and database, you agree that you have  
-read, understood, and will comply with these terms and conditions.:  
-  
-Permission to use, copy, modify and distribute this software and  
-database and its documentation for any purpose and without fee or  
-royalty is hereby granted, provided that you agree to comply with  
-the following copyright notice and statements, including the disclaimer,  
-and that the same appear on ALL copies of the software, database and  
-documentation, including modifications that you make for internal  
-use or for distribution.  
-  
-WordNet 3.0 Copyright 2006 by Princeton University.  All rights reserved.  
-  
-THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON  
-UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR  
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON  
-UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT-  
-ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE  
-OF THE LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT  
-INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR  
-OTHER RIGHTS.  
-  
-The name of Princeton University or Princeton may not be used in  
-advertising or publicity pertaining to distribution of the software  
-and/or database.  Title to copyright in this software, database and  
-any associated documentation shall at all times remain with  
-Princeton University and LICENSEE agrees to preserve same.  
+* 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.
+
+* Neither the name of the author/s, nor the names of the project's
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+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 OWNER 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.