markup sample (headers & yaml), links added/updated (minor cleaning)

29 files changed, 105 insertions, 93 deletions

diff --git a/data/v1/samples/_sisu/skin/yml/list.yml b/data/v1/samples/_sisu/skin/yml/list.yml
index 4aea9b9..388ef36 100644
--- a/data/v1/samples/_sisu/skin/yml/list.yml
+++ b/data/v1/samples/_sisu/skin/yml/list.yml
@@ -3,8 +3,11 @@ sisu:
   - sisu
 open_society:
   site:
+  - vs
   - twon
   - fc
+  - content
+  - di
   - faif
   - twobits
   - ffa
diff --git a/data/v1/samples/_sisu/skin/yml/promo.yml b/data/v1/samples/_sisu/skin/yml/promo.yml
index a3a6781..9b9e3da 100644
--- a/data/v1/samples/_sisu/skin/yml/promo.yml
+++ b/data/v1/samples/_sisu/skin/yml/promo.yml
@@ -1,4 +1,4 @@
-# Author: Ralph@Amissah.com
+# Author: ralph@amissah.com
 site:
   sisu_icon:
     url:        SiSU
@@ -47,6 +47,15 @@ site:
     -
       title:    Ruby Application Archive
       url:      http://raa.ruby-lang.org/project/sisu/
+  vs:
+    title:      Viral Spiral
+    author:     David Bollier
+    year:       2009
+    url:        viral_spiral.david_bollier
+    links:
+    -
+      title:    Source Wiki
+      url:      http://viralspiral.cc/
   twon:
     title:      The Wealth of Networks
     subtitle:   How Social Production Transforms Markets and Freedom
@@ -76,6 +85,18 @@ site:
     -
       title:    Source
       url:      http://www.free-culture.cc/
+  di:
+    title:      Democratizing Innovation
+    author:     Eric von Hippel
+    year:       2005
+    url:        democratizing_innovation.eric_von_hippel
+    links:
+    -
+      title:    Wikipedia entry
+      url:      http://en.wikipedia.org/wiki/Democratizing_Innovation
+    -
+      title:    Source
+      url:      http://web.mit.edu/evhippel/www/democ1.htm
   faif:
     title:      Free As In Freedom
     subtitle:   Richard Stallman's Crusade for Free Software
@@ -160,6 +181,19 @@ site:
     -
       title:    Software License List
       url:      http://www.fsf.org/licensing/licenses/
+  content:
+    title:      CONTENT
+    subtitle:   Selected Essays on Technology, Creativity, Copyright and the Future of the Future
+    author:     Cory Doctorow
+    year:       2008
+    url:        content.cory_doctorow
+    links:
+    -
+      title:    Home
+      url:      http://craphound.com/content
+    -
+      title:   Wikipedia entry
+      url:     http://en.wikipedia.org/wiki/Cory_Doctorow
   littlebrother:
     title:      Little Brother
     author:     Cory Doctorow
@@ -169,6 +203,9 @@ site:
     -
       title:    Home
       url:      http://craphound.com/littlebrother
+    -
+      title:   Wikipedia entry
+      url:     http://en.wikipedia.org/wiki/Little_Brother_(Cory_Doctorow_novel)
 search:
   sisu_books_libre_sisusearch:
     type:      sisusearch
diff --git a/data/v1/samples/accelerando.charles_stross.sst b/data/v1/samples/accelerando.charles_stross.sst
index db53d74..f30d009 100644
--- a/data/v1/samples/accelerando.charles_stross.sst
+++ b/data/v1/samples/accelerando.charles_stross.sst
@@ -1,4 +1,4 @@
-% SiSU 0.38
+% SiSU 1.0
 
 @title: Accelerando
 
@@ -39,8 +39,6 @@
 
 :A~ @title @author
 
-% :B~ A novel by Charles Stross
-
 1~dedication Dedication
 
 For Feòrag, with love
