51 files changed, 2 insertions, 0 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 0388ffe8..890f1758 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -63,6 +63,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.1.orig.tar.xz
 * error/warn messages, including wrappers round require
 
 * documentation, manpage README etc.
+  * sisu manual directory moved
   * removed html man pages (man2html)
 
 %% 5.3.0.orig.tar.xz (2014-01-26:03/7)
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index b1ef302a..c09040a6 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -53,6 +53,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.1.orig.tar.xz
 * error/warn messages, including wrappers round require
 
 * documentation, manpage README etc.
+  * sisu manual directory moved
   * removed html man pages (man2html)
 
 %% 6.0.0.orig.tar.xz (2014-01-26:03/7)
diff --git a/data/doc/sisu/markup-samples/sisu_manual/Rakefile b/data/doc/sisu/markup-samples/manual/Rakefile
index 1d9b5414..1d9b5414 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/Rakefile
+++ b/data/doc/sisu/markup-samples/manual/Rakefile
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png b/data/doc/sisu/markup-samples/manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
index ce5b8830..ce5b8830 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
+++ b/data/doc/sisu/markup-samples/manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/ruby_logo.png b/data/doc/sisu/markup-samples/manual/_sisu/image/ruby_logo.png
index 829e2458..829e2458 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/ruby_logo.png
+++ b/data/doc/sisu/markup-samples/manual/_sisu/image/ruby_logo.png
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/sisu.png b/data/doc/sisu/markup-samples/manual/_sisu/image/sisu.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/sisu.png
+++ b/data/doc/sisu/markup-samples/manual/_sisu/image/sisu.png
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/tux.png b/data/doc/sisu/markup-samples/manual/_sisu/image/tux.png
index 15fd152b..15fd152b 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/tux.png
+++ b/data/doc/sisu/markup-samples/manual/_sisu/image/tux.png
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml
index f12e3144..f12e3144 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn_monolingual.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml
index b3c49ca1..b3c49ca1 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn_monolingual.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml
index 71faa3e0..71faa3e0 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft_monolingual.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml
index adf144d5..adf144d5 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft_monolingual.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_lng.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml
index ca1cf424..ca1cf424 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_lng.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/sisu_document_make b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
index 72706d10..72706d10 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/sisu_document_make
+++ b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v5/sisurc.yml b/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml
index e492f789..e492f789 120000
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v5/sisurc.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v6/sisurc.yml b/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml
index e492f789..e492f789 120000
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v6/sisurc.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu.ssm b/data/doc/sisu/markup-samples/manual/en/sisu.ssm
index 79703fef..79703fef 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu.ssm
+++ b/data/doc/sisu/markup-samples/manual/en/sisu.ssm
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_commands.sst b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
index 2ca43a43..2ca43a43 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_commands.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_commands.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_config.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_config.ssi
index 3c29f995..3c29f995 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_config.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_config.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_content_directories.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_content_directories.ssi
index 182b176d..182b176d 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_content_directories.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_content_directories.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_css.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_css.ssi
index 7ffc654b..7ffc654b 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_css.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_css.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_description.sst b/data/doc/sisu/markup-samples/manual/en/sisu_description.sst
index 9f8fdcd8..9f8fdcd8 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_description.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_description.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_download.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_download.ssi
index 96c97985..96c97985 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_download.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_download.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_examples.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_examples.ssi
index cf9df9d5..cf9df9d5 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_examples.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_examples.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_faq.sst b/data/doc/sisu/markup-samples/manual/en/sisu_faq.sst
index 966cea5f..966cea5f 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_faq.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_faq.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_filetypes.sst b/data/doc/sisu/markup-samples/manual/en/sisu_filetypes.sst
index d36acac0..d36acac0 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_filetypes.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_filetypes.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_help.sst b/data/doc/sisu/markup-samples/manual/en/sisu_help.sst
index 69535085..69535085 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_help.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_help.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_help_sources.sst b/data/doc/sisu/markup-samples/manual/en/sisu_help_sources.sst
index bee5ed78..bee5ed78 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_help_sources.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_help_sources.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_homepages.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_homepages.ssi
index 3d8d95d5..3d8d95d5 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_homepages.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_homepages.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_how.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_how.ssi
index 3372bcd4..3372bcd4 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_how.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_how.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_howto.sst b/data/doc/sisu/markup-samples/manual/en/sisu_howto.sst
index 4a23bdfe..4a23bdfe 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_howto.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_howto.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_installation.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_installation.ssi
index f908bb6e..f908bb6e 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_installation.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_installation.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_interesting_to_whom.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_interesting_to_whom.ssi
index 750c46ea..750c46ea 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_interesting_to_whom.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_interesting_to_whom.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_introduction.sst b/data/doc/sisu/markup-samples/manual/en/sisu_introduction.sst
index 8978ace6..8978ace6 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_introduction.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_introduction.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_manual.ssm b/data/doc/sisu/markup-samples/manual/en/sisu_manual.ssm
index 90e8a323..90e8a323 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_manual.ssm
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_manual.ssm
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_markup.sst b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
index 69293637..69293637 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_markup.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_markup_syntax_history.sst b/data/doc/sisu/markup-samples/manual/en/sisu_markup_syntax_history.sst
index c6da0a14..c6da0a14 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_markup_syntax_history.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_markup_syntax_history.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_output_overview.sst b/data/doc/sisu/markup-samples/manual/en/sisu_output_overview.sst
index 332f4aae..332f4aae 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_output_overview.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_output_overview.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_postgresql.sst b/data/doc/sisu/markup-samples/manual/en/sisu_postgresql.sst
index 574e307c..574e307c 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_postgresql.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_postgresql.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_quickstart.sst b/data/doc/sisu/markup-samples/manual/en/sisu_quickstart.sst
index ae95f528..ae95f528 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_quickstart.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_quickstart.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_remote.sst b/data/doc/sisu/markup-samples/manual/en/sisu_remote.sst
index 959fbcf6..959fbcf6 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_remote.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_remote.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_search.ssm b/data/doc/sisu/markup-samples/manual/en/sisu_search.ssm
index 9c40a8bf..9c40a8bf 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_search.ssm
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_search.ssm
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_search_cgi.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_search_cgi.ssi
index 03eef9ff..03eef9ff 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_search_cgi.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_search_cgi.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_search_intro.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_search_intro.ssi
index d5da379f..d5da379f 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_search_intro.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_search_intro.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_short_feature_summary.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_short_feature_summary.ssi
index 294644af..294644af 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_short_feature_summary.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_short_feature_summary.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_sql.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_sql.ssi
index 6e54275b..6e54275b 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_sql.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_sql.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_sqlite.sst b/data/doc/sisu/markup-samples/manual/en/sisu_sqlite.sst
index a73ae16c..a73ae16c 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_sqlite.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_sqlite.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_synopsis.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_synopsis.ssi
index 98e5d4f3..98e5d4f3 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_synopsis.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_synopsis.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_syntax_highlighting.sst b/data/doc/sisu/markup-samples/manual/en/sisu_syntax_highlighting.sst
index ef881aae..ef881aae 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_syntax_highlighting.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_syntax_highlighting.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_webrick.sst b/data/doc/sisu/markup-samples/manual/en/sisu_webrick.sst
index 6e56e53a..6e56e53a 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_webrick.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_webrick.sst
diff --git a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_work_needed_and_wishlist.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_work_needed_and_wishlist.ssi
index 20e774ac..20e774ac 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/en/sisu_work_needed_and_wishlist.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_work_needed_and_wishlist.ssi
diff --git a/data/doc/sisu/markup-samples/sisu_manual/translation_languages b/data/doc/sisu/markup-samples/manual/translation_languages
index d84a94e8..d84a94e8 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/translation_languages
+++ b/data/doc/sisu/markup-samples/manual/translation_languages