Updates to the copyright.html page to address concerns some users have

SQLite have about copyright issues.  A links to the wikipedia article
on public domain and a public domain icon. (CVS 3679)

FossilOrigin-Name: 6ce39f30063bbee3271a428f284235b0a84b9229

diff --git a/art/nocopy.gif b/art/nocopy.gif
new file mode 100644 (file)
index 0000000..cc4a59c
Binary files /dev/null and b/art/nocopy.gif differ

diff --git a/manifest b/manifest
index 1ccd685b284a2168858ba93b2f844c2ccfab8992..1336dc1bb74ee4d6e07dcc82ccdd24ca28df4ab5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sextra\sheading\saccidentally\sadded\sto\slang.tcl\sby\s(3677).\s(CVS\s3678)
-D 2007-03-09T14:43:25
+C Updates\sto\sthe\scopyright.html\spage\sto\saddress\sconcerns\ssome\susers\shave\nSQLite\shave\sabout\scopyright\sissues.\s\sA\slinks\sto\sthe\swikipedia\sarticle\non\spublic\sdomain\sand\sa\spublic\sdomain\sicon.\s(CVS\s3679)
+D 2007-03-10T13:47:01
 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -10,6 +10,7 @@ F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
 F art/SQLite.eps 9b43cc99cfd2be687d386faea6862ea68d6a72b2
 F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b
 F art/SQLiteLogo3.tiff b9e6bf022ae939bc986cddb8ab99583ca1b02cb3
+F art/nocopy.gif 716aa07d4bb7250d4e75756073bf8ef9f56bec8f
 F config.guess dba2d1300ec8f8cd00c6fb44b9edde21c14e960c
 F config.sub 9a842e7c332ed65cef3f2c20354e06dc998b2796
 F configure ab703ac4004675e630857a92d1ef5bd40cf8fad0 x
@@ -393,12 +394,12 @@ F www/c_interface.tcl b51b08591554c16a0c3ef718364a508ac25abc7e
 F www/capi3.tcl 7a7cc225fe02eb7ab861a6019b08baa0014409e1
 F www/capi3ref.tcl 4e0df9c41ebc669a7d7e9b81b410d1f907d20e78
 F www/changes.tcl dba0e1f40192f79c7a887fa3efa56e6fdd54f85a
-F www/common.tcl c24da36fe05f72b44f84dba08e020f924a605eac
+F www/common.tcl 2b793e5c31486c8a01dd27dc0a631ad93704438e
 F www/compile.tcl 276546d7eb445add5a867193bbd80f6919a6b084
 F www/conflict.tcl cdd0f4b59b0ba6d61f67e6a38f3ae45853bacb30
 F www/copyright-release.html 294e011760c439c44951a6bfecd4c81a1ae359e8
 F www/copyright-release.pdf cfca3558fc97095e57c6117d08f1f5b80d95125a
-F www/copyright.tcl 58b9586cac0d5914387cfc170bfd80f999dde469
+F www/copyright.tcl 38bf3248ddec394fbb2327cd8f62d45fe130632d
 F www/datatype3.tcl eca9badcfe2a898d64ebda88e804eb6ac7c4626c
 F www/datatypes.tcl 7c786d2e8ff434346764534ec015966d17efce60
 F www/different.tcl 8b76ae88bf73e38097b7936e198df4f89baf587c
@@ -435,7 +436,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 485c52ddc0f3c24f624825904cea3566f83f0e68
-R de462052d6c0a8132c7bafb857bd1ab8
-U danielk1977
-Z d0eb621ba2fe935e1d480543f6582333
+P 570533c1ef4640670227481cf72b782d320a65ba
+R a4cad54b75eacd0bcdf064f417d955e4
+U drh
+Z cac8e2e33e4728fc4ecfcc0eac6ef804

diff --git a/manifest.uuid b/manifest.uuid
index e82317ba08052b41cd06a22cd91668acb2e08dec..dc96cea0c16099d532390d02ea8e8d3ee38cfd68 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-570533c1ef4640670227481cf72b782d320a65ba
\ No newline at end of file
+6ce39f30063bbee3271a428f284235b0a84b9229
\ No newline at end of file

