115 files changed, 5 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1b5db9a..27c5cb3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,9 +16,11 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
 
   * removes v1 branch, v1 markup (headers) no longer supported by sisu (v3)
 
-  [Note: sisu v3 (and v2) will run against the contents of the v2 directory, a
-  v3 directory may be introduced as v3 permits alternative directory structure
-  using language code for markup source]
+  * v2 & v3 samples moved to common directory data/samples
+    [Note: sisu v2 and v3 will run against the same docuements, separate v2 and
+    v3 directories may be introduced later if determined to be useful (e.g. v3
+    permits alternative directory structure using language code for markup
+    source]
 
 %% sisu-markup-samples_2.0.7.orig.tar.gz (2010-10-11:41/1)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.7.orig.tar.gz
diff --git a/data/v2/samples/_sisu/image/2bits.png b/data/samples/_sisu/image/2bits.png
index 3c182f9..3c182f9 100644
--- a/data/v2/samples/_sisu/image/2bits.png
+++ b/data/samples/_sisu/image/2bits.png
diff --git a/data/v2/samples/_sisu/image/2bits_02_01-100.png b/data/samples/_sisu/image/2bits_02_01-100.png
index 4d81dc7..4d81dc7 100644
--- a/data/v2/samples/_sisu/image/2bits_02_01-100.png
+++ b/data/samples/_sisu/image/2bits_02_01-100.png
diff --git a/data/v2/samples/_sisu/image/2bits_03_02-100.png b/data/samples/_sisu/image/2bits_03_02-100.png
index 4298cb9..4298cb9 100644
--- a/data/v2/samples/_sisu/image/2bits_03_02-100.png
+++ b/data/samples/_sisu/image/2bits_03_02-100.png
diff --git a/data/v2/samples/_sisu/image/2bits_05_03-100.png b/data/samples/_sisu/image/2bits_05_03-100.png
index 00dadbf..00dadbf 100644
--- a/data/v2/samples/_sisu/image/2bits_05_03-100.png
+++ b/data/samples/_sisu/image/2bits_05_03-100.png
diff --git a/data/v2/samples/_sisu/image/2bits_05_04-100.png b/data/samples/_sisu/image/2bits_05_04-100.png
index f7b5134..f7b5134 100644
--- a/data/v2/samples/_sisu/image/2bits_05_04-100.png
+++ b/data/samples/_sisu/image/2bits_05_04-100.png
diff --git a/data/v2/samples/_sisu/image/2bits_05_05-100.png b/data/samples/_sisu/image/2bits_05_05-100.png
index 42f0948..42f0948 100644
--- a/data/v2/samples/_sisu/image/2bits_05_05-100.png
+++ b/data/samples/_sisu/image/2bits_05_05-100.png
diff --git a/data/v2/samples/_sisu/image/2bits_05_06-100.png b/data/samples/_sisu/image/2bits_05_06-100.png
index 5716f20..5716f20 100644
--- a/data/v2/samples/_sisu/image/2bits_05_06-100.png
+++ b/data/samples/_sisu/image/2bits_05_06-100.png
diff --git a/data/v2/samples/_sisu/image/2bits_08_07-100.png b/data/samples/_sisu/image/2bits_08_07-100.png
index 707b2ad..707b2ad 100644
--- a/data/v2/samples/_sisu/image/2bits_08_07-100.png
+++ b/data/samples/_sisu/image/2bits_08_07-100.png
diff --git a/data/v2/samples/_sisu/image/2bits_09_08-100.png b/data/samples/_sisu/image/2bits_09_08-100.png
index 383a958..383a958 100644
--- a/data/v2/samples/_sisu/image/2bits_09_08-100.png
+++ b/data/samples/_sisu/image/2bits_09_08-100.png
diff --git a/data/v2/samples/_sisu/image/2bits_09_09-100.png b/data/samples/_sisu/image/2bits_09_09-100.png
index 779a4d5..779a4d5 100644
--- a/data/v2/samples/_sisu/image/2bits_09_09-100.png
+++ b/data/samples/_sisu/image/2bits_09_09-100.png
diff --git a/data/v2/samples/_sisu/image/2bits_large.png b/data/samples/_sisu/image/2bits_large.png
index 63de770..63de770 100644
--- a/data/v2/samples/_sisu/image/2bits_large.png
+++ b/data/samples/_sisu/image/2bits_large.png
diff --git a/data/v2/samples/_sisu/image/DebTuxRuby3.png b/data/samples/_sisu/image/DebTuxRuby3.png
index 327d3ca..327d3ca 100644
--- a/data/v2/samples/_sisu/image/DebTuxRuby3.png
+++ b/data/samples/_sisu/image/DebTuxRuby3.png
diff --git a/data/v2/samples/_sisu/image/DebTuxRubySiSU.png b/data/samples/_sisu/image/DebTuxRubySiSU.png
index 06109cd..06109cd 100644
--- a/data/v2/samples/_sisu/image/DebTuxRubySiSU.png
+++ b/data/samples/_sisu/image/DebTuxRubySiSU.png
diff --git a/data/v2/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png b/data/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
index 0f3f4a1..0f3f4a1 100644
--- a/data/v2/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
+++ b/data/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
diff --git a/data/v2/samples/_sisu/image/accelerando_stross.png b/data/samples/_sisu/image/accelerando_stross.png
index 4a03130..4a03130 100644
--- a/data/v2/samples/_sisu/image/accelerando_stross.png
+++ b/data/samples/_sisu/image/accelerando_stross.png
diff --git a/data/v2/samples/_sisu/image/b_doc.png b/data/samples/_sisu/image/b_doc.png
index 13ca8eb..13ca8eb 100644
--- a/data/v2/samples/_sisu/image/b_doc.png
+++ b/data/samples/_sisu/image/b_doc.png
diff --git a/data/v2/samples/_sisu/image/c_Copyleft.png b/data/samples/_sisu/image/c_Copyleft.png
index 5b3865b..5b3865b 100644
--- a/data/v2/samples/_sisu/image/c_Copyleft.png
+++ b/data/samples/_sisu/image/c_Copyleft.png
diff --git a/data/v2/samples/_sisu/image/di_evh.png b/data/samples/_sisu/image/di_evh.png
index 9938981..9938981 100644
--- a/data/v2/samples/_sisu/image/di_evh.png
+++ b/data/samples/_sisu/image/di_evh.png
diff --git a/data/v2/samples/_sisu/image/di_evh_f1-1.png b/data/samples/_sisu/image/di_evh_f1-1.png
index eb884e9..eb884e9 100644
--- a/data/v2/samples/_sisu/image/di_evh_f1-1.png
+++ b/data/samples/_sisu/image/di_evh_f1-1.png
diff --git a/data/v2/samples/_sisu/image/di_evh_f10-1.png b/data/samples/_sisu/image/di_evh_f10-1.png
index ce41d83..ce41d83 100644
--- a/data/v2/samples/_sisu/image/di_evh_f10-1.png
+++ b/data/samples/_sisu/image/di_evh_f10-1.png
diff --git a/data/v2/samples/_sisu/image/di_evh_f11-1.png b/data/samples/_sisu/image/di_evh_f11-1.png
index 4534358..4534358 100644
--- a/data/v2/samples/_sisu/image/di_evh_f11-1.png
+++ b/data/samples/_sisu/image/di_evh_f11-1.png
diff --git a/data/v2/samples/_sisu/image/di_evh_f11-2.png b/data/samples/_sisu/image/di_evh_f11-2.png
index 7f17b42..7f17b42 100644
--- a/data/v2/samples/_sisu/image/di_evh_f11-2.png
+++ b/data/samples/_sisu/image/di_evh_f11-2.png
diff --git a/data/v2/samples/_sisu/image/di_evh_f5-1.png b/data/samples/_sisu/image/di_evh_f5-1.png
index caab88f..caab88f 100644
--- a/data/v2/samples/_sisu/image/di_evh_f5-1.png
+++ b/data/samples/_sisu/image/di_evh_f5-1.png
diff --git a/data/v2/samples/_sisu/image/ffa.png b/data/samples/_sisu/image/ffa.png
index ab2256c..ab2256c 100644
--- a/data/v2/samples/_sisu/image/ffa.png
+++ b/data/samples/_sisu/image/ffa.png
diff --git a/data/v2/samples/_sisu/image/free.for.all.png b/data/samples/_sisu/image/free.for.all.png
index ab2256c..ab2256c 100644
--- a/data/v2/samples/_sisu/image/free.for.all.png
+++ b/data/samples/_sisu/image/free.for.all.png
diff --git a/data/v2/samples/_sisu/image/free_as_in_freedom.png b/data/samples/_sisu/image/free_as_in_freedom.png
index ad4c05b..ad4c05b 100644
--- a/data/v2/samples/_sisu/image/free_as_in_freedom.png
+++ b/data/samples/_sisu/image/free_as_in_freedom.png
diff --git a/data/v2/samples/_sisu/image/free_as_in_freedom_01_rms.png b/data/samples/_sisu/image/free_as_in_freedom_01_rms.png
index 3b4563b..3b4563b 100644
--- a/data/v2/samples/_sisu/image/free_as_in_freedom_01_rms.png
+++ b/data/samples/_sisu/image/free_as_in_freedom_01_rms.png
diff --git a/data/v2/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png b/data/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
index 5d5a57a..5d5a57a 100644
--- a/data/v2/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
+++ b/data/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
diff --git a/data/v2/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png b/data/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
index d84bf56..d84bf56 100644
--- a/data/v2/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
+++ b/data/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
diff --git a/data/v2/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png b/data/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
index 2ab79e1..2ab79e1 100644
--- a/data/v2/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
+++ b/data/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
diff --git a/data/v2/samples/_sisu/image/freeculture.home.png b/data/samples/_sisu/image/freeculture.home.png
index 3d47f5d..3d47f5d 100644
--- a/data/v2/samples/_sisu/image/freeculture.home.png
+++ b/data/samples/_sisu/image/freeculture.home.png
diff --git a/data/v2/samples/_sisu/image/freeculture01.png b/data/samples/_sisu/image/freeculture01.png
index 6167da7..6167da7 100644
--- a/data/v2/samples/_sisu/image/freeculture01.png
+++ b/data/samples/_sisu/image/freeculture01.png
diff --git a/data/v2/samples/_sisu/image/freeculture02.png b/data/samples/_sisu/image/freeculture02.png
index b3e27f2..b3e27f2 100644
--- a/data/v2/samples/_sisu/image/freeculture02.png
+++ b/data/samples/_sisu/image/freeculture02.png
diff --git a/data/v2/samples/_sisu/image/freeculture03.png b/data/samples/_sisu/image/freeculture03.png
index 294ef07..294ef07 100644
--- a/data/v2/samples/_sisu/image/freeculture03.png
+++ b/data/samples/_sisu/image/freeculture03.png
diff --git a/data/v2/samples/_sisu/image/freeculture04.png b/data/samples/_sisu/image/freeculture04.png
index 11e3723..11e3723 100644
--- a/data/v2/samples/_sisu/image/freeculture04.png
+++ b/data/samples/_sisu/image/freeculture04.png
diff --git a/data/v2/samples/_sisu/image/freeculture05.png b/data/samples/_sisu/image/freeculture05.png
index 01a0978..01a0978 100644
--- a/data/v2/samples/_sisu/image/freeculture05.png
+++ b/data/samples/_sisu/image/freeculture05.png
diff --git a/data/v2/samples/_sisu/image/freeculture06.png b/data/samples/_sisu/image/freeculture06.png
index cc5bfad..cc5bfad 100644
--- a/data/v2/samples/_sisu/image/freeculture06.png
+++ b/data/samples/_sisu/image/freeculture06.png
diff --git a/data/v2/samples/_sisu/image/freeculture07.png b/data/samples/_sisu/image/freeculture07.png
index 177745f..177745f 100644
--- a/data/v2/samples/_sisu/image/freeculture07.png
+++ b/data/samples/_sisu/image/freeculture07.png
diff --git a/data/v2/samples/_sisu/image/freeculture08.png b/data/samples/_sisu/image/freeculture08.png
index a82c2fe..a82c2fe 100644
--- a/data/v2/samples/_sisu/image/freeculture08.png
+++ b/data/samples/_sisu/image/freeculture08.png
diff --git a/data/v2/samples/_sisu/image/freeculture09.png b/data/samples/_sisu/image/freeculture09.png
index a440b83..a440b83 100644
--- a/data/v2/samples/_sisu/image/freeculture09.png
+++ b/data/samples/_sisu/image/freeculture09.png
diff --git a/data/v2/samples/_sisu/image/freeculture10.png b/data/samples/_sisu/image/freeculture10.png
index db76856..db76856 100644
--- a/data/v2/samples/_sisu/image/freeculture10.png
+++ b/data/samples/_sisu/image/freeculture10.png
diff --git a/data/v2/samples/_sisu/image/freeculture11.png b/data/samples/_sisu/image/freeculture11.png
index 52d70a9..52d70a9 100644
--- a/data/v2/samples/_sisu/image/freeculture11.png
+++ b/data/samples/_sisu/image/freeculture11.png
diff --git a/data/v2/samples/_sisu/image/freeculture12.png b/data/samples/_sisu/image/freeculture12.png
index 140db0f..140db0f 100644
--- a/data/v2/samples/_sisu/image/freeculture12.png
+++ b/data/samples/_sisu/image/freeculture12.png
diff --git a/data/v2/samples/_sisu/image/freeculture13.png b/data/samples/_sisu/image/freeculture13.png
index 3c716c0..3c716c0 100644
--- a/data/v2/samples/_sisu/image/freeculture13.png
+++ b/data/samples/_sisu/image/freeculture13.png
diff --git a/data/v2/samples/_sisu/image/freeculture14.png b/data/samples/_sisu/image/freeculture14.png
index cccfa69..cccfa69 100644
--- a/data/v2/samples/_sisu/image/freeculture14.png
+++ b/data/samples/_sisu/image/freeculture14.png
diff --git a/data/v2/samples/_sisu/image/freeculture15.png b/data/samples/_sisu/image/freeculture15.png
index 19db29c..19db29c 100644
--- a/data/v2/samples/_sisu/image/freeculture15.png
+++ b/data/samples/_sisu/image/freeculture15.png
diff --git a/data/v2/samples/_sisu/image/freeculture16.png b/data/samples/_sisu/image/freeculture16.png
index 919a54d..919a54d 100644
--- a/data/v2/samples/_sisu/image/freeculture16.png
+++ b/data/samples/_sisu/image/freeculture16.png
diff --git a/data/v2/samples/_sisu/image/freeculture17.png b/data/samples/_sisu/image/freeculture17.png
index 1f94fc2..1f94fc2 100644
--- a/data/v2/samples/_sisu/image/freeculture17.png
+++ b/data/samples/_sisu/image/freeculture17.png
diff --git a/data/v2/samples/_sisu/image/freeculture18.png b/data/samples/_sisu/image/freeculture18.png
index b18dc8d..b18dc8d 100644
--- a/data/v2/samples/_sisu/image/freeculture18.png
+++ b/data/samples/_sisu/image/freeculture18.png
diff --git a/data/v2/samples/_sisu/image/freeculture_bcode.png b/data/samples/_sisu/image/freeculture_bcode.png
index c318556..c318556 100644
--- a/data/v2/samples/_sisu/image/freeculture_bcode.png
+++ b/data/samples/_sisu/image/freeculture_bcode.png
diff --git a/data/v2/samples/_sisu/image/freeculture_book.png b/data/samples/_sisu/image/freeculture_book.png
index 89dc002..89dc002 100644
--- a/data/v2/samples/_sisu/image/freeculture_book.png
+++ b/data/samples/_sisu/image/freeculture_book.png
diff --git a/data/v2/samples/_sisu/image/gutenberg.home.png b/data/samples/_sisu/image/gutenberg.home.png
index e6e021c..e6e021c 100644
--- a/data/v2/samples/_sisu/image/gutenberg.home.png
+++ b/data/samples/_sisu/image/gutenberg.home.png
diff --git a/data/v2/samples/_sisu/image/gutenberg_icon.png b/data/samples/_sisu/image/gutenberg_icon.png
index 2f6466b..2f6466b 100644
--- a/data/v2/samples/_sisu/image/gutenberg_icon.png
+++ b/data/samples/_sisu/image/gutenberg_icon.png
diff --git a/data/v2/samples/_sisu/image/lessig.jpg b/data/samples/_sisu/image/lessig.jpg
index 7c0f716..7c0f716 100644
--- a/data/v2/samples/_sisu/image/lessig.jpg
+++ b/data/samples/_sisu/image/lessig.jpg
diff --git a/data/v2/samples/_sisu/image/levitating_gnu.png b/data/samples/_sisu/image/levitating_gnu.png
index 9a25319..9a25319 100644
--- a/data/v2/samples/_sisu/image/levitating_gnu.png
+++ b/data/samples/_sisu/image/levitating_gnu.png
diff --git a/data/v2/samples/_sisu/image/little_brother_doctorow.png b/data/samples/_sisu/image/little_brother_doctorow.png
index 66893a2..66893a2 100644
--- a/data/v2/samples/_sisu/image/little_brother_doctorow.png
+++ b/data/samples/_sisu/image/little_brother_doctorow.png
diff --git a/data/v2/samples/_sisu/image/philosophical_gnu.png b/data/samples/_sisu/image/philosophical_gnu.png
index ebd239e..ebd239e 100644
--- a/data/v2/samples/_sisu/image/philosophical_gnu.png
+++ b/data/samples/_sisu/image/philosophical_gnu.png
diff --git a/data/v2/samples/_sisu/image/rdgl.png b/data/samples/_sisu/image/rdgl.png
index 979471d..979471d 100644
--- a/data/v2/samples/_sisu/image/rdgl.png
+++ b/data/samples/_sisu/image/rdgl.png
diff --git a/data/v2/samples/_sisu/image/ruby_takes_over.png b/data/samples/_sisu/image/ruby_takes_over.png
index be93387..be93387 100644
--- a/data/v2/samples/_sisu/image/ruby_takes_over.png
+++ b/data/samples/_sisu/image/ruby_takes_over.png
diff --git a/data/v2/samples/_sisu/image/sisu.deb.tux.ruby.png b/data/samples/_sisu/image/sisu.deb.tux.ruby.png
index 327d3ca..327d3ca 100644
--- a/data/v2/samples/_sisu/image/sisu.deb.tux.ruby.png
+++ b/data/samples/_sisu/image/sisu.deb.tux.ruby.png
diff --git a/data/v2/samples/_sisu/image/sisu.home.png b/data/samples/_sisu/image/sisu.home.png
index 202d8c4..202d8c4 100644
--- a/data/v2/samples/_sisu/image/sisu.home.png
+++ b/data/samples/_sisu/image/sisu.home.png
diff --git a/data/v2/samples/_sisu/image/sisu.png b/data/samples/_sisu/image/sisu.png
index b449fa6..b449fa6 100644
--- a/data/v2/samples/_sisu/image/sisu.png
+++ b/data/samples/_sisu/image/sisu.png
diff --git a/data/v2/samples/_sisu/image/thumb_ruby_takes_over.png b/data/samples/_sisu/image/thumb_ruby_takes_over.png
index 13f1582..13f1582 100644
--- a/data/v2/samples/_sisu/image/thumb_ruby_takes_over.png
+++ b/data/samples/_sisu/image/thumb_ruby_takes_over.png
diff --git a/data/v2/samples/_sisu/image/tux_ruby.png b/data/samples/_sisu/image/tux_ruby.png
index f4a86ed..f4a86ed 100644
--- a/data/v2/samples/_sisu/image/tux_ruby.png
+++ b/data/samples/_sisu/image/tux_ruby.png
diff --git a/data/v2/samples/_sisu/image/vs_db_1.png b/data/samples/_sisu/image/vs_db_1.png
index 4a9bfd1..4a9bfd1 100644
--- a/data/v2/samples/_sisu/image/vs_db_1.png
+++ b/data/samples/_sisu/image/vs_db_1.png
diff --git a/data/v2/samples/_sisu/image/wayner.home.png b/data/samples/_sisu/image/wayner.home.png
index debf9b2..debf9b2 100644
--- a/data/v2/samples/_sisu/image/wayner.home.png
+++ b/data/samples/_sisu/image/wayner.home.png
diff --git a/data/v2/samples/_sisu/image/wayner.png b/data/samples/_sisu/image/wayner.png
index debf9b2..debf9b2 100644
--- a/data/v2/samples/_sisu/image/wayner.png
+++ b/data/samples/_sisu/image/wayner.png
diff --git a/data/v2/samples/_sisu/image/won_benkler.png b/data/samples/_sisu/image/won_benkler.png
index 06d5c14..06d5c14 100644
--- a/data/v2/samples/_sisu/image/won_benkler.png
+++ b/data/samples/_sisu/image/won_benkler.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_2_1.png b/data/samples/_sisu/image/won_benkler_2_1.png
index 20887d4..20887d4 100644
--- a/data/v2/samples/_sisu/image/won_benkler_2_1.png
+++ b/data/samples/_sisu/image/won_benkler_2_1.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_6_1.png b/data/samples/_sisu/image/won_benkler_6_1.png
index b959f84..b959f84 100644
--- a/data/v2/samples/_sisu/image/won_benkler_6_1.png
+++ b/data/samples/_sisu/image/won_benkler_6_1.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_7_1.png b/data/samples/_sisu/image/won_benkler_7_1.png
index 8aa93f8..8aa93f8 100644
--- a/data/v2/samples/_sisu/image/won_benkler_7_1.png
+++ b/data/samples/_sisu/image/won_benkler_7_1.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_7_2.png b/data/samples/_sisu/image/won_benkler_7_2.png
index fe2ac37..fe2ac37 100644
--- a/data/v2/samples/_sisu/image/won_benkler_7_2.png
+++ b/data/samples/_sisu/image/won_benkler_7_2.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_7_3a.png b/data/samples/_sisu/image/won_benkler_7_3a.png
index 4c42126..4c42126 100644
--- a/data/v2/samples/_sisu/image/won_benkler_7_3a.png
+++ b/data/samples/_sisu/image/won_benkler_7_3a.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_7_3b.png b/data/samples/_sisu/image/won_benkler_7_3b.png
index 3ce123a..3ce123a 100644
--- a/data/v2/samples/_sisu/image/won_benkler_7_3b.png
+++ b/data/samples/_sisu/image/won_benkler_7_3b.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_7_4.png b/data/samples/_sisu/image/won_benkler_7_4.png
index 073d810..073d810 100644
--- a/data/v2/samples/_sisu/image/won_benkler_7_4.png
+++ b/data/samples/_sisu/image/won_benkler_7_4.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_7_5.png b/data/samples/_sisu/image/won_benkler_7_5.png
index b9e778b..b9e778b 100644
--- a/data/v2/samples/_sisu/image/won_benkler_7_5.png
+++ b/data/samples/_sisu/image/won_benkler_7_5.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_7_6.png b/data/samples/_sisu/image/won_benkler_7_6.png
index f53daf3..f53daf3 100644
--- a/data/v2/samples/_sisu/image/won_benkler_7_6.png
+++ b/data/samples/_sisu/image/won_benkler_7_6.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_9_1.png b/data/samples/_sisu/image/won_benkler_9_1.png
index 814ed19..814ed19 100644
--- a/data/v2/samples/_sisu/image/won_benkler_9_1.png
+++ b/data/samples/_sisu/image/won_benkler_9_1.png
diff --git a/data/v2/samples/_sisu/image/won_benkler_book.png b/data/samples/_sisu/image/won_benkler_book.png
index 986e17e..986e17e 100644
--- a/data/v2/samples/_sisu/image/won_benkler_book.png
+++ b/data/samples/_sisu/image/won_benkler_book.png
diff --git a/data/v2/samples/_sisu/skin/dir/skin_sisu.rb b/data/samples/_sisu/skin/dir/skin_sisu.rb
index bd2e2a5..bd2e2a5 100644
--- a/data/v2/samples/_sisu/skin/dir/skin_sisu.rb
+++ b/data/samples/_sisu/skin/dir/skin_sisu.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_2bits.rb b/data/samples/_sisu/skin/doc/skin_2bits.rb
index 4cee523..4cee523 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_2bits.rb
+++ b/data/samples/_sisu/skin/doc/skin_2bits.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_accelerando_stross.rb b/data/samples/_sisu/skin/doc/skin_accelerando_stross.rb
index 75cf6dd..75cf6dd 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_accelerando_stross.rb
+++ b/data/samples/_sisu/skin/doc/skin_accelerando_stross.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_content.rb b/data/samples/_sisu/skin/doc/skin_content.rb
index 9ca3c0a..9ca3c0a 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_content.rb
+++ b/data/samples/_sisu/skin/doc/skin_content.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_di_von_hippel.rb b/data/samples/_sisu/skin/doc/skin_di_von_hippel.rb
index 3448e58..3448e58 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_di_von_hippel.rb
+++ b/data/samples/_sisu/skin/doc/skin_di_von_hippel.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_for_the_win.rb b/data/samples/_sisu/skin/doc/skin_for_the_win.rb
index 6d82e6c..6d82e6c 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_for_the_win.rb
+++ b/data/samples/_sisu/skin/doc/skin_for_the_win.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_gnu.rb b/data/samples/_sisu/skin/doc/skin_gnu.rb
index 8ac3822..8ac3822 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_gnu.rb
+++ b/data/samples/_sisu/skin/doc/skin_gnu.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_gutenberg.rb b/data/samples/_sisu/skin/doc/skin_gutenberg.rb
index 148fbae..148fbae 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_gutenberg.rb
+++ b/data/samples/_sisu/skin/doc/skin_gutenberg.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_lessig.rb b/data/samples/_sisu/skin/doc/skin_lessig.rb
index 0e2be20..0e2be20 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_lessig.rb
+++ b/data/samples/_sisu/skin/doc/skin_lessig.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_little_brother.rb b/data/samples/_sisu/skin/doc/skin_little_brother.rb
index 751fba0..751fba0 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_little_brother.rb
+++ b/data/samples/_sisu/skin/doc/skin_little_brother.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_magic_kingdom.rb b/data/samples/_sisu/skin/doc/skin_magic_kingdom.rb
index b000239..b000239 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_magic_kingdom.rb
+++ b/data/samples/_sisu/skin/doc/skin_magic_kingdom.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_rms.rb b/data/samples/_sisu/skin/doc/skin_rms.rb
index 0f3e7d3..0f3e7d3 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_rms.rb
+++ b/data/samples/_sisu/skin/doc/skin_rms.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_vs_david_bollier.rb b/data/samples/_sisu/skin/doc/skin_vs_david_bollier.rb
index d357797..d357797 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_vs_david_bollier.rb
+++ b/data/samples/_sisu/skin/doc/skin_vs_david_bollier.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_wayner.rb b/data/samples/_sisu/skin/doc/skin_wayner.rb
index cfc761e..cfc761e 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_wayner.rb
+++ b/data/samples/_sisu/skin/doc/skin_wayner.rb
diff --git a/data/v2/samples/_sisu/skin/doc/skin_won_benkler.rb b/data/samples/_sisu/skin/doc/skin_won_benkler.rb
index f883045..f883045 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_won_benkler.rb
+++ b/data/samples/_sisu/skin/doc/skin_won_benkler.rb
diff --git a/data/v2/samples/_sisu/skin/site/skin_sisu.rb b/data/samples/_sisu/skin/site/skin_sisu.rb
index bd2e2a5..bd2e2a5 100644
--- a/data/v2/samples/_sisu/skin/site/skin_sisu.rb
+++ b/data/samples/_sisu/skin/site/skin_sisu.rb
diff --git a/data/v2/samples/_sisu/skin/yml/list.yml b/data/samples/_sisu/skin/yml/list.yml
index e02a153..e02a153 100644
--- a/data/v2/samples/_sisu/skin/yml/list.yml
+++ b/data/samples/_sisu/skin/yml/list.yml
diff --git a/data/v2/samples/_sisu/skin/yml/promo.yml b/data/samples/_sisu/skin/yml/promo.yml
index a52f874..a52f874 100644
--- a/data/v2/samples/_sisu/skin/yml/promo.yml
+++ b/data/samples/_sisu/skin/yml/promo.yml
diff --git a/data/v2/samples/accelerando.charles_stross.sst b/data/samples/accelerando.charles_stross.sst
index 24eabd8..24eabd8 100644
--- a/data/v2/samples/accelerando.charles_stross.sst
+++ b/data/samples/accelerando.charles_stross.sst
diff --git a/data/v2/samples/autonomy_markup0.sst b/data/samples/autonomy_markup0.sst
index 5803660..5803660 100644
--- a/data/v2/samples/autonomy_markup0.sst
+++ b/data/samples/autonomy_markup0.sst
diff --git a/data/v2/samples/content.cory_doctorow.sst b/data/samples/content.cory_doctorow.sst
index 88d90cf..88d90cf 100644
--- a/data/v2/samples/content.cory_doctorow.sst
+++ b/data/samples/content.cory_doctorow.sst
diff --git a/data/v2/samples/democratizing_innovation.eric_von_hippel.sst b/data/samples/democratizing_innovation.eric_von_hippel.sst
index f47afc5..f47afc5 100644
--- a/data/v2/samples/democratizing_innovation.eric_von_hippel.sst
+++ b/data/samples/democratizing_innovation.eric_von_hippel.sst
diff --git a/data/v2/samples/down_and_out_in_the_magic_kingdom.cory_doctorow.sst b/data/samples/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
index b9aa6a2..b9aa6a2 100644
--- a/data/v2/samples/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
+++ b/data/samples/down_and_out_in_the_magic_kingdom.cory_doctorow.sst
diff --git a/data/v2/samples/for_the_win.cory_doctorow.sst b/data/samples/for_the_win.cory_doctorow.sst
index 4bc3f23..4bc3f23 100644
--- a/data/v2/samples/for_the_win.cory_doctorow.sst
+++ b/data/samples/for_the_win.cory_doctorow.sst
diff --git a/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index 213c76e..213c76e 100644
--- a/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
diff --git a/data/v2/samples/free_culture.lawrence_lessig.sst b/data/samples/free_culture.lawrence_lessig.sst
index a2e059a..a2e059a 100644
--- a/data/v2/samples/free_culture.lawrence_lessig.sst
+++ b/data/samples/free_culture.lawrence_lessig.sst
diff --git a/data/v2/samples/free_for_all.peter_wayner.sst b/data/samples/free_for_all.peter_wayner.sst
index 27f4136..27f4136 100644
--- a/data/v2/samples/free_for_all.peter_wayner.sst
+++ b/data/samples/free_for_all.peter_wayner.sst
diff --git a/data/v2/samples/gpl2.fsf.sst b/data/samples/gpl2.fsf.sst
index 1d06226..1d06226 100644
--- a/data/v2/samples/gpl2.fsf.sst
+++ b/data/samples/gpl2.fsf.sst
diff --git a/data/v2/samples/gpl3.fsf.sst b/data/samples/gpl3.fsf.sst
index 2767991..2767991 100644
--- a/data/v2/samples/gpl3.fsf.sst
+++ b/data/samples/gpl3.fsf.sst
diff --git a/data/v2/samples/little_brother.cory_doctorow.sst b/data/samples/little_brother.cory_doctorow.sst
index 1fa2658..1fa2658 100644
--- a/data/v2/samples/little_brother.cory_doctorow.sst
+++ b/data/samples/little_brother.cory_doctorow.sst
diff --git a/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst b/data/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
index d7f4c4e..d7f4c4e 100644
--- a/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
+++ b/data/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
diff --git a/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst b/data/samples/the_wealth_of_networks.yochai_benkler.sst
index 13cdf9b..13cdf9b 100644
--- a/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
+++ b/data/samples/the_wealth_of_networks.yochai_benkler.sst
diff --git a/data/v2/samples/two_bits.christopher_kelty.sst b/data/samples/two_bits.christopher_kelty.sst
index 1cff4f9..1cff4f9 100644
--- a/data/v2/samples/two_bits.christopher_kelty.sst
+++ b/data/samples/two_bits.christopher_kelty.sst
diff --git a/data/v2/samples/un_contracts_international_sale_of_goods_convention_1980.sst b/data/samples/un_contracts_international_sale_of_goods_convention_1980.sst
index 392f21f..392f21f 100644
--- a/data/v2/samples/un_contracts_international_sale_of_goods_convention_1980.sst
+++ b/data/samples/un_contracts_international_sale_of_goods_convention_1980.sst
diff --git a/data/v2/samples/viral_spiral.david_bollier.sst b/data/samples/viral_spiral.david_bollier.sst
index 0f98794..0f98794 100644
--- a/data/v2/samples/viral_spiral.david_bollier.sst
+++ b/data/samples/viral_spiral.david_bollier.sst