diff options
| author | lloyd <[email protected]> | 2008-12-14 23:20:53 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-12-14 23:20:53 +0000 |
| commit | 338895f290ab5d197da596836ecc03625f9091f3 (patch) | |
| tree | 46dee40df07331332ce3b18755f8c6dac4eff1c9 /doc | |
| parent | 05134b3f0a8589410e09c463a9866a8b40e5c3e9 (diff) | |
Relicense api.tex from the Creative Commons Attribution-Share Alike license
to the regular BSD license Botan is distributed under. Seems silly to have
the one single file under a different (and more restrictive) license than
everything else.
As I am the only copyright holder I believe it is within my rights to do
this. The only other contributor to api.tex I can think of is Ken Perano
of Sandia Labs, who sent me several patches to api.tex that fixed minor
grammatical issues, but which (AFAIK (IANAL)) were too small/trivial
to be copyrightable.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api.tex | 6 | ||||
| -rw-r--r-- | doc/log.txt | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/doc/api.tex b/doc/api.tex index fce676c7d..c1469418a 100644 --- a/doc/api.tex +++ b/doc/api.tex @@ -3086,10 +3086,6 @@ Web Site: \url{http://botan.randombit.net} Copyright \copyright 2000-2008, Jack Lloyd -This work is licensed under the Creative Commons -Attribution-ShareAlike 2.5 License. To view a copy of this license, -visit \url{http://creativecommons.org/licenses/by-sa/2.5/} or send a -letter to Creative Commons, 543 Howard Street, 5th Floor, San -Francisco, California, 94105, USA. +Licensed under the same terms as the Botan source \end{document} diff --git a/doc/log.txt b/doc/log.txt index 6ea97a8d4..4882cde05 100644 --- a/doc/log.txt +++ b/doc/log.txt @@ -1,6 +1,7 @@ * 1.8.1-pre, 2009-??-?? - Fix memory leak in PKCS8 load_key and encrypt_key + - Relicense api.tex from CC-By-SA 2.5 to BSD * 1.8.0, 2008-12-08 - Fix compilation on Solaris with GCC |