158 files changed, 8 insertions, 0 deletions

diff --git a/data/doc/sisu/v1/sisu_markup_samples/README b/data/doc/sisu/v1/markup-samples/README
index 0b78f4ab..0b78f4ab 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/README
+++ b/data/doc/sisu/v1/markup-samples/README
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
index 0f3f4a16..0f3f4a16 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/b_doc.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/b_doc.png
index 13ca8ebe..13ca8ebe 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/b_doc.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/b_doc.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/c_Copyleft.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/c_Copyleft.png
index 5b3865b8..5b3865b8 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/c_Copyleft.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/c_Copyleft.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/c_Euro.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/c_Euro.png
index 8e5c13a9..8e5c13a9 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/c_Euro.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/c_Euro.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/debian_home.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/debian_home.png
index cee42aa0..cee42aa0 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/debian_home.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/debian_home.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/free_as_in_freedom.png
index ad4c05b2..ad4c05b2 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/free_as_in_freedom.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_01_rms.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/free_as_in_freedom_01_rms.png
index 3b4563b0..3b4563b0 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_01_rms.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/free_as_in_freedom_01_rms.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
index 5d5a57aa..5d5a57aa 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
index d84bf568..d84bf568 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
index 2ab79e1c..2ab79e1c 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/kdissert.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/kdissert.png
index 2dff3753..2dff3753 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/kdissert.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/kdissert.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/levitating_gnu.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/levitating_gnu.png
index 9a25319a..9a25319a 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/levitating_gnu.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/levitating_gnu.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/philosophical_gnu.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/philosophical_gnu.png
index ebd239ef..ebd239ef 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/philosophical_gnu.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/philosophical_gnu.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/sisu.png b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/sisu.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/image/sisu.png
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/image/sisu.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/dir/skin_sisu.rb b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/dir/skin_sisu.rb
index bd2e2a53..bd2e2a53 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/dir/skin_sisu.rb
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/dir/skin_sisu.rb
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gnu.rb b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/doc/skin_gnu.rb
index 8ac38227..8ac38227 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gnu.rb
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/doc/skin_gnu.rb
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gutenberg.rb b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/doc/skin_gutenberg.rb
index 148fbae4..148fbae4 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_gutenberg.rb
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/doc/skin_gutenberg.rb
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_kdissert.rb b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/doc/skin_kdissert.rb
index a7e08835..a7e08835 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_kdissert.rb
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/doc/skin_kdissert.rb
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_rms.rb b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/doc/skin_rms.rb
index 0f3e7d34..0f3e7d34 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/doc/skin_rms.rb
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/doc/skin_rms.rb
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/site/skin_sisu.rb b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/site/skin_sisu.rb
index bd2e2a53..bd2e2a53 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/site/skin_sisu.rb
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/site/skin_sisu.rb
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/yml/list.yml b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/list.yml
index 4aea9b94..4aea9b94 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/yml/list.yml
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/list.yml
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/yml/promo.yml b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/promo.yml
index dfbdc75d..dfbdc75d 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/yml/promo.yml
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/promo.yml
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/yml/skin_countries.yml b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/skin_countries.yml
index 179b9978..179b9978 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/yml/skin_countries.yml
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/skin_countries.yml
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/yml/skin_country.yml b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/skin_country.yml
index dc835465..dc835465 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/_sisu/skin/yml/skin_country.yml
+++ b/data/doc/sisu/v1/markup-samples/samples/_sisu/skin/yml/skin_country.yml
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/doc/sisu/v1/markup-samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index bfcd69e0..bfcd69e0 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/doc/sisu/v1/markup-samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/gpl2.fsf.sst b/data/doc/sisu/v1/markup-samples/samples/gpl2.fsf.sst
index af558ef6..af558ef6 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/gpl2.fsf.sst
+++ b/data/doc/sisu/v1/markup-samples/samples/gpl2.fsf.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/gpl3.fsf.sst b/data/doc/sisu/v1/markup-samples/samples/gpl3.fsf.sst
index 92b026ae..92b026ae 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/gpl3.fsf.sst
+++ b/data/doc/sisu/v1/markup-samples/samples/gpl3.fsf.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/samples/sisu_output_overview.ssi b/data/doc/sisu/v1/markup-samples/samples/sisu_output_overview.ssi
index e2c90529..e2c90529 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/samples/sisu_output_overview.ssi
+++ b/data/doc/sisu/v1/markup-samples/samples/sisu_output_overview.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/Rantfile b/data/doc/sisu/v1/markup-samples/sisu_manual/Rantfile
index 37198c7c..37198c7c 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/Rantfile
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/Rantfile
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/home/index.html b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/home/index.html
index b2e44e48..b2e44e48 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/home/index.html
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/home/index.html
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
index ce5b8830..ce5b8830 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/sisu.home.png b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/image/sisu.home.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/sisu.home.png
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/image/sisu.home.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/sisu.png b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/image/sisu.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/sisu.png
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/image/sisu.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/tux.png b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/image/tux.png
index 15fd152b..15fd152b 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/image/tux.png
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/image/tux.png
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/sisurc.yml
index 908992ee..908992ee 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/sisurc.yml
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/dir/skin_sisu_manual.rb b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/skin/dir/skin_sisu_manual.rb
index 86a7b6f3..86a7b6f3 120000
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/dir/skin_sisu_manual.rb
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/skin/dir/skin_sisu_manual.rb
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
index 954be971..954be971 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/yml/list.yml b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/skin/yml/list.yml
index 7d711855..7d711855 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/yml/list.yml
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/skin/yml/list.yml
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/skin/yml/promo.yml
index 40a2c190..40a2c190 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/_sisu/skin/yml/promo.yml
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu.ssm b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu.ssm
index 042140a7..042140a7 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu.ssm
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu.ssm
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_commands.sst
index 1133738e..1133738e 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_commands.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_complete.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_complete.sst
index 5e4a6873..5e4a6873 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_complete.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_complete.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_config.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_config.ssi
index 19b2d60b..19b2d60b 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_config.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_config.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_configuration.ssm b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_configuration.ssm
index 03cb1e8d..03cb1e8d 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_configuration.ssm
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_content_directories.ssi
index a1aa7a28..a1aa7a28 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_content_directories.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_css.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_css.ssi
index bf5d2d61..bf5d2d61 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_css.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_css.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_description.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_description.sst
index 43ea10e3..43ea10e3 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_description.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_description.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_doc.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_doc.sst
index cafc8851..cafc8851 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_doc.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_doc.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_download.ssi
index 26013d55..26013d55 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_download.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_examples.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_examples.ssi
index 6418054e..6418054e 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_examples.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_examples.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_examples.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_examples.sst
index 160c3d24..160c3d24 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_examples.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_examples.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_faq.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_faq.sst
index 16c77860..16c77860 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_faq.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_faq.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_filetypes.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_filetypes.sst
index 83b6f3de..83b6f3de 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_filetypes.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_help.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_help.sst
index 837efc00..837efc00 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_help.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_help.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_help_sources.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_help_sources.sst
index c6ce8f0d..c6ce8f0d 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_help_sources.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_homepages.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_homepages.ssi
index d6493996..d6493996 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_homepages.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_how.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_how.ssi
index bef17522..bef17522 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_how.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_how.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_howto.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_howto.sst
index 0219e416..0219e416 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_howto.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_howto.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_hyperestraier.ssi
index 98fe5f87..98fe5f87 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_hyperestraier.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_installation.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_installation.ssi
index 643276e7..643276e7 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_installation.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_installation.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_interesting_to_whom.ssi
index 6648b47f..6648b47f 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_interesting_to_whom.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_introduction.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_introduction.ssi
index 52ac9103..52ac9103 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_introduction.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_introduction.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_introduction.ssm b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_introduction.ssm
index 7396ffab..7396ffab 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_introduction.ssm
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_introduction.ssm
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_manual.ssm b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_manual.ssm
index 57d54b88..57d54b88 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_manual.ssm
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst
index a18e134d..a18e134d 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_output_overview.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_output_overview.sst
index 55a1f3ff..55a1f3ff 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_output_overview.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_pdf.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_pdf.sst
index 3382a1d6..3382a1d6 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_pdf.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_pdf.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_postgresql.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_postgresql.sst
index 336aef5d..336aef5d 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_postgresql.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_quickstart.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_quickstart.sst
index ffc715be..ffc715be 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_quickstart.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_remote.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_remote.sst
index 3832f9cf..3832f9cf 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_remote.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_remote.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search.ssm b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_search.ssm
index da8f5669..da8f5669 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search.ssm
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_search.ssm
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_search_cgi.ssi
index 4521f789..4521f789 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_search_cgi.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_search_examples.ssi
index 904992c4..904992c4 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_search_examples.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_search_intro.ssi
index 96fd19bb..96fd19bb 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_search_intro.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_short_feature_summary.ssi
index 62f72e8c..62f72e8c 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_short_feature_summary.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_skin.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_skin.sst
index 1e30cac8..1e30cac8 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_skin.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_skin.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_sql.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_sql.ssi
index 0f02df56..0f02df56 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_sql.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_sql.ssi
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_sqlite.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_sqlite.sst
index 00d2f185..00d2f185 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_sqlite.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_syntax_highlighting.sst
index 7057c591..7057c591 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_syntax_highlighting.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_vim.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_vim.sst
index 3652a41e..3652a41e 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_vim.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_vim.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_webrick.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_webrick.sst
index 36a52f96..36a52f96 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_webrick.sst
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_webrick.sst
diff --git a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
index 6de204dd..6de204dd 100644
--- a/data/doc/sisu/v1/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
+++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 67679774..382916a1 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,6 +12,14 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.6.1.orig.tar.gz (2010-07-08:27/4)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
+  sisu_2.6.1.orig.tar.gz
+  sisu_2.6.1-1.dsc
+  sisu_2.6.1-1.diff.gz
+
+  * markup samples moved to data/doc/sisu/v2/markup-samples
+
 %% 2.6.0.orig.tar.gz (2010-07-07:27/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
   2a02d475c12398e5cc66e961c96e65f79951c4c2863a5e88f986692563fda983 2770986 sisu_2.6.0.orig.tar.gz
diff --git a/data/doc/sisu/v2/sisu_markup_samples/README b/data/doc/sisu/v2/markup-samples/README
index 0b78f4ab..0b78f4ab 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/README
+++ b/data/doc/sisu/v2/markup-samples/README
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
index 0f3f4a16..0f3f4a16 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/b_doc.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/b_doc.png
index 13ca8ebe..13ca8ebe 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/b_doc.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/b_doc.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/c_Copyleft.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/c_Copyleft.png
index 5b3865b8..5b3865b8 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/c_Copyleft.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/c_Copyleft.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/c_Euro.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/c_Euro.png
index 8e5c13a9..8e5c13a9 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/c_Euro.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/c_Euro.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/debian_home.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/debian_home.png
index cee42aa0..cee42aa0 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/debian_home.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/debian_home.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/free_as_in_freedom.png
index ad4c05b2..ad4c05b2 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/free_as_in_freedom.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_01_rms.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/free_as_in_freedom_01_rms.png
index 3b4563b0..3b4563b0 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_01_rms.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/free_as_in_freedom_01_rms.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
index 5d5a57aa..5d5a57aa 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/free_as_in_freedom_02_rms_snr_year_report.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
index d84bf568..d84bf568 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/free_as_in_freedom_03_rms_st_ignucius.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
index 2ab79e1c..2ab79e1c 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/free_as_in_freedom_04_rms_pleasure_card.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/kdissert.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/kdissert.png
index 2dff3753..2dff3753 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/kdissert.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/kdissert.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/levitating_gnu.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/levitating_gnu.png
index 9a25319a..9a25319a 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/levitating_gnu.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/levitating_gnu.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/philosophical_gnu.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/philosophical_gnu.png
index ebd239ef..ebd239ef 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/philosophical_gnu.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/philosophical_gnu.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/sisu.png b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/sisu.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/image/sisu.png
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/image/sisu.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/dir/skin_sisu.rb b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/dir/skin_sisu.rb
index bd2e2a53..bd2e2a53 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/dir/skin_sisu.rb
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/dir/skin_sisu.rb
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/doc/skin_gnu.rb b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/doc/skin_gnu.rb
index 8ac38227..8ac38227 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/doc/skin_gnu.rb
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/doc/skin_gnu.rb
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/doc/skin_gutenberg.rb b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/doc/skin_gutenberg.rb
index 148fbae4..148fbae4 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/doc/skin_gutenberg.rb
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/doc/skin_gutenberg.rb
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/doc/skin_kdissert.rb b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/doc/skin_kdissert.rb
index a7e08835..a7e08835 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/doc/skin_kdissert.rb
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/doc/skin_kdissert.rb
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/doc/skin_rms.rb b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/doc/skin_rms.rb
index 0f3e7d34..0f3e7d34 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/doc/skin_rms.rb
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/doc/skin_rms.rb
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/site/skin_sisu.rb b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/site/skin_sisu.rb
index bd2e2a53..bd2e2a53 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/site/skin_sisu.rb
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/site/skin_sisu.rb
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/yml/list.yml b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/list.yml
index 4aea9b94..4aea9b94 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/yml/list.yml
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/list.yml
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/yml/promo.yml b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/promo.yml
index de18d07b..de18d07b 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/yml/promo.yml
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/promo.yml
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/yml/skin_countries.yml b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml
index 179b9978..179b9978 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/yml/skin_countries.yml
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_countries.yml
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/yml/skin_country.yml b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_country.yml
index dc835465..dc835465 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/_sisu/skin/yml/skin_country.yml
+++ b/data/doc/sisu/v2/markup-samples/samples/_sisu/skin/yml/skin_country.yml
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/doc/sisu/v2/markup-samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index c62a3861..c62a3861 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/doc/sisu/v2/markup-samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/gpl2.fsf.sst b/data/doc/sisu/v2/markup-samples/samples/gpl2.fsf.sst
index ceff5670..ceff5670 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/gpl2.fsf.sst
+++ b/data/doc/sisu/v2/markup-samples/samples/gpl2.fsf.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/gpl3.fsf.sst b/data/doc/sisu/v2/markup-samples/samples/gpl3.fsf.sst
index 547125d7..547125d7 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/gpl3.fsf.sst
+++ b/data/doc/sisu/v2/markup-samples/samples/gpl3.fsf.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/sisu_output_overview.ssi b/data/doc/sisu/v2/markup-samples/samples/sisu_output_overview.ssi
index e2c90529..e2c90529 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/sisu_output_overview.ssi
+++ b/data/doc/sisu/v2/markup-samples/samples/sisu_output_overview.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
index ce5b8830..ce5b8830 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/image/sisu.home.png b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/image/sisu.home.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/image/sisu.home.png
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/image/sisu.home.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/image/sisu.png b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/image/sisu.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/image/sisu.png
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/image/sisu.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/image/tux.png b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/image/tux.png
index 15fd152b..15fd152b 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/image/tux.png
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/image/tux.png
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/sisurc.yml
index 2b3df4db..2b3df4db 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/sisurc.yml
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/sisurc.yml
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/skin/dir/skin_sisu.rb b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/skin/dir/skin_sisu.rb
index 77ee1e13..77ee1e13 120000
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/skin/dir/skin_sisu.rb
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/skin/dir/skin_sisu.rb
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/skin/yml/list.yml b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/skin/yml/list.yml
index 0d4235ab..0d4235ab 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/skin/yml/list.yml
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/skin/yml/list.yml
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/skin/yml/promo.yml
index 2971ff81..2971ff81 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/_sisu/skin/yml/promo.yml
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu.ssm b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu.ssm
index c162db3f..c162db3f 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu.ssm
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu.ssm
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_commands.sst
index a406dc57..a406dc57 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_commands.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_config.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_config.ssi
index b7370b4c..b7370b4c 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_config.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_config.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_content_directories.ssi
index 11590de2..11590de2 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_content_directories.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_css.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_css.ssi
index 5ef419f1..5ef419f1 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_css.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_css.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_description.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_description.sst
index fe3b5c46..fe3b5c46 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_description.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_description.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_download.ssi
index b71ddbca..b71ddbca 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_download.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_examples.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_examples.ssi
index 64a1fe90..64a1fe90 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_examples.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_examples.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_examples.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_examples.sst
index 9460615e..9460615e 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_examples.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_examples.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_faq.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_faq.sst
index 3acbbb74..3acbbb74 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_faq.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_faq.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_filetypes.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_filetypes.sst
index 55ab627f..55ab627f 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_filetypes.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_help.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_help.sst
index c10807bd..c10807bd 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_help.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_help.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_help_sources.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_help_sources.sst
index edd4699e..edd4699e 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_help_sources.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_homepages.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_homepages.ssi
index 31b44c1c..31b44c1c 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_homepages.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_how.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_how.ssi
index 7928abb5..7928abb5 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_how.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_how.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_howto.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_howto.sst
index d53bafa2..d53bafa2 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_howto.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_howto.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_hyperestraier.ssi
index 4b528900..4b528900 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_hyperestraier.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_installation.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_installation.ssi
index adf5b921..adf5b921 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_installation.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_installation.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_interesting_to_whom.ssi
index f3a94e0e..f3a94e0e 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_interesting_to_whom.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_interesting_to_whom.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_introduction.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_introduction.sst
index e2df51d0..e2df51d0 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_introduction.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_introduction.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_manual.ssm b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_manual.ssm
index 48c6d681..48c6d681 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_manual.ssm
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst
index 331e6af5..331e6af5 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_output_overview.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_output_overview.sst
index 92d5274e..92d5274e 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_output_overview.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_postgresql.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_postgresql.sst
index addf1bd1..addf1bd1 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_postgresql.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_quickstart.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_quickstart.sst
index 652b12f2..652b12f2 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_quickstart.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_remote.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_remote.sst
index 3f85743f..3f85743f 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_remote.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_remote.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_search.ssm b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_search.ssm
index e72d2a4c..e72d2a4c 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_search.ssm
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_search.ssm
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_search_cgi.ssi
index 7e7e211f..7e7e211f 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_search_cgi.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_search_intro.ssi
index 24ae1cea..24ae1cea 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_search_intro.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_short_feature_summary.ssi
index 0009352e..0009352e 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_short_feature_summary.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_short_feature_summary.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_skin.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_skin.sst
index 9cff0ed7..9cff0ed7 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_skin.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_skin.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_sql.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_sql.ssi
index 0f2e8b7b..0f2e8b7b 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_sql.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_sql.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_sqlite.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_sqlite.sst
index 7f312e0f..7f312e0f 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_sqlite.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_synopsis.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_synopsis.ssi
index 909cb2c2..909cb2c2 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_synopsis.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_synopsis.ssi
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_syntax_highlighting.sst
index 24f72c71..24f72c71 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_syntax_highlighting.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_webrick.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_webrick.sst
index 52f8c579..52f8c579 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_webrick.sst
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_webrick.sst
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
index 98f46e1f..98f46e1f 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
+++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_work_needed_and_wishlist.ssi