changelog bring forward release; sisu_manual, small things

2 files changed, 31 insertions, 313 deletions

diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst
index 9eee7886..c3fb7830 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help.sst
@@ -49,17 +49,11 @@
 
 The most up to date information on sisu should be contained in the sisu_manual, available at:
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/
+_1 http://sisudoc.org/sisu/sisu_manual/
 
-and (from SiSU 0.59 onwards) installed locally at:
+The manual source can be found within the SiSU tarball at:
 
-_1 /usr/share/doc/sisu/sisu_manual/
-
-or equivalent directory
-
-Within the SiSU tarball at:
-
-_1 ./data/doc/sisu/sisu_manual/
+_1 ./data/doc/sisu/sisu_markup_samples/sisu_manual/
 
 % The manual pages provided with SiSU are also available online, and there is an interactive help, which is being superseded by the man page, and possibly some document which contains this component.
 
@@ -131,6 +125,4 @@ _1 /usr/share/doc/sisu/sisu_manual/sisu_help_sources/index.html
 
 _1 /usr/share/doc/sisu/html/sisu_help_sources/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_help_sources/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/index.html
+_1 http://sisudoc.org/sisu/sisu_help_sources/index.html
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
index 6de7b0fa..e2a85890 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
@@ -55,17 +55,11 @@ _1 man sisu_help
 
 !_ man2html
 
-_1 file:///usr/share/doc/sisu/html/sisu_help.1.html
-
 _1 http://www.jus.uio.no/sisu/man/sisu_help.1.html
 
 !_ sisu generated output - links to html
 
-_1 file:///usr/share/doc/sisu/sisu_manual/sisu_help/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_help/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_help/index.html
+_1 http://sisudoc.org/sisu/sisu_help/index.html
 
 !_ help sources lists
 
@@ -73,13 +67,7 @@ Alternative sources for this help sources page listed here:
 
 _1 man sisu_help_sources
 
-_1 file:///usr/share/doc/sisu/sisu_manual/sisu_help_sources/index.html
-
-_1 file:///usr/share/doc/sisu/html/sisu_help_sources/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_help_sources/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/index.html
+_1 http://sisudoc.org/sisu/sisu_help_sources/index.html
 
 2~ man pages
 
@@ -87,221 +75,75 @@ _1 http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/index.html
 
 _1 man sisu
 
-% _1 man sisu_commands
-
 _1 man 7 sisu_complete
 
-% _1 man sisu_configuration
-
-% _1 man sisu_faq
-
-% _1 man sisu_filetypes
-
-% _1 man sisu_help
-
-% _1 man sisu_help_sources
-
-% _1 man 8 sisu_howto
-
-% _1 man sisu_introduction
-
-% _1 man sisu_markup
-
-% _1 man sisu_output_overview
-
 _1 man 7 sisu_pdf
 
 _1 man 7 sisu_postgresql
 
-% _1 man 8 sisu_quickstart
-
-% _1 man 8 sisu_remote
-
-% _1 man 8 sisu_search
-
-% _1 man sisu_skin
-
 _1 man 7 sisu_sqlite
 
-% _1 man 8 sisu_syntax_highlighting
-
 _1 man sisu_termsheet
 
-% _1 man 7 sisu_vim
-
 _1 man sisu_webrick
 
 2~ sisu generated output - links to html
 
 Note SiSU documentation is prepared in SiSU and output is available in multiple formats including amongst others html, pdf, and odf which may be also be accessed via the html pages~{ named index.html or more extensively through sisu_manifest.html }~
 
-3~ locally installed
-
-file:///usr/share/doc/sisu/sisu_manual/sisu_manual/index.html
-
-file:///usr/share/doc/sisu/sisu_manual/sisu_help/index.html
-
-file:///usr/share/doc/sisu/sisu_manual/sisu_help_sources/index.html
-
-_1 /usr/share/doc/sisu/sisu_manual/sisu/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_commands/index.html
-
-_1 /usr/share/doc/sisu/sisu_manual/sisu_complete/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_configuration/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_description/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_examples/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_faq/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_filetypes/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_help/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_help_sources/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_howto/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_introduction/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_manual/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_markup/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_output_overview/index.html
-
-_1 /usr/share/doc/sisu/sisu_manual/sisu_pdf/index.html
-
-_1 /usr/share/doc/sisu/sisu_manual/sisu_postgresql/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_quickstart/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_remote/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_search/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_skin/index.html
-
-_1 /usr/share/doc/sisu/sisu_manual/sisu_sqlite/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_syntax_highlighting/index.html
-
-_1 /usr/share/doc/sisu/sisu_manual/sisu_termsheet/index.html
-
-% _1 /usr/share/doc/sisu/sisu_manual/sisu_vim/index.html
-
-_1 /usr/share/doc/sisu/sisu_manual/sisu_webrick/index.html
-
 3~ www.sisudoc.org
 