diff --git a/data/v1/samples/autonomy_markup0.sst b/data/v1/samples/autonomy_markup0.sst
index de859d3..55fc8e9 100644
--- a/data/v1/samples/autonomy_markup0.sst
+++ b/data/v1/samples/autonomy_markup0.sst
@@ -1,4 +1,4 @@
-% SiSU 0.42
+% SiSU 1.0
 
 @title: Revisiting the Autonomous Contract
 
diff --git a/data/v1/samples/content.cory_doctorow.sst b/data/v1/samples/content.cory_doctorow.sst
index 7c5eb3c..41e5d83 100644
--- a/data/v1/samples/content.cory_doctorow.sst
+++ b/data/v1/samples/content.cory_doctorow.sst
@@ -26,8 +26,11 @@
 {@ Amazon.com}http://www.amazon.com/Content-Selected-Technology-Creativity-Copyright/dp/1892391813
 {@ Barnes & Noble}http://search.barnesandnoble.com/Content/Cory-Doctorow/e/9781892391810/?itm=1&USRI=content+cory+doctorow
 {Little Brother, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/little_brother.cory_doctorow
+{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
+{Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
+{Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
 {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
diff --git a/data/v1/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/v1/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index 98a78f7..e94a4cc 100644
--- a/data/v1/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/v1/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
@@ -23,13 +23,15 @@
 {@ Wikipedia}http://en.wikipedia.org/wiki/Free_as_in_Freedom:_Richard_Stallman%27s_Crusade_for_Free_Software
 {@ Amazon.com}http://www.amazon.com/gp/product/0596002874
 {@ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0596002874
+{Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
+{Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
 {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
+{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
-{The Cathedral and the Bazaar, Eric S. Raymond @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
 
 @skin: skin_rms
 
diff --git a/data/v1/samples/free_culture.lawrence_lessig.sst b/data/v1/samples/free_culture.lawrence_lessig.sst
index b172d0a..0851d53 100644
--- a/data/v1/samples/free_culture.lawrence_lessig.sst
+++ b/data/v1/samples/free_culture.lawrence_lessig.sst
@@ -44,8 +44,10 @@
 {@ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=1594200068
 {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
 {CONTENT, Cory Doctorow @ SiSU }http://www.jus.uio.no/sisu/content.cory_doctorow
+{Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
 {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
+{Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
 {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
diff --git a/data/v1/samples/free_for_all.peter_wayner.sst b/data/v1/samples/free_for_all.peter_wayner.sst
index 9578ba0..7d70454 100644
--- a/data/v1/samples/free_for_all.peter_wayner.sst
+++ b/data/v1/samples/free_for_all.peter_wayner.sst
@@ -1,4 +1,4 @@
-% SiSU 0.38
+% SiSU 1.0
 
 @title: Free For All
 
@@ -41,6 +41,8 @@
 {@ 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
+{Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
+{Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
 {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
 {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
diff --git a/data/v1/samples/gpl3.fsf.sst b/data/v1/samples/gpl3.fsf.sst
index 92b026a..5a4a34c 100644
--- a/data/v1/samples/gpl3.fsf.sst
+++ b/data/v1/samples/gpl3.fsf.sst
@@ -20,7 +20,7 @@
 {GPL3 @ FSF}http://gplv3.fsf.org/
 {GPL @ SiSU}http://www.jus.uio.no/sisu/gpl3.fsf
 {GPL3 source text}http://www.gnu.org/licenses/gpl-3.0.txt
-{ Free as In Freedom - Richard Stallman's Crusade for Free Software }http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
+{Free as In Freedom - Richard Stallman's Crusade for Free Software}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
 
 @skin: skin_gnu
 
diff --git a/data/v1/samples/little_brother.cory_doctorow.sst b/data/v1/samples/little_brother.cory_doctorow.sst
index 881aa0b..0513027 100644
--- a/data/v1/samples/little_brother.cory_doctorow.sst
+++ b/data/v1/samples/little_brother.cory_doctorow.sst
@@ -18,9 +18,12 @@
 {@ 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
+{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
+{Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
 {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
+{Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
 {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
 
@@ -6527,24 +6530,3 @@ Creative Commons is not a party to this License, and makes no warranty whatsoeve
 Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License.
 
 Creative Commons may be contacted at http://creativecommons.org/.
-
-% <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">
-% 	<img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/us/88x31.png"/>
-% </a>
-% <br/>
-% <span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/Text" property="dc:title" rel="dc:type">
-% 	Little Brother
-% </span>
-%
-% by
-%
-% <a xmlns:cc="http://creativecommons.org/ns#" href="http://craphound.com/littlebrother" property="cc:attributionName" rel="cc:attributionURL">
-% 	Cory Doctorow
-% </a>
-%
-% is licensed under a
-%
-% <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">
-% 	Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License
-% </a>.
-%
diff --git a/data/v1/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst b/data/v1/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
index bba13e6..1fe50e0 100644
--- a/data/v1/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
+++ b/data/v1/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
@@ -1,4 +1,4 @@
-% SiSU 0.38
+% SiSU 1.0
 
 @title: The Cathedral and the Bazaar
 
@@ -23,6 +23,8 @@
 @links: {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
+{Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
+{Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
 {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
@@ -38,8 +40,6 @@
 
 :A~ @title @author
 
-% :B~ Eric Steven Raymond
-
 1~ The Cathedral and the Bazaar
 
 Linux is subversive. Who would have thought even five years ago (1991) that a world-class operating system could coalesce as if by magic out of part-time hacking by several thousand developers scattered all over the planet, connected only by the tenuous strands of the Internet?
diff --git a/data/v1/samples/the_wealth_of_networks.yochai_benkler.sst b/data/v1/samples/the_wealth_of_networks.yochai_benkler.sst
index f7934c8..a7ae407 100644
--- a/data/v1/samples/the_wealth_of_networks.yochai_benkler.sst
+++ b/data/v1/samples/the_wealth_of_networks.yochai_benkler.sst
@@ -1,4 +1,4 @@
-% SiSU 0.69
+% SiSU 1.0
 
 @title: The Wealth of Networks
 
@@ -43,7 +43,9 @@
 {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
+{Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
 {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
+{Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
 {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
 {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
diff --git a/data/v1/samples/two_bits.christopher_kelty.sst b/data/v1/samples/two_bits.christopher_kelty.sst
index e183869..39e34b6 100644
--- a/data/v1/samples/two_bits.christopher_kelty.sst
+++ b/data/v1/samples/two_bits.christopher_kelty.sst
@@ -1,4 +1,4 @@
-% SiSU 0.69.0
+% SiSU 1.0
 
 @title: Two Bits
 
@@ -38,6 +38,8 @@
 
 @links: {Two Bits, Christopher Kelty: home page}http://twobits.net/
 {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
+{Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
+{Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
 {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
diff --git a/data/v1/samples/un_contracts_international_sale_of_goods_convention_1980.sst b/data/v1/samples/un_contracts_international_sale_of_goods_convention_1980.sst
index a95ee7f..a73fe25 100644
--- a/data/v1/samples/un_contracts_international_sale_of_goods_convention_1980.sst
+++ b/data/v1/samples/un_contracts_international_sale_of_goods_convention_1980.sst
@@ -1,4 +1,4 @@
-% SiSU 0.38
+% SiSU 1.0
 
 @title: United Nations Convention On Contracts For The International Sale Of Goods, 1980 (CISG)
 
diff --git a/data/v2/samples/_sisu/skin/yml/list.yml b/data/v2/samples/_sisu/skin/yml/list.yml
index 9b49f2e..388ef36 100644
--- a/data/v2/samples/_sisu/skin/yml/list.yml
+++ b/data/v2/samples/_sisu/skin/yml/list.yml
@@ -3,11 +3,11 @@ sisu:
   - sisu
 open_society:
   site:
+  - vs
   - twon
   - fc
   - content
   - di
-  - ffa
   - faif
   - twobits
   - ffa
diff --git a/data/v2/samples/_sisu/skin/yml/promo.yml b/data/v2/samples/_sisu/skin/yml/promo.yml
index fd79607..9b9e3da 100644
--- a/data/v2/samples/_sisu/skin/yml/promo.yml
+++ b/data/v2/samples/_sisu/skin/yml/promo.yml
@@ -1,4 +1,4 @@
-# Author: Ralph@Amissah.com
+# Author: ralph@amissah.com
 site:
   sisu_icon:
     url:        SiSU
@@ -16,6 +16,15 @@ site:
       title:    SiSU Book Samples and Markup Examples
       url:      SiSU/examples.html
     -
+      title:    Manual
+      url:      http://sisudoc.org/sisu/sisu_manual/
+    -
+      title:    Markup
+      url:      http://sisudoc.org/sisu/sisu_markup/
+    -
+      title:    Commands
+      url:      http://sisudoc.org/sisu/sisu_commands/
+    -
       title:    SiSU Download
       url:      SiSU/download.html
     -
@@ -38,6 +47,15 @@ site:
     -
       title:    Ruby Application Archive
       url:      http://raa.ruby-lang.org/project/sisu/
+  vs:
+    title:      Viral Spiral
+    author:     David Bollier
+    year:       2009
+    url:        viral_spiral.david_bollier
+    links:
+    -
+      title:    Source Wiki
+      url:      http://viralspiral.cc/
   twon:
     title:      The Wealth of Networks
     subtitle:   How Social Production Transforms Markets and Freedom
diff --git a/data/v2/samples/accelerando.charles_stross.sst b/data/v2/samples/accelerando.charles_stross.sst
index c07ef20..1d10d75 100644
--- a/data/v2/samples/accelerando.charles_stross.sst
+++ b/data/v2/samples/accelerando.charles_stross.sst
@@ -17,8 +17,6 @@
  :oclc: 57682282
  :isbn: 9780441012848
 
-% @keywords:
-
 @date:
  :published: 2005-07-05
  :available: 2005-07-05
@@ -43,8 +41,6 @@
 
 :A~ @title @author
 
-% :B~ A novel by Charles Stross
-
 1~dedication Dedication
 
 For Feòrag, with love
diff --git a/data/v2/samples/autonomy_markup0.sst b/data/v2/samples/autonomy_markup0.sst
index fb3ba49..5803660 100644
--- a/data/v2/samples/autonomy_markup0.sst
+++ b/data/v2/samples/autonomy_markup0.sst
@@ -31,10 +31,6 @@
  {Arbitration}http://www.jus.uio.no/lm/arbitration/toc.html
  {Electronic Commerce}http://www.jus.uio.no/lm/electronic.commerce/toc.html
 
-% @skin: skin_sisu
-
-% @promo: sisu, ruby, sisu_search_libre, open_society
-
 % (Draft 0.90 - 2000-08-27)
 
 :A~ @title @author~{* Ralph Amissah is a Fellow of Pace University, Institute for International Commercial Law. http://www.cisg.law.pace.edu/ <br>RA lectured on the private law aspects of international trade whilst at the Law Faculty of the University of Tromsø, Norway. http://www.jus.uit.no/ <br> RA built the first web site related to international trade law, now known as lexmercatoria.org and described as "an (international | transnational) commercial law and e-commerce infrastructure monitor". http://lexmercatoria.org/ <br> RA is interested in the law, technology, commerce nexus. RA works with the law firm Amissahs.<br>/{[This is a draft document and subject to change.]}/ <br>All errors are very much my own.<br>ralph@amissah.com }~
diff --git a/data/v2/samples/content.cory_doctorow.sst b/data/v2/samples/content.cory_doctorow.sst
index 952db53..d19adb1 100644
--- a/data/v2/samples/content.cory_doctorow.sst
+++ b/data/v2/samples/content.cory_doctorow.sst
@@ -33,6 +33,7 @@
  { Little Brother, Cory Doctorow @ SiSU }http://www.jus.uio.no/sisu/little_brother.cory_doctorow
  { 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
+ { Viral Spiral, David Bollier@ SiSU }http://www.jus.uio.no/sisu/viral_spiral.david_bollier
  { Democratizing Innovation, Eric von Hippel @ SiSU }http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
  { 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
diff --git a/data/v2/samples/democratizing_innovation.eric_von_hippel.sst b/data/v2/samples/democratizing_innovation.eric_von_hippel.sst
index 6af237e..886455f 100644
--- a/data/v2/samples/democratizing_innovation.eric_von_hippel.sst
+++ b/data/v2/samples/democratizing_innovation.eric_von_hippel.sst
@@ -36,6 +36,7 @@
  {Eric von Hippel}http://web.mit.edu/evhippel/www/
  {Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
  {@ Wikipedia}http://en.wikipedia.org/wiki/Democratizing_Innovation
+ {Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
  {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
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 025d980..a205aa7 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
@@ -16,20 +16,17 @@
 @date:
  :published: 2002
 
-@language: US
-
 @notes: March 2002
 
-% @catalogue: isbn=0596002874
-
 @links:
  { Home and Source }http://faifzilla.org/
  {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
  {@ Wikipedia}http://en.wikipedia.org/wiki/Free_as_in_Freedom:_Richard_Stallman%27s_Crusade_for_Free_Software
  {@ Amazon.com}http://www.amazon.com/gp/product/0596002874
  {@ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0596002874
- {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
+ {Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
  {Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
+ {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
  {The Cathedral and the Bazaar, Eric S. Raymond @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
@@ -41,8 +38,6 @@
  :skin: skin_rms
  :breaks: new=:A,:B,:C,1
 
-% @promo: sisu_icon, sample_search, fsf, open_society, sisu
-
 :A~ @title @author
 
 1~preface Preface
diff --git a/data/v2/samples/free_culture.lawrence_lessig.sst b/data/v2/samples/free_culture.lawrence_lessig.sst
index cb5fe2c..f38b6a0 100644
--- a/data/v2/samples/free_culture.lawrence_lessig.sst
+++ b/data/v2/samples/free_culture.lawrence_lessig.sst
@@ -23,14 +23,6 @@
  :isbn: 9781594200069
  :oclc: 53324884
 
-% @date.created: 2004-04-08
-
-% @catalogue: isbn=1594200068
-
-@language: US
-
-@vocabulary: none
-
 @make:
  :breaks: new=:B; break=1
  :skin: skin_lessig
@@ -43,6 +35,7 @@
  {@ Amazon.com}http://www.amazon.com/gp/product/1594200068
  {@ Barnes & Noble}http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=1594200068
  {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
+ {Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
  {Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
  {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
diff --git a/data/v2/samples/free_for_all.peter_wayner.sst b/data/v2/samples/free_for_all.peter_wayner.sst
index 7a16827..5eb6ba0 100644
--- a/data/v2/samples/free_for_all.peter_wayner.sst
+++ b/data/v2/samples/free_for_all.peter_wayner.sst
@@ -31,10 +31,6 @@
  :skin: skin_wayner
  :image: center
 
-@vocabulary: none
-
-% @catalogue isbn=0066620503
-
 @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
@@ -42,6 +38,7 @@
  {@ 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
  {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
+ {Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
  {Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
  {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
diff --git a/data/v2/samples/gpl2.fsf.sst b/data/v2/samples/gpl2.fsf.sst
index 0842642..9949f41 100644
--- a/data/v2/samples/gpl2.fsf.sst
+++ b/data/v2/samples/gpl2.fsf.sst
@@ -19,7 +19,8 @@
  {GPL @ SiSU}http://www.jus.uio.no/sisu/gpl2.fsf
  {Markup}http://www.jus.uio.no/sisu/sample/markup/gpl2.fsf.sst
  {Syntax}http://www.jus.uio.no/sisu/sample/syntax/gpl2.fsf.sst.html
- { Free as In Freedom - Richard Stallman's Crusade for Free Software }http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
+ {Free as In Freedom - Richard Stallman's Crusade for Free Software}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
+ {Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
 
 @make:
  :skin: skin_gnu
diff --git a/data/v2/samples/gpl3.fsf.sst b/data/v2/samples/gpl3.fsf.sst
index 547125d..fd69535 100644
--- a/data/v2/samples/gpl3.fsf.sst
+++ b/data/v2/samples/gpl3.fsf.sst
@@ -24,13 +24,11 @@
  {GPL @ SiSU}http://www.jus.uio.no/sisu/gpl3.fsf
  { Syntax }http://www.jus.uio.no/sisu/sample/syntax/gpl.fsf.sst.html
  {GPL3 source text}http://www.gnu.org/licenses/gpl-3.0.txt
- { Free as In Freedom - Richard Stallman's Crusade for Free Software }http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
+ {Free as In Freedom - Richard Stallman's Crusade for Free Software}http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
 
 @make:
  :skin: skin_gnu
 
-% @promo: sisu_icon, fsf, open_society, sisu
-
 :A~ GNU GENERAL PUBLIC LICENSE
 
 :B~ Version 3, 29 June 2007
diff --git a/data/v2/samples/little_brother.cory_doctorow.sst b/data/v2/samples/little_brother.cory_doctorow.sst
index 16d6607..b4b6464 100644
--- a/data/v2/samples/little_brother.cory_doctorow.sst
+++ b/data/v2/samples/little_brother.cory_doctorow.sst
@@ -25,16 +25,19 @@
  :breaks: break=1
  :skin: skin_little_brother
 
-@links: { Little Brother home }http://craphound.com/littlebrother
+@links:
+ { Little Brother home }http://craphound.com/littlebrother
  {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)
+ {@ 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
  {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
+ {Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
  {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
+ {Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
  {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
 
@@ -6541,24 +6544,3 @@ Creative Commons is not a party to this License, and makes no warranty whatsoeve
 Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License.
 
 Creative Commons may be contacted at http://creativecommons.org/.
-
-% <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">
-% 	<img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/us/88x31.png"/>
-% </a>
-% <br/>
-% <span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/Text" property="dc:title" rel="dc:type">
-% 	Little Brother
-% </span>
-% 
-% by
-% 
-% <a xmlns:cc="http://creativecommons.org/ns#" href="http://craphound.com/littlebrother" property="cc:attributionName" rel="cc:attributionURL">
-% 	Cory Doctorow
-% </a>
-% 
-% is licensed under a
-% 
-% <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">
-% 	Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License
-% </a>.
-% 
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 40c59b4..207ed53 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
@@ -25,6 +25,7 @@
  {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
  {Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
+ {Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
  {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
  {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
@@ -44,8 +45,6 @@
 
 :A~ @title @author
 
-% :B~ Eric Steven Raymond
-
 1~ The Cathedral and the Bazaar
 
 Linux is subversive. Who would have thought even five years ago (1991) that a world-class operating system could coalesce as if by magic out of part-time hacking by several thousand developers scattered all over the planet, connected only by the tenuous strands of the Internet?
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 200fb92..db276f9 100644
--- a/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
+++ b/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
@@ -42,6 +42,7 @@
  {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
  {@ Wikipedia}http://en.wikipedia.org/wiki/The_Wealth_of_Networks
  {Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
+ {Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
  {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
diff --git a/data/v2/samples/two_bits.christopher_kelty.sst b/data/v2/samples/two_bits.christopher_kelty.sst
index cf63805..1a022e8 100644
--- a/data/v2/samples/two_bits.christopher_kelty.sst
+++ b/data/v2/samples/two_bits.christopher_kelty.sst
@@ -25,6 +25,7 @@
 @links:
  {Two Bits, Christopher Kelty: home page}http://twobits.net/
  {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
+ {Viral Spiral, David Bollier@ SiSU}http://www.jus.uio.no/sisu/viral_spiral.david_bollier
  {Democratizing Innovation, Eric von Hippel @ SiSU}http://www.jus.uio.no/sisu/democratizing_innovation.eric_von_hippel
  {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