Merge branch 'upstream' into debian/sid

1 files changed, 17 insertions, 8 deletions

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.