-http://sisudoc.org/sisu/sisu_manual_manual/index.html
+http://sisudoc.org/sisu/sisu_manual/index.html
 
 _1 http://sisudoc.org/sisu/sisu_manual/index.html
 
-_1 http://sisudoc.org/sisu/sisu_manual_commands/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_complete/index.html
+_1 http://sisudoc.org/sisu/sisu_commands/index.html
 
-_1 http://sisudoc.org/sisu/sisu_manual_configuration/index.html
+_1 http://sisudoc.org/sisu/sisu_complete/index.html
 
-_1 http://sisudoc.org/sisu/sisu_manual_description/index.html
+_1 http://sisudoc.org/sisu/sisu_configuration/index.html
 
-_1 http://sisudoc.org/sisu/sisu_manual_examples/index.html
+_1 http://sisudoc.org/sisu/sisu_description/index.html
 
-_1 http://sisudoc.org/sisu/sisu_manual_faq/index.html
+_1 http://sisudoc.org/sisu/sisu_examples/index.html
 
-_1 http://sisudoc.org/sisu/sisu_manual_filetypes/index.html
+_1 http://sisudoc.org/sisu/sisu_faq/index.html
 
-_1 http://sisudoc.org/sisu/sisu_manual_help/index.html
+_1 http://sisudoc.org/sisu/sisu_filetypes/index.html
 
-_1 http://sisudoc.org/sisu/sisu_manual_help_sources/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_howto/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_introduction/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_manual/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_markup/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_output_overview/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_pdf/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_postgresql/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_quickstart/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_remote/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_search/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_skin/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_sqlite/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_syntax_highlighting/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_vim/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_webrick/index.html
-
-3~ www.jus.uio.no/sisu
+_1 http://sisudoc.org/sisu/sisu_help/index.html
 
-http://www.jus.uio.no/sisu/sisu_manual/sisu_manual/index.html
+_1 http://sisudoc.org/sisu/sisu_help_sources/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu/index.html
+_1 http://sisudoc.org/sisu/sisu_howto/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_commands/index.html
+_1 http://sisudoc.org/sisu/sisu_introduction/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_complete/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_configuration/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_description/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_examples/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_faq/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_filetypes/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_help/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_howto/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_introduction/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_manual/index.html
+_1 http://sisudoc.org/sisu/sisu_manual/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_markup/index.html
+_1 http://sisudoc.org/sisu/sisu_markup/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_output_overview/index.html
+_1 http://sisudoc.org/sisu/sisu_output_overview/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_pdf/index.html
+_1 http://sisudoc.org/sisu/sisu_pdf/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_postgresql/index.html
+_1 http://sisudoc.org/sisu/sisu_postgresql/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_quickstart/index.html
+_1 http://sisudoc.org/sisu/sisu_quickstart/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_remote/index.html
+_1 http://sisudoc.org/sisu/sisu_remote/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_search/index.html
+_1 http://sisudoc.org/sisu/sisu_search/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_skin/index.html
+_1 http://sisudoc.org/sisu/sisu_skin/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_sqlite/index.html
+_1 http://sisudoc.org/sisu/sisu_sqlite/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_syntax_highlighting/index.html
+_1 http://sisudoc.org/sisu/sisu_syntax_highlighting/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_vim/index.html
+_1 http://sisudoc.org/sisu/sisu_vim/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_webrick/index.html
+_1 http://sisudoc.org/sisu/sisu_webrick/index.html
 
 2~ man2html
 
@@ -315,142 +157,26 @@ file:///usr/share/doc/sisu/html/sisu_help_sources.1.html
 
 _1 /usr/share/doc/sisu/html/sisu.1.html
 