diff --git a/www/common.tcl b/www/common.tcl
index b5d490c51494184b1df466f1546fbeb8570bdca4..07129f803ff97d2051b18de7fefb874e5abbf93e 100644 (file)
--- a/www/common.tcl
+++ b/www/common.tcl
@@ -26,7 +26,7 @@ proc header {txt} {
 <li><a href="download.html">download</a></li>
 <li><a href="faq.html">faq</a></li>
 <li><a href="index.html">home</a></li>
-<li><a href="support.html">mailing&nbsp;list</a></li>
+<li><a href="copyright.html">license</a></li>
 <li><a href="index.html">news</a></li>
 </ul>
 </td>

diff --git a/www/copyright.tcl b/www/copyright.tcl
index 1390ad9876736abf2968bbd161bee24bc16a4c61..e760a0d7ecc1675e4deb2274afb5378c3e9c1237 100644 (file)
--- a/www/copyright.tcl
+++ b/www/copyright.tcl
@@ -1,21 +1,75 @@
-set rcsid {$Id: copyright.tcl,v 1.2 2006/05/03 23:39:37 drh Exp $}
+set rcsid {$Id: copyright.tcl,v 1.3 2007/03/10 13:47:01 drh Exp $}
 source common.tcl
 header {SQLite Copyright}
 puts {
 <h2>SQLite Copyright</h2>
 
+<table align="right" vspace="0" hspace="10" border="1" cellpadding="20">
+<tr><td align="center">
+<img src="nocopy.gif"><br>
+SQLite is in the<br>
+<a href="http://en.wikipedia.org/wiki/Public_Domain">Public Domain</a>
+</td></tr>
+</table>
+
 <p>
-The original author of SQLite has dedicated the code to the public domain.
+All of the deliverable code in SQLite has been dedicated to the
+<a href="http://en.wikipedia.org/wiki/Public_Domain">public domain</a>
+by the authors.
+All code authors, and representatives of the companies they work for,
+have signed affidavits dedicating their contributions to
+the public domain and originals of
+those signed affidavits are stored in a firesafe at the main offices
+of <a href="http://www.hwaci.com">Hwaci</a>.
 Anyone is free to copy, modify, publish, use, compile, sell, or distribute
 the original SQLite code, either in source code form or as a compiled binary,
 for any purpose, commercial or non-commercial, and by any means.
 </p>
 
+<p>
+The previous paragraph applies to the deliverable code in SQLite - 
+those parts of the SQLite library that you actually bundle and
+ship with a larger application.  Portions of the documentation and
+some code used as part of the build process might fall under
+other licenses.  The details here are unclear.  We do not worry
+about the licensing of the documentation and build code so much
+because none of these things are part of the core deliverable
+SQLite library.
+</p>
+
+<p>
+All of the deliverable code in SQLite has been written from scratch.
+No code has been taken from other projects or from the open
+internet.  Every line of code can be traced back to its original
+author, and all of those authors have public domain dedications
+on file.  So the SQLite code base is clean and is
+uncontaminated with licensed code from other projects.
+</p>
+
+<h2>Obtaining A License To Use SQLite</h2>
+
+<p>
+If you are using SQLite in a jurisdiction that does not recognize
+the public domain, or if your legal department is uncomfortable with
+the concept of the public domain, you can purchase a license to use
+and distribute SQLite from <a href="http://www.hwaci.com/">Hwaci</a>,
+the company that employees the architect and principal developers
+of SQLite.  For additional information on how to purchase a license
+to use SQLite, please contact:
+</p>
+
+<blockquote>
+D. Richard Hipp <br />
+Hwaci - Applied Software Research <br />
+704.948.4565 <br />
+<a href="mailto:drh@hwaci.com">drh@hwaci.com</a>
+</blockquote>
+
 <h2>Contributed Code</h2>
 
 <p>
 In order to keep SQLite complete free and unencumbered by copyright,
-other contributors to the SQLite code base are asked to likewise dedicate
+all new contributors to the SQLite code base are asked dedicate
 their contributions to the public domain.
 If you want to send a patch or enhancement for possible inclusion in the
 SQLite source tree, please accompany the patch with the following statement:
@@ -30,8 +84,7 @@ perpetuity of all present and future rights this code under copyright law.
 </i></blockquote>
 
 <p>
-Regrettably, as of 2003 October 20,
-we will no longer be able to accept patches or changes to 
+We are not able to accept patches or changes to 
 SQLite that are not accompanied by a statement such as the above.
 In addition, if you make
 changes or enhancements as an employee, then a simple statement such as the
@@ -50,10 +103,7 @@ USA
 A template copyright release is available
 in <a href="copyright-release.pdf">PDF</a> or
 <a href="copyright-release.html">HTML</a>.
-You can use this release to make future changes.  If you have contributed
-changes or enhancements to SQLite in the past, and have not already done
-so, you are invited to complete and sign a copy of the template and mail
-it to the address above.
+You can use this release to make future changes. 
 </p>
 }
 footer $rcsid