data/v2/samples, adds "CONTENT" by Cory Doctorow and links

10 files changed, 57 insertions, 36 deletions

diff --git a/data/v2/samples/accelerando.charles_stross.sst b/data/v2/samples/accelerando.charles_stross.sst
index a361eb0..0a9047b 100644
--- a/data/v2/samples/accelerando.charles_stross.sst
+++ b/data/v2/samples/accelerando.charles_stross.sst
@@ -5,8 +5,8 @@
 @creator: Stross, Charles
 
 @rights: 
-  :copyright: Copyright (C) Charles Stross, 2005.
-  :license:  Creative Commons License, Attribution-NonCommercial-NoDerivs 2.0: * Attribution. You must attribute the work in the manner specified by the author or licensor; * Noncommercial. You may not use this work for commercial purposes; * No Derivative Works. You may not alter, transform, or build upon this work; * For any reuse or distribution, you must make clear to others the license terms of this work. (* For any reuse or distribution, you must make clear to others the license terms of this work. * Any of these conditions can be waived if you get permission from the copyright holder.) http://creativecommons.org/licenses/by-nc-nd/2.0/ These SiSU presentations of Accelerando are done with the kind permission of the author Charles Stross
+ :copyright: Copyright (C) Charles Stross, 2005.
+ :license:  Creative Commons License, Attribution-NonCommercial-NoDerivs 2.0: * Attribution. You must attribute the work in the manner specified by the author or licensor; * Noncommercial. You may not use this work for commercial purposes; * No Derivative Works. You may not alter, transform, or build upon this work; * For any reuse or distribution, you must make clear to others the license terms of this work. (* For any reuse or distribution, you must make clear to others the license terms of this work. * Any of these conditions can be waived if you get permission from the copyright holder.) http://creativecommons.org/licenses/by-nc-nd/2.0/ These SiSU presentations of Accelerando are done with the kind permission of the author Charles Stross
 
 @source: http://www.accelerando.org/
 
@@ -28,11 +28,12 @@
 
 @links:
  { Accelerando home }http://www.accelerando.org/