-% _1 /usr/share/doc/sisu/html/sisu_commands.1.html
-
-% _1 /usr/share/doc/sisu/html/sisu_complete.7.html
-
-% _1 /usr/share/doc/sisu/html/sisu_configuration.1.html
-
-% _1 /usr/share/doc/sisu/html/sisu_description.1.html
-
-% _1 /usr/share/doc/sisu/html/sisu_examples.1.html
-
-% _1 /usr/share/doc/sisu/html/sisu_faq.8.html
-
-% _1 /usr/share/doc/sisu/html/sisu_filetypes.1.html
-
-% _1 /usr/share/doc/sisu/html/sisu_help.1.html
-
-% _1 /usr/share/doc/sisu/html/sisu_help_sources.1.html
-
-% _1 /usr/share/doc/sisu/html/sisu_howto.8.html
-
-% _1 /usr/share/doc/sisu/html/sisu_introduction.1.html
-
-% _1 /usr/share/doc/sisu/html/sisu_manual.1.html
-
-% _1 /usr/share/doc/sisu/html/sisu_markup.1.html
-
-% _1 /usr/share/doc/sisu/html/sisu_output_overview.1.html
-
 _1 /usr/share/doc/sisu/html/sisu_pdf.7.html
 
 _1 /usr/share/doc/sisu/html/sisu_postgresql.7.html
 
-% _1 /usr/share/doc/sisu/html/sisu_quickstart.8.html
-
-% _1 /usr/share/doc/sisu/html/sisu_remote.8.html
-
-% _1 /usr/share/doc/sisu/html/sisu_search.8.html
-
-% _1 /usr/share/doc/sisu/html/sisu_skin.1.html
-
 _1 /usr/share/doc/sisu/html/sisu_sqlite.7.html
 
-% _1 /usr/share/doc/sisu/html/sisu_syntax_highlighting.8.html
-
-% _1 /usr/share/doc/sisu/html/sisu_vim.7.html
-
 _1 /usr/share/doc/sisu/html/sisu_webrick.1.html
 
-3~ www.sisudoc.org
-
-http:///sisudoc.org/man/sisu_manual.1.html
-
-http:///sisudoc.org/man/sisu_help.1.html
-
-http:///sisudoc.org/man/sisu_help_sources.1.html
-
-_1 http://sisudoc.org/sisu/sisu_manual.1.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_commands.1.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_complete.7.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_configuration.1.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_faq.8.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_help.1.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_help_sources.1.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_howto.8.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_markup.1.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_pdf.7.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_postgresql.7.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_quickstart.8.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_remote.8.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_search.8.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_skin.1.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_sqlite.7.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_syntax_highlighting.8.html
-
-% _1 http://sisudoc.org/sisu/sisu_manual_vim.7.html
-
-_1 http://sisudoc.org/sisu/sisu_manual_webrick.1.html
-
 3~ www.jus.uio.no/sisu
 
 http://www.jus.uio.no/sisu/man/sisu.1.html
 
-http://www.jus.uio.no/sisu/man/sisu_help.1.html
-
-http://www.jus.uio.no/sisu/man/sisu_help_sources.1.html
-
 _1 http://www.jus.uio.no/sisu/man/sisu.1.html
 
-% _1 http://www.jus.uio.no/sisu/man/sisu_commands.1.html
-
 _1 http://www.jus.uio.no/sisu/man/sisu_complete.7.html
 
-% _1 http://www.jus.uio.no/sisu/man/sisu_configuration.1.html
-
-% _1 http://www.jus.uio.no/sisu/man/sisu_faq.8.html
-
-% _1 http://www.jus.uio.no/sisu/man/sisu_help.1.html
-
-% _1 http://www.jus.uio.no/sisu/man/sisu_help_sources.1.html
-
-% _1 http://www.jus.uio.no/sisu/man/sisu_howto.8.html
-
-% _1 http://www.jus.uio.no/sisu/man/sisu_markup.1.html
-
 _1 http://www.jus.uio.no/sisu/man/sisu_pdf.7.html
 
 _1 http://www.jus.uio.no/sisu/man/sisu_postgresql.7.html
 
-% _1 http://www.jus.uio.no/sisu/man/sisu_quickstart.8.html
-
-% _1 http://www.jus.uio.no/sisu/man/sisu_remote.8.html
-
-% _1 http://www.jus.uio.no/sisu/man/sisu_search.8.html
-
-% _1 http://www.jus.uio.no/sisu/man/sisu_skin.1.html
-
 _1 http://www.jus.uio.no/sisu/man/sisu_sqlite.7.html
 
-% _1 http://www.jus.uio.no/sisu/man/sisu_syntax_highlighting.8.html
-
-% _1 http://www.jus.uio.no/sisu/man/sisu_vim.7.html
-
 _1 http://www.jus.uio.no/sisu/man/sisu_webrick.1.html