From 00e2f98ec1ca195b90b756d1237213fd38efefc8 Mon Sep 17 00:00:00 2001
From: "gavin%gavinsharp.com"
 <gavin%gavinsharp.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 6 May 2008 21:39:06 +0000
Subject: [PATCH] Bug 423104: ship en-US spellcheck dictionary README,
 extracted text by gerv@mozilla.org and handerson@mozilla.com, patch is
 r=gerv, sr=mconnor, a=beltzner

git-svn-id: svn://10.0.0.236/trunk@251284 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/content/license.html          | 91 +++++++++++++++++-
 .../global/resources/content/license.html     | 92 ++++++++++++++++++-
 2 files changed, 181 insertions(+), 2 deletions(-)

diff --git a/mozilla/toolkit/content/license.html b/mozilla/toolkit/content/license.html
index 78dfdac1302..aee51deff3e 100644
--- a/mozilla/toolkit/content/license.html
+++ b/mozilla/toolkit/content/license.html
@@ -170,11 +170,12 @@
       <li><a href="about:license#jpnic">Japan Network Information Centre License</a></li>
       <li><a href="about:license#jep">Java Embedding Plugin License</a></li>
       <li><a href="about:license#jemalloc">jemalloc License</a></li>
-      <li><a href="about:license#openvision">OpenVision License</a></li>
       <li><a href="about:license#hunspell-lt">Lithuanian Spellchecking Dictionary</a></li>
+      <li><a href="about:license#openvision">OpenVision License</a></li>
       <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
       <li><a href="about:license#sparkle">Sparkle License</a></li>
       <li><a href="about:license#ucal">University of California License</a></li>      
+      <li><a href="about:license#hunspell-en-US">US English Spellchecking Dictionary</a></li>
     </ul>
     
     <ul>      
@@ -2091,6 +2092,94 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
+
+
+    <hr>
+
+    <h1><a name="hunspell-en-US"></a>US English Spellchecking Dictionary</h1>
+
+    <p class="correctme">This license applies to certain files in the directory
+      <span class="path">extensions/spellcheck/locales/en-US/hunspell/</span>. (This
+      code only ships in some localized versions of this product.)</p>
+
+<pre>
+Different parts of the US English dictionary (SCOWL) are subject to the following licenses as 
+shown below.  For additional details, sources, credits, and public domain references, see 
+<a href="http://mxr.mozilla.org/mozilla/source/extensions/spellcheck/locales/en-US/hunspell/README.txt?raw=1">README.txt</a>.
+The collective work of the Spell Checking Oriented Word Lists (SCOWL) is under the 
+following copyright:
+Copyright 2000-2007 by Kevin Atkinson
+Permission to use, copy, modify, distribute and sell these word lists, the associated scripts, 
+the output created from the scripts, and its documentation for any purpose is hereby 
+granted without fee, provided that the above copyright notice appears in all copies and that 
+both that copyright notice and this permission notice appear in supporting documentation. 
+Kevin Atkinson makes no representations about the suitability of this array for any 
+purpose. It is provided  "as is" without express or implied warranty.
+The WordNet database is under the following copyright:
+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 1.6 Copyright 1997 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.
+
+The "UK Advanced Cryptics Dictionary" is under the following copyright:
+Copyright (c) J Ross Beresford 1993-1999. All Rights Reserved.
+The following restriction is placed on the use of this publication: if The UK Advanced 
+Cryptics Dictionary is used in a software package or redistributed in any form, the 
+copyright notice must be prominently displayed and the text of this document must be 
+included verbatim.   There are no other restrictions: I would like to see the list distributed 
+as widely as possible.
+
+Various parts are under the Ispell copyright:
+Copyright 1993, Geoff Kuenning, Granada Hills, CA
+ All rights reserved.   Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+  1. Redistributions of source code must retain the above copyright notice, this list of 
+conditions and the following disclaimer.
+  2. 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.
+  3. All modifications to the source code must be clearly marked as such.  Binary 
+redistributions based on modified source code must be clearly marked as modified 
+versions in the documentation and/or other materials provided with the distribution.
+  (clause 4 removed with permission from Geoff Kuenning)
+  5. The name of Geoff Kuenning may not be used to endorse or promote products derived 
+from this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING 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 GEOFF KUENNING 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.
+
+Additional Contributors:
+ Alan Beale &lt;biljir@pobox.com&gt;
+ M Cooper &lt;thegrendel@theriver.com&gt;
+</pre>
+
+
+
     <hr>
 
     <h1><a name="expat"></a>Expat License</h1>
