aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-02-06 17:35:05 -0500
committerRalph Amissah <ralph@amissah.com>2010-02-06 17:35:05 -0500
commit14813fafe75d39c7c96cd3403d28d67a60d42b09 (patch)
tree738013a46d33ae03e1882bbd5a52f0aa932c9962 /COPYRIGHT
parentkeep sisu-markup-samples in own sample directory, separate from sisu samples (diff)
parentcopyright info, list of markup samples and their licenses (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT11
1 files changed, 11 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index bcbbd4d..68a6d6a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -53,6 +53,17 @@ The content of the documents follows the rights granted by the author or
original publisher, which is contained within the rights field in each
document. For your convenience a summary is included below:
+Text: Free as in Freedom - Richard Stallman's Crusade for Free Software
+ URL: <http://faifzilla.org/>
+Author: Sam Williams
+Copyright: Sam Williams 2002
+License: Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Document License, Version 1.1 or any
+ later version published by the Free Software Foundation; with the Invariant
+ Sections being no invariant sections, with the Front-Cover Texts being no
+ invariant sections, and with the Back-Cover Texts being no invariant sections
+ URL: <http://www.gnu.org/copyleft/fdl.html>
+
Text: Free Culture - How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity
URL: <http://www.free-culture.cc>
Author: Lawrence Lessig