73 files changed, 27 insertions, 15 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 33bb044..4829944 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,23 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu-markup-samples_1.0.12.orig.tar.gz (2009-12-20:50/6)
+http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.12.orig.tar.gz
+  sisu-markup-samples_1.0.12.orig.tar.gz
+  sisu-markup-samples_1.0.12-1.dsc
+  sisu-markup-samples_1.0.12-1.diff.gz
+
+  * package directory structure changed for sisu version 1.0.0, v1 directory
+    introduced to allow parallel maintenance of markup changes if any in v2
+
+  * sisu 1.0.0 does not support older style headers, old style markup samples
+   removed
+
+  * change in some samples first heading that will affect object numbering,
+    first headings, where title (and author) take from header metadata, all
+    placed in heading level A (previoulsy spread across level A & B) which will
+    affect object numbers
+
 %% sisu-markup-samples_1.0.11.orig.tar.gz (2009-07-16:28/4)
 http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.11.orig.tar.gz
   bcc7961a26329ed35877d972d0401fc642d1e720966bed3e5b64de8ab3ade965 3443605 sisu-markup-samples_1.0.11.orig.tar.gz
diff --git a/README b/README
index 0849004..ce4a01c 100644
--- a/README
+++ b/README
@@ -14,8 +14,8 @@ On Debian:
 
 (b) this package is placed in non-free, as the documents are released under the
 author or original publisher's license, and the substantive texts of the
-document usually may not be altered and as a result they do not conform to the
-debian free software guidelines
+document is to be kept un-altered, which falls outside the debian free software
+guidelines
 
 (c) this package would be placed in /usr/share/doc/sisu/sisu_markup_samples as
 reference material on how to markup documents