diff --git a/mozilla/xpfe/global/resources/content/license.html b/mozilla/xpfe/global/resources/content/license.html
index 0556fdbb3f8..9b41ffbbf0d 100755
--- a/mozilla/xpfe/global/resources/content/license.html
+++ b/mozilla/xpfe/global/resources/content/license.html
@@ -172,11 +172,12 @@
       <li><a href="about:license#jpnic">Japan Network Information Centre License</a></li>
       <li><a href="about:license#jep">Java Embedding Plugin License</a></li>
       <li><a href="about:license#jemalloc">jemalloc License</a></li>
-      <li><a href="about:license#openvision">OpenVision License</a></li>
       <li><a href="about:license#hunspell-lt">Lithuanian Spellchecking Dictionary</a></li>
+      <li><a href="about:license#openvision">OpenVision License</a></li>
       <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
       <li><a href="about:license#sparkle">Sparkle License</a></li>
       <li><a href="about:license#ucal">University of California License</a></li>      
+      <li><a href="about:license#hunspell-en-US">US English Spellchecking Dictionary</a></li>
     </ul>
     
     <ul>      
@@ -1901,6 +1902,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
+
     <hr>
 
     <h1><a name="breakpad"></a>Breakpad License</h1>
@@ -2071,6 +2073,94 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
+
+
+    <hr>
+
+    <h1><a name="hunspell-en-US"></a>US English Spellchecking Dictionary</h1>
+
+    <p class="correctme">This license applies to certain files in the directory
+      <span class="path">extensions/spellcheck/locales/en-US/hunspell/</span>. (This
+      code only ships in some localized versions of this product.)</p>
+
+<pre>
+Different parts of the US English dictionary (SCOWL) are subject to the following licenses as 
+shown below.  For additional details, sources, credits, and public domain references, see 
+<a href="http://mxr.mozilla.org/mozilla/source/extensions/spellcheck/locales/en-US/hunspell/README.txt?raw=1">README.txt</a>.
+The collective work of the Spell Checking Oriented Word Lists (SCOWL) is under the 
+following copyright:
+Copyright 2000-2007 by Kevin Atkinson
+Permission to use, copy, modify, distribute and sell these word lists, the associated scripts, 
+the output created from the scripts, and its documentation for any purpose is hereby 
+granted without fee, provided that the above copyright notice appears in all copies and that 
+both that copyright notice and this permission notice appear in supporting documentation. 
+Kevin Atkinson makes no representations about the suitability of this array for any 
+purpose. It is provided  "as is" without express or implied warranty.
+The WordNet database is under the following copyright:
+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 1.6 Copyright 1997 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.
+
+The "UK Advanced Cryptics Dictionary" is under the following copyright:
+Copyright (c) J Ross Beresford 1993-1999. All Rights Reserved.
+The following restriction is placed on the use of this publication: if The UK Advanced 
+Cryptics Dictionary is used in a software package or redistributed in any form, the 
+copyright notice must be prominently displayed and the text of this document must be 
+included verbatim.   There are no other restrictions: I would like to see the list distributed 
+as widely as possible.
+
+Various parts are under the Ispell copyright:
+Copyright 1993, Geoff Kuenning, Granada Hills, CA
+ All rights reserved.   Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+  1. Redistributions of source code must retain the above copyright notice, this list of 
+conditions and the following disclaimer.
+  2. 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.
+  3. All modifications to the source code must be clearly marked as such.  Binary 
+redistributions based on modified source code must be clearly marked as modified 
+versions in the documentation and/or other materials provided with the distribution.
+  (clause 4 removed with permission from Geoff Kuenning)
+  5. The name of Geoff Kuenning may not be used to endorse or promote products derived 
+from this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING 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 GEOFF KUENNING 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.
+
+Additional Contributors:
+ Alan Beale &lt;biljir@pobox.com&gt;
+ M Cooper &lt;thegrendel@theriver.com&gt;
+</pre>
+
+
+
     <hr>
 
     <h1><a name="expat"></a>Expat License</h1>