Merge branch 'upstream' into debian/sid

1 files changed, 5 insertions, 3 deletions

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