From eddb4dc6198a8a4b7fd10947d12f6d5227e55b0d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 16 May 2013 21:44:02 -0400 Subject: COPYRIGHT, update location of files --- CHANGELOG | 1 + COPYRIGHT | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index afd9702..b440ec9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark * data/samples shared by sisu v4 & v5, v3 document markup branch closed * v3: close version 3 markup sample branch * v4: remove version 4 markup branch, have instead default samples branch + * COPYRIGHT update location of files * data/samples small fixes in text diff --git a/COPYRIGHT b/COPYRIGHT index 06a26b1..b0be592 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -23,14 +23,14 @@ Files: setup.rb Copyright: Minero Aoki License: LGPL-2.1 -Files: data/v[34]/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst +Files: data/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst Copyright: 2002, Sam Williams License: GFDL-NIV-1.1 NOTES: Free as in Freedom - Richard Stallman's Crusade for Free Software by Sam Williams -Files: data/v[34]/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst +Files: data/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst Copyright: 2002, Sam Williams 2010, Richard M. Stallman License: GFDL-NIV-1.3 @@ -39,7 +39,7 @@ NOTES: Free as in Freedom 2.0 - Richard Stallman and the Free Software Revolutio by Sam Williams, 2nd ed. revisions by Richard M. Stallman -Files: data/v[34]/samples/free_culture.lawrence_lessig.sst +Files: data/samples/free_culture.lawrence_lessig.sst Copyright: 2004, Lawrence Lessig License: CC-BY-NC-1.0 Attribution-Noncommercial @@ -47,7 +47,7 @@ NOTES: Free Culture - How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity by Lawrence Lessig -Files: data/v[34]/samples/the_wealth_of_networks.yochai_benkler.sst +Files: data/samples/the_wealth_of_networks.yochai_benkler.sst Copyright: 2006, Yochai Benkler License: CC-BY-NC-SA-2.5 Attribution-Noncommercial-Share Alike @@ -56,7 +56,7 @@ NOTES: The Wealth of Networks - How Social Production Transforms Markets and Freedom by Yochai Benkler -Files: data/v[34]/samples/viral_spiral.david_bollier.sst +Files: data/samples/viral_spiral.david_bollier.sst Copyright: 2008, David Bollier License: CC-BY-NC-3.0 Attribution-Noncommercial @@ -64,7 +64,7 @@ License: CC-BY-NC-3.0 NOTES: Viral Spiral by David Bollier -Files: data/v[34]/samples/democratizing_innovation.eric_von_hippel.sst +Files: data/samples/democratizing_innovation.eric_von_hippel.sst Copyright: 2005, Eric von Hippel License: CC-BY-NC-ND-2.0 Attribution-Noncommercial-No Derivative Works @@ -72,7 +72,7 @@ License: CC-BY-NC-ND-2.0 NOTES: Democratizing Innovation by Eric von Hippel -Files: data/v[34]/samples/two_bits.christopher_kelty.sst +Files: data/samples/two_bits.christopher_kelty.sst Copyright: 2008, Christopher Kelty 2008, Duke University Press License: CC-BY-NC-SA-3.0 @@ -81,7 +81,7 @@ License: CC-BY-NC-SA-3.0 NOTES: Two Bits - The Cultural Significance of Free Software by Christopher Kelty -Files: data/v[34]/samples/free_for_all.peter_wayner.sst +Files: data/samples/free_for_all.peter_wayner.sst Copyright: 2000, Peter Wayner License: CC-BY-NC-1.0 Attribution-Noncommercial @@ -90,14 +90,14 @@ NOTES: Free For All - How Linux and the Free Software Movement Undercut the High Tech Titans by Peter Wayner -Files: data/v[34]/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst +Files: data/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst Copyright: 2000, Eric S Raymond License: Open Publication License, v 2.0 NOTES: The Cathederal and the Bazaar by Eric Raymond -Files: data/v[34]/samples/the_public_domain.james_boyle.sst +Files: data/samples/the_public_domain.james_boyle.sst Copyright: 2008, James Boyle License: CC-BY-NC-SA-3.0 Attribution-Noncommercial-Share Alike @@ -105,7 +105,7 @@ License: CC-BY-NC-SA-3.0 NOTES: The Public Domain - Enclosing the Commons of the Mind by James Boyle -Files: data/v[34]/samples/content.cory_doctorow.sst +Files: data/samples/content.cory_doctorow.sst Copyright: 2008, Cory Doctorow License: CC-BY-NC-SA-3.0 Attribution-Noncommercial-Share Alike @@ -114,7 +114,7 @@ NOTES: CONTENT - Selected Essays on Technology, Creativity, Copyright and the Future of the Future by Cory Doctorow -Files: data/v[34]/samples/down_and_out_in_the_magic_kingdom.cory_doctorow.sst +Files: data/samples/down_and_out_in_the_magic_kingdom.cory_doctorow.sst Copyright: 2003, Cory Doctorow License: CC-BY-NC-SA-1.0 Attribution-NonCommercial-ShareAlike @@ -122,7 +122,7 @@ License: CC-BY-NC-SA-1.0 NOTES: Down and Out in the Magic Kingdom by Cory Doctorow -Files: data/v[34]/samples/little_brother.cory_doctorow.sst +Files: data/samples/little_brother.cory_doctorow.sst Copyright: 2008, Cory Doctorow License: CC-BY-NC-SA-3.0 Attribution-Noncommercial-Share Alike @@ -130,7 +130,7 @@ License: CC-BY-NC-SA-3.0 NOTES: Little Brother by Cory Doctorow -Files: data/v[34]/samples/for_the_win.cory_doctorow.sst +Files: data/samples/for_the_win.cory_doctorow.sst Copyright: 2010, Cory Doctorow License: CC-BY-NC-SA-3.0 Attribution-Noncommercial-Share Alike @@ -138,7 +138,7 @@ License: CC-BY-NC-SA-3.0 NOTES: For the Win by Cory Doctorow -Files: data/v[34]/samples/accelerando.charles_stross.sst +Files: data/samples/accelerando.charles_stross.sst Copyright: 2005, Charles Stross License: CC-BY-NC-ND-2.0 Attribution-Noncommercial-No Derivative Works @@ -148,24 +148,24 @@ License: CC-BY-NC-ND-2.0 NOTES: Accelerando by Charles Stross -Files: data/v[34]/samples/un_contracts_international_sale_of_goods_convention_1980.sst +Files: data/samples/un_contracts_international_sale_of_goods_convention_1980.sst Text: UN Contracts for International Sale of Goods Copyright: License: Author: UN, UNCITRAL URL: -Files: data/v[34]/samples/gullivers_travels.jonathan_swift.sst +Files: data/samples/gullivers_travels.jonathan_swift.sst Copyright: 1726 License: Public Domain NOTES: Gulliver's Travels by Jonathan Swift -Files: data/v[34]/samples/alices_adventures_in_wonderland.lewis_carroll.sst +Files: data/samples/alices_adventures_in_wonderland.lewis_carroll.sst Copyright: 1865 License: Public Domain NOTES: Alice's Adventures in Wonderland by Lewis Carroll -Files: data/v[34]/samples/through_the_looking_glass.lewis_carroll.sst +Files: data/samples/through_the_looking_glass.lewis_carroll.sst Copyright: 1871 License: Public Domain NOTES: Through the Looking Glass by Lewis Carroll -- cgit v1.2.3