Merge branch 'upstream' into debian/sid

6 files changed, 27 insertions, 12 deletions

diff --git a/data/sisu_markup_samples/non-free/autonomy_markup0.sst b/data/sisu_markup_samples/non-free/autonomy_markup0.sst
index 0e1867f..4f4579d 100644
--- a/data/sisu_markup_samples/non-free/autonomy_markup0.sst
+++ b/data/sisu_markup_samples/non-free/autonomy_markup0.sst
@@ -4,12 +4,16 @@
 
 @subtitle: Transnational contracting, trends and supportive structures
 
-@creator: Ralph Amissah
+@creator: Amissah, Ralph
 
-@type: article
+@rights: Copyright (C) Ralph Amissah
 
 @subject: international contracts, international commercial arbitration, private international law
 
+@topic_register: SiSU:markup sample:article;law:international:commercial arbitration|uniform law|harmonization;private law;arbitration:international commercial
+
+@type: article
+
 @date: 2000-08-27
 
 @italics: /CISG|PICC|PECL|UNCITRAL|UNIDROIT|lex mercatoria|pacta sunt servanda|caveat subscriptor|ex aequo et bono|amiable compositeur|ad hoc/i
@@ -23,8 +27,6 @@
 {Arbitration}http://www.jus.uio.no/lm/arbitration/toc.html
 {Electronic Commerce}http://www.jus.uio.no/lm/electronic.commerce/toc.html
 
-@rights: Copyright (C) Ralph Amissah
-
 @level: num_top=1
 
 :A~ Revisiting the Autonomous Contract (Draft 0.90 - 2000-08-27)
diff --git a/data/sisu_markup_samples/non-free/free_culture.lawrence_lessig.sst b/data/sisu_markup_samples/non-free/free_culture.lawrence_lessig.sst
index 65f8e69..6e80448 100644
--- a/data/sisu_markup_samples/non-free/free_culture.lawrence_lessig.sst
+++ b/data/sisu_markup_samples/non-free/free_culture.lawrence_lessig.sst
@@ -4,12 +4,14 @@
 
 @subtitle: How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity
 
-@creator: Lawrence Lessig
+@creator: Lessig, Lawrence
 
 @type: Book
 
 @rights: Copyright (C) Lawrence Lessig, 2004. 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/
 
+@topic_register: SiSU:markup sample:book;copyright;free culture;creative commons;intellectual property:copyright:creative commons;book:subject:culture|copyright|society;culture;society
+
 @date: 2004-03-25
 
 @date.created: 2004-03-25
diff --git a/data/sisu_markup_samples/non-free/free_for_all.peter_wayner.sst b/data/sisu_markup_samples/non-free/free_for_all.peter_wayner.sst
index 7befc79..263b43c 100644
--- a/data/sisu_markup_samples/non-free/free_for_all.peter_wayner.sst
+++ b/data/sisu_markup_samples/non-free/free_for_all.peter_wayner.sst
@@ -4,12 +4,14 @@
 
 @subtitle: How Linux and the Free Software Movement Undercut the High Tech Titans
 
-@creator: Peter Wayner
+@creator: Wayner, Peter
 
 @type: Book
 
 @rights: Copyright (C) Peter Wayner, 2000. Free For All 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/
 
+@topic_register: SiSU:markup sample:book;GNU/Linux:GPL;free software;open source;software license:GPL;Linux:GNU|Software Libré;book:subject:Linux|Software Libré|technology
+
 @date: 2002-12-22
 
 @date.created: 2002-12-22
@@ -36,12 +38,12 @@
 
 @links: {The Original Authoritative and Updated Version of the Text available in pdf}http://www.wayner.org/books/ffa
 {Free For All @ SiSU}http://www.jus.uio.no/sisu/free_for_all.peter_wayner