diff --git a/data/sisu_markup_samples/non-free/README b/data/v1/sisu_markup_samples/non-free/README
index f346a36..f346a36 100644
--- a/data/sisu_markup_samples/non-free/README
+++ b/data/v1/sisu_markup_samples/non-free/README
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/DebTuxRuby3.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/DebTuxRuby3.png
index 327d3ca..327d3ca 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/DebTuxRuby3.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/DebTuxRuby3.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/DebTuxRubySiSU.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/DebTuxRubySiSU.png
index 06109cd..06109cd 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/DebTuxRubySiSU.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/DebTuxRubySiSU.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/Gnu_Debian_Linux_Ruby_Better_Way.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/Gnu_Debian_Linux_Ruby_Better_Way.png
index ce5b883..ce5b883 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/Gnu_Debian_Linux_Ruby_Better_Way.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/Gnu_Debian_Linux_Ruby_Better_Way.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/b_doc.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/b_doc.png
index 13ca8eb..13ca8eb 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/b_doc.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/b_doc.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/ffa.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/ffa.png
index ab2256c..ab2256c 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/ffa.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/ffa.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/free.for.all.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/free.for.all.png
index ab2256c..ab2256c 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/free.for.all.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/free.for.all.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture.home.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture.home.png
index 3d47f5d..3d47f5d 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture.home.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture.home.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture01.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture01.png
index 6167da7..6167da7 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture01.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture01.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture02.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture02.png
index b3e27f2..b3e27f2 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture02.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture02.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture03.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture03.png
index 294ef07..294ef07 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture03.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture03.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture04.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture04.png
index 11e3723..11e3723 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture04.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture04.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture05.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture05.png
index 01a0978..01a0978 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture05.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture05.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture06.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture06.png
index cc5bfad..cc5bfad 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture06.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture06.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture07.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture07.png
index 177745f..177745f 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture07.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture07.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture08.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture08.png
index a82c2fe..a82c2fe 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture08.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture08.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture09.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture09.png
index a440b83..a440b83 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture09.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture09.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture10.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture10.png
index db76856..db76856 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture10.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture10.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture11.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture11.png
index 52d70a9..52d70a9 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture11.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture11.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture12.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture12.png
index 140db0f..140db0f 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture12.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture12.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture13.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture13.png
index 3c716c0..3c716c0 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture13.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture13.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture14.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture14.png
index cccfa69..cccfa69 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture14.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture14.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture15.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture15.png
index 19db29c..19db29c 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture15.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture15.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture16.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture16.png
index 919a54d..919a54d 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture16.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture16.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture17.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture17.png
index 1f94fc2..1f94fc2 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture17.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture17.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture18.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture18.png
index b18dc8d..b18dc8d 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture18.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture18.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture_bcode.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture_bcode.png
index c318556..c318556 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture_bcode.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture_bcode.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/freeculture_book.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture_book.png
index 89dc002..89dc002 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/freeculture_book.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/freeculture_book.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/gutenberg.home.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/gutenberg.home.png
index e6e021c..e6e021c 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/gutenberg.home.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/gutenberg.home.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/gutenberg_icon.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/gutenberg_icon.png
index 2f6466b..2f6466b 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/gutenberg_icon.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/gutenberg_icon.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/lessig.jpg b/data/v1/sisu_markup_samples/non-free/_sisu/image/lessig.jpg
index 7c0f716..7c0f716 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/lessig.jpg
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/lessig.jpg
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/rdgl.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/rdgl.png
index 979471d..979471d 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/rdgl.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/rdgl.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/ruby_takes_over.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/ruby_takes_over.png
index be93387..be93387 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/ruby_takes_over.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/ruby_takes_over.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/sisu.deb.tux.ruby.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/sisu.deb.tux.ruby.png
index 327d3ca..327d3ca 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/sisu.deb.tux.ruby.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/sisu.deb.tux.ruby.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/sisu.home.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/sisu.home.png
index 202d8c4..202d8c4 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/sisu.home.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/sisu.home.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/sisu.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/sisu.png
index b449fa6..b449fa6 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/sisu.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/sisu.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/thumb_ruby_takes_over.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/thumb_ruby_takes_over.png
index 13f1582..13f1582 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/thumb_ruby_takes_over.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/thumb_ruby_takes_over.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/tux_ruby.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/tux_ruby.png
index f4a86ed..f4a86ed 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/tux_ruby.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/tux_ruby.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/wayner.home.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/wayner.home.png
index debf9b2..debf9b2 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/wayner.home.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/wayner.home.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/wayner.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/wayner.png
index debf9b2..debf9b2 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/wayner.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/wayner.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler.png
index 06d5c14..06d5c14 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_2_1.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_2_1.png
index 20887d4..20887d4 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_2_1.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_2_1.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_6_1.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_6_1.png
index b959f84..b959f84 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_6_1.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_6_1.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_1.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_1.png
index 8aa93f8..8aa93f8 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_1.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_1.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_3a.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_3a.png
index 4c42126..4c42126 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_3a.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_3a.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_3b.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_3b.png
index 3ce123a..3ce123a 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_3b.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_3b.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_4.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_4.png
index 073d810..073d810 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_4.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_4.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_5.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_5.png
index b9e778b..b9e778b 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_5.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_5.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_6.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_6.png
index f53daf3..f53daf3 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_6.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_7_6.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_9_1.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_9_1.png
index 814ed19..814ed19 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_9_1.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_9_1.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_book.png b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_book.png
index 986e17e..986e17e 100644
--- a/data/sisu_markup_samples/non-free/_sisu/image/won_benkler_book.png
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/image/won_benkler_book.png
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/dir/skin_sisu.rb b/data/v1/sisu_markup_samples/non-free/_sisu/skin/dir/skin_sisu.rb
index 6dbc2c4..6dbc2c4 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/dir/skin_sisu.rb
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/skin/dir/skin_sisu.rb
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gnu.rb b/data/v1/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gnu.rb
index a5ea67e..a5ea67e 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gnu.rb
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gnu.rb
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gutenberg.rb b/data/v1/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gutenberg.rb
index 379fcce..379fcce 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gutenberg.rb
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gutenberg.rb
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_lessig.rb b/data/v1/sisu_markup_samples/non-free/_sisu/skin/doc/skin_lessig.rb
index 465af85..465af85 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_lessig.rb
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/skin/doc/skin_lessig.rb
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_wayner.rb b/data/v1/sisu_markup_samples/non-free/_sisu/skin/doc/skin_wayner.rb
index 64c5413..64c5413 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_wayner.rb
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/skin/doc/skin_wayner.rb
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_won_benkler.rb b/data/v1/sisu_markup_samples/non-free/_sisu/skin/doc/skin_won_benkler.rb
index 2798214..2798214 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_won_benkler.rb
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/skin/doc/skin_won_benkler.rb
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/site/skin_sisu.rb b/data/v1/sisu_markup_samples/non-free/_sisu/skin/site/skin_sisu.rb
index 6dbc2c4..6dbc2c4 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/site/skin_sisu.rb
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/skin/site/skin_sisu.rb
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_countries.yaml b/data/v1/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_countries.yaml
index a68903e..a68903e 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_countries.yaml
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_countries.yaml
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_country.yaml b/data/v1/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_country.yaml
index ebaf8ac..ebaf8ac 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_country.yaml
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_country.yaml
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_lexAddress.yaml b/data/v1/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_lexAddress.yaml
index 6e49b54..6e49b54 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_lexAddress.yaml
+++ b/data/v1/sisu_markup_samples/non-free/_sisu/skin/yaml/skin_lexAddress.yaml
diff --git a/data/sisu_markup_samples/non-free/autonomy_markup0.sst b/data/v1/sisu_markup_samples/non-free/autonomy_markup0.sst
index 4f4579d..4f4579d 100644
--- a/data/sisu_markup_samples/non-free/autonomy_markup0.sst
+++ b/data/v1/sisu_markup_samples/non-free/autonomy_markup0.sst
diff --git a/data/sisu_markup_samples/non-free/autonomy_markup1.sst b/data/v1/sisu_markup_samples/non-free/autonomy_markup1.sst
index c521dac..c521dac 100644
--- a/data/sisu_markup_samples/non-free/autonomy_markup1.sst
+++ b/data/v1/sisu_markup_samples/non-free/autonomy_markup1.sst
diff --git a/data/sisu_markup_samples/non-free/autonomy_markup2.sst b/data/v1/sisu_markup_samples/non-free/autonomy_markup2.sst
index b9ef7ef..b9ef7ef 100644
--- a/data/sisu_markup_samples/non-free/autonomy_markup2.sst
+++ b/data/v1/sisu_markup_samples/non-free/autonomy_markup2.sst
diff --git a/data/sisu_markup_samples/non-free/autonomy_markup3.sst b/data/v1/sisu_markup_samples/non-free/autonomy_markup3.sst
index 20a20bf..20a20bf 100644
--- a/data/sisu_markup_samples/non-free/autonomy_markup3.sst
+++ b/data/v1/sisu_markup_samples/non-free/autonomy_markup3.sst
diff --git a/data/sisu_markup_samples/non-free/free_culture.lawrence_lessig.sst b/data/v1/sisu_markup_samples/non-free/free_culture.lawrence_lessig.sst
index 6e80448..6e80448 100644
--- a/data/sisu_markup_samples/non-free/free_culture.lawrence_lessig.sst
+++ b/data/v1/sisu_markup_samples/non-free/free_culture.lawrence_lessig.sst
diff --git a/data/sisu_markup_samples/non-free/free_for_all.peter_wayner.sst b/data/v1/sisu_markup_samples/non-free/free_for_all.peter_wayner.sst
index 263b43c..263b43c 100644
--- a/data/sisu_markup_samples/non-free/free_for_all.peter_wayner.sst
+++ b/data/v1/sisu_markup_samples/non-free/free_for_all.peter_wayner.sst
diff --git a/data/sisu_markup_samples/non-free/the_cathedral_and_the_bazaar.eric_s_raymond.sst b/data/v1/sisu_markup_samples/non-free/the_cathedral_and_the_bazaar.eric_s_raymond.sst
index e54e85a..e54e85a 100644
--- a/data/sisu_markup_samples/non-free/the_cathedral_and_the_bazaar.eric_s_raymond.sst
+++ b/data/v1/sisu_markup_samples/non-free/the_cathedral_and_the_bazaar.eric_s_raymond.sst
diff --git a/data/sisu_markup_samples/non-free/the_wealth_of_networks.yochai_benkler.sst b/data/v1/sisu_markup_samples/non-free/the_wealth_of_networks.yochai_benkler.sst
index 55c95a9..55c95a9 100644
--- a/data/sisu_markup_samples/non-free/the_wealth_of_networks.yochai_benkler.sst
+++ b/data/v1/sisu_markup_samples/non-free/the_wealth_of_networks.yochai_benkler.sst
diff --git a/data/sisu_markup_samples/non-free/un_contracts_international_sale_of_goods_convention_1980.sst b/data/v1/sisu_markup_samples/non-free/un_contracts_international_sale_of_goods_convention_1980.sst
index a95ee7f..a95ee7f 100644
--- a/data/sisu_markup_samples/non-free/un_contracts_international_sale_of_goods_convention_1980.sst
+++ b/data/v1/sisu_markup_samples/non-free/un_contracts_international_sale_of_goods_convention_1980.sst
diff --git a/man/man1/sisu_markup_samples.1 b/man/man1/sisu_markup_samples.1
index 68c6010..1f83e3b 100644
--- a/man/man1/sisu_markup_samples.1
+++ b/man/man1/sisu_markup_samples.1
@@ -7,7 +7,7 @@
 .\"    groff -man -Tascii sisu.1
 .\"    nroff -man sisu.1 | most 
 .\"  |sisu.1|@|^|<url:sisu.1> 
