From 0de046c13bd7c8ab3cac7bb123a8bfbfbe4d1f8e Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 28 Feb 2014 21:43:07 -0600 Subject: [PATCH] Update WordNet links, license, and copyright acknowledgement. This resolves bug report 1936. --- doc/kword/editing.docbook | 2 +- doc/thesaurus/index.docbook | 18 ++++++----- tools/thesaurus/extract.pl | 59 ++++++++++++++++++------------------- tools/thesaurus/main.cc | 13 ++++---- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/doc/kword/editing.docbook b/doc/kword/editing.docbook index fc8e5c522..87b66342e 100644 --- a/doc/kword/editing.docbook +++ b/doc/kword/editing.docbook @@ -1301,7 +1301,7 @@ from the menubar you can toggle autospellchecking on and off. related words &kword; comes with a small thesaurus based on the Wordnet project. For more information on Wordnet, visit the -Wordnet homepage. +Wordnet homepage. You can invoke the thesaurus two ways: diff --git a/doc/thesaurus/index.docbook b/doc/thesaurus/index.docbook index 87c137cb3..e601fcc64 100644 --- a/doc/thesaurus/index.docbook +++ b/doc/thesaurus/index.docbook @@ -49,7 +49,6 @@ English language is supported. - The Thesaurus Tab @@ -100,7 +99,6 @@ to the &wordnet; project, but to &tde;. - Using languages besides English @@ -112,12 +110,12 @@ are available. - The &wordnet; tab The &wordnet; tab provides a user interface -to a local installation of &wordnet; 1.7. +to a local installation of +&wordnet;. &wordnet; is an online lexical reference system whose design is inspired by current psycholinguistic theories of human lexical memory. The &kthesaurus; user interface offers nearly all options @@ -125,12 +123,12 @@ which are available on the command line. It calls the wn bina which has to be in your PATH. To learn more about &wordnet;, please see the &wordnet; man pages -or have a look at the &wordnet; homepage. +or have a look at the +&wordnet; homepage. - Copyright and Licensing @@ -138,13 +136,17 @@ or have a look at the &wordnet &kthesaurus; and this documentation is copyrighted by Daniel Naber. + + +&wordnet; 3.0 Copyright 2006 by Princeton University. All rights reserved. + + &underFDL; &underGPL; - -&documentation.index; +&documentation.index; diff --git a/tools/thesaurus/extract.pl b/tools/thesaurus/extract.pl index 7bf565c33..b5cfe5d64 100755 --- a/tools/thesaurus/extract.pl +++ b/tools/thesaurus/extract.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # $Id: extract.pl 490579 2005-12-22 12:32:17Z scripty $ -# This file is part of the KDE project +# This file is part of the TDE project # Copyright (C) 2001 Daniel Naber # This program is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ # Extract information from WordNet data files - only useful for development. # cat together all of WordNet's data.* files and call this script. As a second # argument you can use a word frequency list as "Alphabetical frequency list of -# the whole corpus (lemmatized)" on http://www.comp.lancs.ac.uk/ucrel/bncfreq/flists.html +# the whole corpus (lemmatized)" on http://ucrel.lancs.ac.uk/bncfreq/flists.html # This will remove all words whcih are not in the list, i.e. words that are rare. # # Output of this script is: @@ -93,35 +93,32 @@ sub prg() close(IN); print <<__EOF; - 1 This software and database is being provided to you, the LICENSEE, by - 2 Princeton University under the following license. By obtaining, using - 3 and/or copying this software and database, you agree that you have - 4 read, understood, and will comply with these terms and conditions.: - 5 - 6 Permission to use, copy, modify and distribute this software and - 7 database and its documentation for any purpose and without fee or - 8 royalty is hereby granted, provided that you agree to comply with - 9 the following copyright notice and statements, including the disclaimer, - 10 and that the same appear on ALL copies of the software, database and - 11 documentation, including modifications that you make for internal - 12 use or for distribution. - 13 - 14 WordNet 1.7 Copyright 2001 by Princeton University. All rights reserved. - 15 - 16 THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON - 17 UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR - 18 IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON - 19 UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- - 20 ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE - 21 OF THE LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT - 22 INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR - 23 OTHER RIGHTS. - 24 - 25 The name of Princeton University or Princeton may not be used in - 26 advertising or publicity pertaining to distribution of the software - 28 and/or database. Title to copyright in this software, database and - 29 any associated documentation shall at all times remain with - 30 Princeton University and LICENSEE agrees to preserve same. + 1 This software and database is being provided to you, the LICENSEE, + 2 Princeton University under the following license. By obtaining, using + 2 and/or copying this software and database, you agree that you have read, + 3 understood, and will comply with these terms and conditions.: + 4 + 5 Permission to use, copy, modify and distribute this software and database + 6 and its documentation for any purpose and without fee or royalty is hereby + 7 granted, provided that you agree to comply with the following copyright + 8 notice and statements, including the disclaimer, and that the same appear + 9 on ALL copies of the software, database and documentation, including + 10 modifications that youmake for internal use or for distribution. + 11 + 12 WordNet 3.0 Copyright 2006 by Princeton University. All rights reserved. + 13 + 14 THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON UNIVERSITY + 15 MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF + 16 EXAMPLE, BUT NOT LIMITATION, PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS + 17 OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE + 18 OR THAT THE USE OF THE LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL + 19 NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. + 20 + 21 The name of Princeton University or Princeton may not be used in advertising + 22 or publicity pertaining to distribution of the software and/or database. + 23 Title to copyright in this software, database and any associated documentation + 24 shall at all times remain with Princeton University and LICENSEE agrees to + 25 preserve same. __EOF # for each synset, find its hypernyms: open(IN, "<$filename") || die "Cannot open '$filename': $!"; diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc index 6ca3f73f3..57b1d7790 100644 --- a/tools/thesaurus/main.cc +++ b/tools/thesaurus/main.cc @@ -629,12 +629,13 @@ void Thesaurus::findTermWordnet(const TQString &term) } if( !m_wnproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) { - m_resultbox->setText(i18n("Error: Failed to execute WordNet program 'wn'. " - "WordNet has to be installed on your computer if you want to use it, " - "and 'wn' has to be in your PATH. " - "You can get WordNet at " - "http://www.cogsci.princeton.edu/~wn/. Note that WordNet only supports " - "the English language.")); + m_resultbox->setText(i18n("Error: Failed to execute the WordNet program 'wn'. " + "WordNet has to be installed on your computer to use this component of kthesaurus, " + "and 'wn' has to be available in your $PATH environment variable. " + "Look for a WordNet package from your upstream distro package repository. " + "Or you can obtain WordNet at " + "http://wordnet.princeton.edu/wordnet/download/current-version/. " + "Notice that WordNet only supports the English language.")); m_combobox->setEnabled(false); TQApplication::restoreOverrideCursor(); return;