- { Accelerando by Charlie Stross @ SiSU }http://www.jus.uio.no/sisu/accelerando.charlie_stross
+ { Accelerando, Charlie Stross @ SiSU }http://www.jus.uio.no/sisu/accelerando.charlie_stross
  { @ Wikipedia }http://en.wikipedia.org/wiki/Accelerando_%28novel%29
  { Syntax }http://www.jus.uio.no/sisu/sample/syntax/accelerando.charles_stross.sst.html
  {@ Amazon.com}http://www.amazon.com/gp/product/0441014151
  {@ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0441014151
+ { Little Brother, Cory Doctorow @ SiSU }http://www.jus.uio.no/sisu/little_brother.cory_doctorow
 
 % book cover shot (US) book cover shot (UK)
 
diff --git a/data/v2/samples/autonomy_markup0.sst b/data/v2/samples/autonomy_markup0.sst
index f2f1e9c..4ff8f8c 100644
--- a/data/v2/samples/autonomy_markup0.sst
+++ b/data/v2/samples/autonomy_markup0.sst
@@ -7,7 +7,7 @@
  :author: Amissah, Ralph
 
 @rights:
-  :copyright: Copyright (C) Ralph Amissah
+ :copyright: Copyright (C) Ralph Amissah
 
 @classify:
  :type: article
diff --git a/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index 9b8c2b9..78a383e 100644
--- a/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
@@ -6,11 +6,11 @@
 @creator: Williams, Sam
 
 @rights:
-  :copyright: Copyright (C) Sam Williams 2002.
-  :license: Published under the GNU Free Documentation 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. A copy of the license is included in Appendix C, GNU Free Documentation License. All images are to be included verbatim when the document is copied, distributed, or modified under the terms of the GFDL.
+ :copyright: Copyright (C) Sam Williams 2002.
+ :license: Published under the GNU Free Documentation 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. A copy of the license is included in Appendix C, GNU Free Documentation License. All images are to be included verbatim when the document is copied, distributed, or modified under the terms of the GFDL.
 
 @classify:
- :topic_register: SiSU:markup sample:book;copyright;GNU/Linux:GPL|copyleft|free software;free software;Software:Software Libré;GPL;Linux:GNU|Software Libré;book:biography
+ :topic_register: SiSU:markup sample:book;copyright;GNU/Linux:GPL|copyleft|free software;free software;Software:Software Libré;GPL;Linux:GNU|Software Libré;book:biography;programming
 
 @date:
  :published: 2002
@@ -30,8 +30,10 @@
  {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
  {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
  {Free For All, Peter Wayner @ SiSU}http://www.jus.uio.no/sisu/free_for_all.peter_wayner
- {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
  {The Cathedral and the Bazaar, Eric S. Raymond @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
+ {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
+ {CONTENT, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/content.cory_doctorow
+ {Little Brother, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/little_brother.cory_doctorow
 
 @make:
  :skin: skin_rms
diff --git a/data/v2/samples/free_culture.lawrence_lessig.sst b/data/v2/samples/free_culture.lawrence_lessig.sst
index 8c700a4..4e91803 100644
--- a/data/v2/samples/free_culture.lawrence_lessig.sst
+++ b/data/v2/samples/free_culture.lawrence_lessig.sst
@@ -5,14 +5,6 @@
 
 @creator: Lessig, Lawrence
 
-@classify:
- :type: Book
- :topic_register: SiSU:markup sample:book;copyright;free culture;creative commons;intellectual property:copyright:creative commons;book:subject:culture|copyright|society;culture;society
-
-@rights:
-  :copyright: Copyright (C) Lawrence Lessig, 2004.
-  :license: Free Culture is Licensed under a Creative Commons License. This License permits non-commercial use of this work, so long as attribution is given. For more information about the license, visit http://creativecommons.org/licenses/by-nc/1.0/
-
 @date:
  :published: 2004-03-25
  :created: 2004-03-25
@@ -21,6 +13,14 @@
  :modified: 2004-03-25
  :valid: 2004-03-25
 
+@rights:
+ :copyright: Copyright (C) Lawrence Lessig, 2004.
+ :license: Free Culture is Licensed under a Creative Commons License. This License permits non-commercial use of this work, so long as attribution is given. For more information about the license, visit http://creativecommons.org/licenses/by-nc/1.0/
+
+@classify:
+ :type: Book
+ :topic_register: SiSU:markup sample:book;copyright;free culture;creative commons;intellectual property:copyright:creative commons;book:subject:culture|copyright|society;culture;society
+
 % @date.created: 2004-04-08
 
 % @catalogue: isbn=1594200068
@@ -32,7 +32,6 @@
 @make:
  :breaks: new=:C; break=1
  :skin: skin_lessig
- :images: center
 
 @links:
  {Free Culture}http://www.free-culture.cc
@@ -46,6 +45,8 @@
  {Free as in Freedom (on Richard M. Stallman), Sam Williams @ SiSU}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
  {Free For All, Peter Wayner @ SiSU}http://www.jus.uio.no/sisu/free_for_all.peter_wayner
  {The Cathedral and the Bazaar, Eric S. Raymond @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
+ { CONTENT, Cory Doctorow @ SiSU }http://www.jus.uio.no/sisu/content.cory_doctorow
+ { Little Brother, Cory Doctorow @ SiSU }http://www.jus.uio.no/sisu/little_brother.cory_doctorow
 
 :A~ @title @author
 
diff --git a/data/v2/samples/free_for_all.peter_wayner.sst b/data/v2/samples/free_for_all.peter_wayner.sst
index 7e2b029..c545616 100644
--- a/data/v2/samples/free_for_all.peter_wayner.sst
+++ b/data/v2/samples/free_for_all.peter_wayner.sst
@@ -39,10 +39,12 @@
  {@ Amazon.com}http://www.amazon.com/gp/product/0066620503
  {@ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0066620503
  {Free as in Freedom (on Richard M. Stallman), Sam Williams @ SiSU}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
- {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
  {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
  {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
  {The Cathedral and the Bazaar, Eric S. Raymond @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
+ {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
+ {CONTENT, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/content.cory_doctorow
+ {Little Brother, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/little_brother.cory_doctorow
 
 :A~ @title @author
 
diff --git a/data/v2/samples/gpl2.fsf.sst b/data/v2/samples/gpl2.fsf.sst
index 6765b3d..6ef8478 100644
--- a/data/v2/samples/gpl2.fsf.sst
+++ b/data/v2/samples/gpl2.fsf.sst
@@ -5,8 +5,8 @@
 @creator: Free Software Foundation
 
 @rights: 
-  :copyright: Copyright 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-  :license: Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+ :copyright: Copyright 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ :license: Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 
 @date:
  :published: 1991
diff --git a/data/v2/samples/little_brother.cory_doctorow.sst b/data/v2/samples/little_brother.cory_doctorow.sst
index 5e297de..d8f73c7 100644
--- a/data/v2/samples/little_brother.cory_doctorow.sst
+++ b/data/v2/samples/little_brother.cory_doctorow.sst
@@ -5,9 +5,12 @@
 @creator:
  :author: Doctorow, Cory |email doctorow@craphound.com
 
+@date:
+ :published: 2008
+
 @rights:
-  :copyright: Copyright (C) Cory Doctorow, 2008.
-  :license: This book is distributed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 license. That means:<br>You are free:<br> * to Share - to copy, distribute and transmit the work<br> * to Remix - to adapt the work<br> Under the following conditions:<br> * Attribution. You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).<br> * Noncommercial. You may not use this work for commercial purposes.<br> * Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.<br> * For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link http://craphound.com/littlebrother <br> * Any of the above conditions can be waived if you get my permission<br> More info here: http://creativecommons.org/licenses/by-nc-sa/3.0/ <br> See the end of this file for the complete legalese. [Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License]
+ :copyright: Copyright (C) Cory Doctorow, 2008.
+ :license: This book is distributed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 license. That means:<br>You are free:<br> * to Share - to copy, distribute and transmit the work<br> * to Remix - to adapt the work<br> Under the following conditions:<br> * Attribution. You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).<br> * Noncommercial. You may not use this work for commercial purposes.<br> * Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.<br> * For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link http://craphound.com/littlebrother <br> * Any of the above conditions can be waived if you get my permission<br> More info here: http://creativecommons.org/licenses/by-nc-sa/3.0/ <br> See the end of this file for the complete legalese. [Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License]
 
 @classify:
  :subject: Novel
@@ -19,10 +22,16 @@
  :skin: skin_little_brother
 
 @links: { Little Brother home }http://craphound.com/littlebrother
-  { Little Brother by Cory Doctorow @ SiSU }http://www.jus.uio.no/sisu/little_brother.cory_doctorow
-  { @ Wikipedia }http://en.wikipedia.org/wiki/Little_Brother_(Cory_Doctorow_novel)
-  {@ Amazon.com}http://www.amazon.com/Little-Brother-Cory-Doctorow/dp/B002IT5OMA
-  {@ Barnes & Noble}http://search.barnesandnoble.com/Little-Brother/Cory-Doctorow/e/9780765319852
+ {Little Brother, Cory Doctorow @ SiSU }http://www.jus.uio.no/sisu/little_brother.cory_doctorow
+ { @ Wikipedia }http://en.wikipedia.org/wiki/Little_Brother_(Cory_Doctorow_novel)
+ {@ Amazon.com}http://www.amazon.com/Little-Brother-Cory-Doctorow/dp/B002IT5OMA
+ {@ Barnes & Noble}http://search.barnesandnoble.com/Little-Brother/Cory-Doctorow/e/9780765319852
+ {CONTENT, Cory Doctorow @ SiSU }http://www.jus.uio.no/sisu/content.cory_doctorow
+ {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
+ {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
+ {Free as in Freedom (on Richard M. Stallman), Sam Williams @ SiSU}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
+ {Free For All, Peter Wayner @ SiSU}http://www.jus.uio.no/sisu/free_for_all.peter_wayner
+ {The Cathedral and the Bazaar, Eric S. Raymond @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
 
 :A~ @title @author
 
@@ -274,7 +283,7 @@ Every chapter of this file has been dedicated to a different bookstore, and in e
 
 1~ Chapter 1
 
-_1 /{ [This chapter is dedicated to BakkaPhoenix Books in Toronto, Canada.~{ BakkaPhoenix Books: http://www.bakkaphoenixbooks.com/ 697 Queen Street West, Toronto ON Canada M6J1E6, +1 416 963 9993 }~ Bakka is the oldest science fiction bookstore in the world, and it made me the mutant I am today. I wandered in for the first time around the age of 10 and asked for some recommendations. Tanya Huff (yes, /{the}/ Tanya Huff, but she wasn't a famous writer back then!) took me back into the used section and pressed a copy of H. Beam Piper's "Little Fuzzy" into my hands, and changed my life forever. By the time I was 18, I was working at Bakka -- I took over from Tanya when she retired to write full time -- and I learned life-long lessons about how and why people buy books. I think every writer should work at a bookstore (and plenty of writers have worked at Bakka over the years! For the 30th anniversary of the store, they put together an anthology of stories by Bakka writers that included work by Michelle Sagara (AKA Michelle West), Tanya Huff, Nalo Hopkinson, Tara Tallan --and me!)] }/
+_1 /{ [This chapter is dedicated to BakkaPhoenix Books in Toronto, Canada.~{ BakkaPhoenix Books: http://www.bakkaphoenixbooks.com/ 697 Queen Street West, Toronto ON Canada M6J1E6, +1 416 963 9993 }~ Bakka is the oldest science fiction bookstore in the world, and it made me the mutant I am today. I wandered in for the first time around the age of 10 and asked for some recommendations. Tanya Huff (yes, _{the}_ Tanya Huff, but she wasn't a famous writer back then!) took me back into the used section and pressed a copy of H. Beam Piper's "Little Fuzzy" into my hands, and changed my life forever. By the time I was 18, I was working at Bakka -- I took over from Tanya when she retired to write full time -- and I learned life-long lessons about how and why people buy books. I think every writer should work at a bookstore (and plenty of writers have worked at Bakka over the years! For the 30th anniversary of the store, they put together an anthology of stories by Bakka writers that included work by Michelle Sagara (AKA Michelle West), Tanya Huff, Nalo Hopkinson, Tara Tallan --and me!)] }/
 
 I'm a senior at Cesar Chavez high in San Francisco's sunny Mission district, and that makes me one of the most surveilled people in the world. My name is Marcus Yallow, but back when this story starts, I was going by w1n5t0n. Pronounced "Winston."
 
@@ -462,7 +471,7 @@ I had a little Faraday pouch in my bag -- these are little wallets lined with a
 
 1~ Chapter 2
 
-_1 /{ [This chapter is dedicated to Amazon.com,~{ Amazon: http://www.amazon.com/exec/obidos/ASIN/0765319853/downandoutint-20 }~ the largest Internet bookseller in the world. Amazon is /{amazing}/ -- a "store" where you can get practically any book ever published (along with practically everything else, from laptops to cheese-graters), where they've elevated recommendations to a high art, where they allow customers to directly communicate with each other, where they are constantly inventing new and better ways of connecting books with readers. Amazon has always treated me like gold -- the founder, Jeff Bezos, even posted a reader-review for my first novel! -- and I shop there like crazy (looking at my spreadsheets, it appears that I buy something from Amazon approximately every /{six days}/). Amazon's in the process of reinventing what it means to be a bookstore in the twenty-first century and I can't think of a better group of people to be facing down that thorny set of problems.] }/
+_1 /{ [This chapter is dedicated to Amazon.com,~{ Amazon: http://www.amazon.com/exec/obidos/ASIN/0765319853/downandoutint-20 }~ the largest Internet bookseller in the world. Amazon is _{amazing}_ -- a "store" where you can get practically any book ever published (along with practically everything else, from laptops to cheese-graters), where they've elevated recommendations to a high art, where they allow customers to directly communicate with each other, where they are constantly inventing new and better ways of connecting books with readers. Amazon has always treated me like gold -- the founder, Jeff Bezos, even posted a reader-review for my first novel! -- and I shop there like crazy (looking at my spreadsheets, it appears that I buy something from Amazon approximately every _{six days}_). Amazon's in the process of reinventing what it means to be a bookstore in the twenty-first century and I can't think of a better group of people to be facing down that thorny set of problems.] }/
 
 "I'm thinking of majoring in physics when I go to Berkeley," Darryl said. His dad taught at the University of California at Berkeley, which meant he'd get free tuition when he went. And there'd never been any question in Darryl's household about whether he'd go.
 
diff --git a/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst b/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
index a8156d5..343be85 100644
--- a/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
+++ b/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
@@ -9,8 +9,8 @@
  :topic_register: SiSU:markup sample:book;programming;software:open source;open source:development
 
 @rights:
-  :copyright: Copyright © 2000 Eric S. Raymond.
-  :license: Permission is granted to copy, distribute and/or modify this document under the terms of the Open Publication License, version 2.0.
+ :copyright: Copyright © 2000 Eric S. Raymond.
+ :license: Permission is granted to copy, distribute and/or modify this document under the terms of the Open Publication License, version 2.0.
 
 @date:
  :published: 2002-08-02
@@ -23,10 +23,12 @@
  {The Cathedral and the Bazaar @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
  {The Cathedral and the Bazaar, Source }http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/
  {@ Wikipedia}http://en.wikipedia.org/wiki/The_Cathedral_and_the_Bazaar
+ {Free as in Freedom (on Richard Stallman), Sam Williams @ SiSU}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
  {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
  {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
- {Free as in Freedom (on Richard Stallman), Sam Williams @ SiSU}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
+ {CONTENT, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/content.cory_doctorow
  {Free For All, Peter Wayner @ SiSU}http://www.jus.uio.no/sisu/free_for_all.peter_wayner
+ {Little Brother, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/little_brother.cory_doctorow
  {CatB @ Amazon.com}http://www.amazon.com/Wealth-Networks-Production-Transforms-Markets/dp/0596001088/
  {CatB @ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0596001088
 
diff --git a/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst b/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
index 5182eb8..4a1e842 100644
--- a/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
+++ b/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
@@ -11,8 +11,8 @@
  :topic_register: SiSU:markup sample:book;networks;Internet;intellectual property:patents|copyright;economics;society;copyright;patents;book:subject:economics|policy|society|copyright|patents
 
 @rights:
-  :copyright: Copyright (C) 2006 Yochai Benkler.
-  :license: All rights reserved. Subject to the exception immediately following, this book may not be reproduced, in whole or in part, including illustrations, in any form (beyond that copying permitted by Sections 107 and 108 of the U.S. Copyright Law and except by reviewers for the public press), without written permission from the publishers. http://creativecommons.org/licenses/by-nc-sa/2.5/ The author has made an online version of the book available under a Creative Commons Noncommercial Sharealike license; it can be accessed through the author's website at http://www.benkler.org.
+ :copyright: Copyright (C) 2006 Yochai Benkler.
+ :license: All rights reserved. Subject to the exception immediately following, this book may not be reproduced, in whole or in part, including illustrations, in any form (beyond that copying permitted by Sections 107 and 108 of the U.S. Copyright Law and except by reviewers for the public press), without written permission from the publishers. http://creativecommons.org/licenses/by-nc-sa/2.5/ The author has made an online version of the book available under a Creative Commons Noncommercial Sharealike license; it can be accessed through the author's website at http://www.benkler.org.
 
 % STRANGE FRUIT By Lewis Allan 1939 (Renewed) by Music Sales Corporation (ASCAP) International copyright secured. All rights reserved. All rights outside the United States controlled by Edward B. Marks Music Company. Reprinted by permission.
 
@@ -42,9 +42,11 @@
  {@ Wikipedia}http://en.wikipedia.org/wiki/The_Wealth_of_Networks
  {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
  {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
+ {CONTENT, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/content.cory_doctorow
  {Free as in Freedom (on Richard M. Stallman), Sam Williams @ SiSU}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
  {Free For All, Peter Wayner @ SiSU}http://www.jus.uio.no/sisu/free_for_all.peter_wayner
  {The Cathedral and the Bazaar, Eric S. Raymond @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
+ {Little Brother, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/little_brother.cory_doctorow
  {WoN @ Amazon.com}http://www.amazon.com/Wealth-Networks-Production-Transforms-Markets/dp/0300110561/
  {WoN @ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0300110561
 
diff --git a/data/v2/samples/two_bits.christopher_kelty.sst b/data/v2/samples/two_bits.christopher_kelty.sst
index 841d3b5..2698334 100644
--- a/data/v2/samples/two_bits.christopher_kelty.sst
+++ b/data/v2/samples/two_bits.christopher_kelty.sst
@@ -6,11 +6,11 @@
 @creator: Kelty, Christopher M.
 
 @rights: 
-  :copyright: © 2008 Duke University Press<br>Printed in the United States of America on acid-free paper ∞<br>Designed by C. H. Westmoreland<br>Typeset in Charis (an Open Source font) by Achorn International<br>Library of Congress Cataloging-in-Publication data and republication acknowledgments appear on the last printed pages of this book.
-  :license: Licensed under the Creative Commons Attribution-NonCommercial-Share Alike License, available at http://creativecommons.org/licenses/by-nc-sa/3.0/ or by mail from Creative Commons, 559 Nathan Abbott Way, Stanford, Calif. 94305, U.S.A. "NonCommercial" as defined in this license specifically excludes any sale of this work or any portion thereof for money, even if sale does not result in a profit by the seller or if the sale is by a 501(c)(3) nonprofit or NGO.<br>Duke University Press gratefully acknowledges the support of HASTAC (Humanities, Arts, Science, and Technology Advanced Collaboratory), which provided funds to help support the electronic interface of this book.<br>Two Bits is accessible on the Web at twobits.net.
+ :copyright: © 2008 Duke University Press<br>Printed in the United States of America on acid-free paper ∞<br>Designed by C. H. Westmoreland<br>Typeset in Charis (an Open Source font) by Achorn International<br>Library of Congress Cataloging-in-Publication data and republication acknowledgments appear on the last printed pages of this book.
+ :license: Licensed under the Creative Commons Attribution-NonCommercial-Share Alike License, available at http://creativecommons.org/licenses/by-nc-sa/3.0/ or by mail from Creative Commons, 559 Nathan Abbott Way, Stanford, Calif. 94305, U.S.A. "NonCommercial" as defined in this license specifically excludes any sale of this work or any portion thereof for money, even if sale does not result in a profit by the seller or if the sale is by a 501(c)(3) nonprofit or NGO.<br>Duke University Press gratefully acknowledges the support of HASTAC (Humanities, Arts, Science, and Technology Advanced Collaboratory), which provided funds to help support the electronic interface of this book.<br>Two Bits is accessible on the Web at twobits.net.
 
 @classify:
- :topic_register: software:development:geeks;anthropology:geeks;book:subject:anthropology|society|geeks;society
+ :topic_register: software:development:geeks;anthropology:geeks;book:subject:anthropology|society|geeks;society;programming
 
 @date: 2008
 
@@ -26,9 +26,11 @@
  {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
  {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
  {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
+ {CONTENT, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/content.cory_doctorow
  {Free as in Freedom (on Richard M. Stallman), Sam Williams @ SiSU}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
  {Free For All, Peter Wayner @ SiSU}http://www.jus.uio.no/sisu/free_for_all.peter_wayner
  {The Cathedral and the Bazaar, Eric S. Raymond @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
+ {Little Brother, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/little_brother.cory_doctorow
  {Two Bits @ Amazon.com}http://www.amazon.com/Two-Bits-Cultural-Significance-Software/dp/0822342642
  {Two Bits @ Barnes & Noble}http://search.barnesandnoble.com/Two-Bits/Christopher-M-Kelty/e/9780822342649