-.TH sisu_examples 1  "October 31, 2006" "version 0.48" "SiSU markup samples and configuration related offerings (optional package)"
+.TH sisu_examples 1  "December 21, 2009" "version 1.0" "SiSU markup samples and configuration related offerings (optional package)"
 .SH NAME
 .B SiSU
 \- Structured information, Serialized Units \- a document publishing system
@@ -16,14 +16,14 @@
 .PP
 This is an optional package of sisu examples, mainly sample markup files.
 They are installed installed under 
-.I /usr/share/sisu\-examples
+.I /usr/share/doc/sisu/v1/sisu_markup_samples
 or the equivalent directory (change this path as appropriate for the information provided below).
 .SH Document Markup
 .PP
 Sample markup documents are located in
-.I /usr/share/doc/sisu/sisu_markup_samples/dfsg
+.I /usr/share/doc/sisu/v1/sisu_markup_samples/dfsg
 and these document samples in
-.I /usr/share/doc/sisu/sisu_markup_samples/non\-free
+.I /usr/share/doc/sisu/v1/sisu_markup_samples/non\-free
 (or the equivalent shared directory)
 .PP
 A few more sample documents are available at
@@ -31,16 +31,16 @@ A few more sample documents are available at
 .SH Cgi database frontend
 .PP
 A simple example of a cgi frontend to query a sisu created postgresql database is to be found under:
-.I /usr/share/sisu/conf/cgi\-bin
+.I /usr/share/sisu/v1/conf/cgi\-bin
 .SH Configuration samples
 .PP
 Some configuration files are located at:
-.I /usr/share/sisu/conf
+.I /usr/share/sisu/v1/conf
 .\"%% Vim
 .SH Vim support files
 .PP
 Vim support is provided by way of an ftplugin/sisu file, installed automatically in Debian, else located under
-.I /usr/share/sisu/conf/vim
+.I /usr/share/sisu/v1/conf/editor\-syntax\-etc/vim
 .PP
 This provides, vim folds, syntax higlighting a color file and some default settings.
 .PP
@@ -48,12 +48,7 @@ if not installed place filetype and ftplugin under
 .I ~/.vim
 .PP
 Other syntax highlighters
-.I /usr/share/sisu/conf/syntax
-.SH Conversion
-.PP
-Some very rough initial conversion from html routines using wvWare
-.I /usr/share/sisu/conf/convert
-(not tested recently)
+.I /usr/share/sisu/v1/conf/editor\-syntax\-etc
 .\"%% Further Information
 .SH FURTHER INFORMATION
 .PP