aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-10-11 23:50:53 -0400
committerRalph Amissah <ralph@amissah.com>2010-10-11 23:50:53 -0400
commit9255360666532e04a6623fee402ce8c4a299432e (patch)
tree410cecac91a50cc72b0b50d42525bf1ad2363f7b
parentmarkup samples, adds text "For the Win" Cory Doctorow (diff)
COPYRIGHT and data/README updated
-rw-r--r--CHANGELOG2
-rw-r--r--COPYRIGHT16
-rw-r--r--data/README16
3 files changed, 34 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 36fd165..ab35180 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,8 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
* For the Win, Cory Doctorow markup sample added
+ * COPYRIGHT and data/README updated
+
* The Wealth of Networks, Yochai Benkler, missing image added/included, fix
%% sisu-markup-samples_2.0.6.orig.tar.gz (2010-08-24:34/2)
diff --git a/COPYRIGHT b/COPYRIGHT
index c007258..e0bb8fc 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -128,6 +128,14 @@ Copyright: Cory Doctorow, 2008
License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0
URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+Text: Down and Out in the Magic Kingdom
+ URL: <http://craphound.com/down>
+Author: Cory Doctorow
+ URL: <http://craphound.com>
+Copyright: Cory Doctorow, 2003
+License: Attribution-NonCommercial-ShareAlike (CC-BY-NC-SA) 1.0
+ URL: <http://creativecommons.org/licenses/by-nc-sa/1.0/>
+
Text: Little Brother
URL: <http://craphound.com/littlebrother>
Author: Cory Doctorow
@@ -136,6 +144,14 @@ Copyright: Cory Doctorow, 2008
License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0
URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+Text: For the Win
+ URL: <http://craphound.com/ftw>
+Author: Cory Doctorow
+ URL: <http://craphound.com>
+Copyright: Cory Doctorow, 2010
+License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0
+ URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+
Text: Accelerando
URL: <http://www.accelerando.org/>
Author: Charles Stross
diff --git a/data/README b/data/README
index b3ad64f..9749284 100644
--- a/data/README
+++ b/data/README
@@ -93,6 +93,14 @@ maintained and often that the works be used only non-commercially
License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0
URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+ Text: Down and Out in the Magic Kingdom
+ URL: <http://craphound.com/down>
+ Author: Cory Doctorow
+ URL: <http://craphound.com>
+ Copyright: Cory Doctorow, 2003
+ License: Attribution-NonCommercial-ShareAlike (CC-BY-NC-SA) 1.0
+ URL: <http://creativecommons.org/licenses/by-nc-sa/1.0/>
+
Text: Little Brother
URL: <http://craphound.com/littlebrother>
Author: Cory Doctorow
@@ -101,6 +109,14 @@ maintained and often that the works be used only non-commercially
License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0
URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+ Text: For the Win
+ URL: <http://craphound.com/ftw>
+ Author: Cory Doctorow
+ URL: <http://craphound.com>
+ Copyright: Cory Doctorow, 2010
+ License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0
+ URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
+
Text: Accelerando
URL: <http://www.accelerando.org/>
Author: Charles Stross