-{Syntax}http://www.jus.uio.no/sisu/sample/syntax/free_for_all.peter_wayner.sst.html
 {@ 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
 
 :A~ Free For All
diff --git a/data/sisu_markup_samples/non-free/the_cathedral_and_the_bazaar.eric_s_raymond.sst b/data/sisu_markup_samples/non-free/the_cathedral_and_the_bazaar.eric_s_raymond.sst
index d6829df..e54e85a 100644
--- a/data/sisu_markup_samples/non-free/the_cathedral_and_the_bazaar.eric_s_raymond.sst
+++ b/data/sisu_markup_samples/non-free/the_cathedral_and_the_bazaar.eric_s_raymond.sst
@@ -2,12 +2,14 @@
 
 @title: The Cathedral and the Bazaar
 
-@creator: Eric S. Raymond
+@creator: Raymond, Eric S.
 
 @type: Book
 
 @rights: Copyright © 2000 Eric S. Raymond. Permission is granted to copy, distribute and/or modify this document under the terms of the Open Publication License, version 2.0.
 
+@topic_register: SiSU:markup sample:book;programming;software:open source;open source:development
+
 @date.created: 1997-05-21
 
 @date.issued: 1997-05-21
@@ -558,7 +560,7 @@ In the mean time, however, the open-source idea has scored successes and found b
 
 % This is version 3.0
 
-% $Date: 2007/01/26 20:28:08 $
+% $Date: 2008/12/10 18:25:30 $
 % Revision History
 % Revision 1.57	11 September 2000	esr
 % New major section ``How Many Eyeballs Tame Complexity".
diff --git a/data/sisu_markup_samples/non-free/the_wealth_of_networks.yochai_benkler.sst b/data/sisu_markup_samples/non-free/the_wealth_of_networks.yochai_benkler.sst
index 42b71f1..55c95a9 100644
--- a/data/sisu_markup_samples/non-free/the_wealth_of_networks.yochai_benkler.sst
+++ b/data/sisu_markup_samples/non-free/the_wealth_of_networks.yochai_benkler.sst
@@ -4,12 +4,14 @@
 
 @subtitle: How Social Production Transforms Markets and Freedom
 
-@creator: Yochai Benkler
+@creator: Benkler, Yochai
 
 @type: Book
 
 @rights: Copyright (C) 2006 Yochai Benkler. 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.
 
+@topic_register: SiSU:markup sample:book;networks;Internet;intellectual property:patents|copyright;economics;society;copyright;patents;book:subject:economics|policy|society|copyright|patents
+
 % 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.
 
 @date: 2006-04-03
@@ -36,7 +38,8 @@
 
 @skin: skin_won_benkler
 
-@links: {The Wealth of Networks, dedicated wiki}http://www.benkler.org/wealth_of_networks/index.php/Main_Page
+@links: {The Wealth of Networks, dedicated wiki}http://cyber.law.harvard.edu/wealth_of_networks/Main_Page
+{Yochai Benkler, wiki}http://www.benkler.org/wealth_of_networks/index.php/Main_Page
 {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
 {tWoN book index @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.book_index.yochai_benkler/doc.html
 {@ Wikipedia}http://en.wikipedia.org/wiki/The_Wealth_of_Networks
diff --git a/data/sisu_markup_samples/non-free/un_contracts_international_sale_of_goods_convention_1980.sst b/data/sisu_markup_samples/non-free/un_contracts_international_sale_of_goods_convention_1980.sst
index ff9151e..a95ee7f 100644
--- a/data/sisu_markup_samples/non-free/un_contracts_international_sale_of_goods_convention_1980.sst
+++ b/data/sisu_markup_samples/non-free/un_contracts_international_sale_of_goods_convention_1980.sst
@@ -2,12 +2,16 @@
 
 @title: United Nations Convention On Contracts For The International Sale Of Goods, 1980 (CISG)
 
-@creator: http://www.un.org/ United Nations (UN)
+@creator: United Nations
+
+@creator.url: http://www.un.org/
 
 @source: UNCITRAL, United Nations
 
 @subject: UNCITRAL, United Nations, sale of goods
 
+@topic_register: SiSU:markup sample:convention;law:international:uniform law|sales law|CISG;CISG
+
 @keywords: UNCITRAL, United Nations, sale of goods
 
 @type: convention, international sales, sale of goods, UNCITRAL, United Nations