aboutsummaryrefslogtreecommitdiffhomepage
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
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
-rw-r--r--COPYRIGHT11
-rw-r--r--README2
-rw-r--r--data/v1/sisu_markup_samples/README1
3 files changed, 12 insertions, 2 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
diff --git a/README b/README
index ce4a01c..479abf7 100644
--- a/README
+++ b/README
@@ -17,5 +17,5 @@ author or original publisher's license, and the substantive texts of the
document is to be kept un-altered, which falls outside the debian free software
guidelines
-(c) this package would be placed in /usr/share/doc/sisu/sisu_markup_samples as
+(c) this package would be placed in /usr/share/doc/sisu-markup-samples as
reference material on how to markup documents
diff --git a/data/v1/sisu_markup_samples/README b/data/v1/sisu_markup_samples/README
index 90349f2..7645701 100644
--- a/data/v1/sisu_markup_samples/README
+++ b/data/v1/sisu_markup_samples/README
@@ -9,7 +9,6 @@ Software Guideline license compatible:
Text: Free as in Freedom - Richard Stallman's Crusade for Free Software
URL: <http://faifzilla.org/>
Author: Sam Williams
- URL: <>
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