Merge branch 'upstream' into debian/sid

37 files changed, 136 insertions, 87 deletions

diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile b/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile
index 8d02220c..8c56dbb8 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/Rantfile
@@ -149,11 +149,11 @@ def files_all
   files
 end
 def filelist_docs
-  files='sisu_manual.ssm sisu_introduction.sst sisu_help.sst sisu_help_sources.sst sisu_commands.sst sisu_markup.sst sisu_filetypes.sst sisu_config.ssi sisu_skin.sst sisu_css.ssi sisu_content_directories.ssi sisu_homepages.ssi sisu_examples.sst sisu_output_overview.sst sisu_search.sst sisu_webrick.sst sisu_quickstart.sst sisu_faq.sst sisu_syntax_highlighting.sst sisu_configuration.ssm sisu_description.sst sisu_remote.sst sisu_complete.sst sisu_postgresql.sst sisu_sqlite.sst sisu_pdf.sst sisu_search.ssm sisu_vim.sst' # sisu_output_types.ssm sisu_sql.sst sisu_hyperestraier.sst sisu_latex.sst sisu_odf.sst sisu_xml.sst sisu_concordance.sst sisu_document_digest_certificate.sst document_digest_certificate.sst sisu_markup_source.sst sisupod.sst
+  files='sisu_manual.ssm sisu_introduction.sst sisu_help.sst sisu_help_sources.sst sisu_commands.sst sisu_markup.sst sisu_filetypes.sst sisu_config.ssi sisu_skin.sst sisu_css.ssi sisu_content_directories.ssi sisu_homepages.ssi sisu_examples.sst sisu_output_overview.sst sisu_search.sst sisu_webrick.sst sisu_quickstart.sst sisu_faq.sst sisu_syntax_highlighting.sst sisu_configuration.ssm sisu_description.sst sisu_remote.sst sisu_complete.sst sisu_postgresql.sst sisu_sqlite.sst sisu_pdf.sst sisu_search.ssm sisu_vim.sst sisu_doc.sst' # sisu_output_types.ssm sisu_sql.sst sisu_hyperestraier.sst sisu_latex.sst sisu_odf.sst sisu_xml.sst sisu_concordance.sst sisu_document_digest_certificate.sst document_digest_certificate.sst sisu_markup_source.sst sisupod.sst
   files
 end
 def filelist_manpage
-  files='sisu.ssm sisu_introduction.sst sisu_help.sst sisu_help_sources.sst sisu_commands.sst sisu_markup.sst sisu_filetypes.sst sisu_config.ssi sisu_skin.sst sisu_css.ssi sisu_content_directories.ssi sisu_homepages.ssi sisu_examples.ssi sisu_output_overview.sst sisu_search.ssi sisu_webrick.sst sisu_download.ssi sisu_installation.ssi sisu_quickstart.sst sisu_howto.sst sisu_faq.sst sisu_syntax_highlighting.sst sisu_configuration.ssm sisu_remote.sst sisu_complete.sst sisu_postgresql.sst sisu_sqlite.sst sisu_pdf.sst sisu_search.ssm sisu_vim.sst' # sisu_output_types.ssm sisu_sql.sst sisu_hyperestraier.sst sisu_latex.sst sisu_odf.sst sisu_xml.sst sisu_concordance.sst sisu_document_digest_certificate.sst document_digest_certificate.sst sisu_markup_source.sst sisupod.sst
+  files='sisu.ssm sisu_introduction.sst sisu_help.sst sisu_help_sources.sst sisu_commands.sst sisu_markup.sst sisu_filetypes.sst sisu_config.ssi sisu_skin.sst sisu_css.ssi sisu_content_directories.ssi sisu_homepages.ssi sisu_examples.ssi sisu_output_overview.sst sisu_search.ssi sisu_webrick.sst sisu_download.ssi sisu_installation.ssi sisu_quickstart.sst sisu_howto.sst sisu_faq.sst sisu_syntax_highlighting.sst sisu_configuration.ssm sisu_remote.sst sisu_complete.sst sisu_postgresql.sst sisu_sqlite.sst sisu_pdf.sst sisu_search.ssm sisu_vim.sst sisu_doc.sst' # sisu_output_types.ssm sisu_sql.sst sisu_hyperestraier.sst sisu_latex.sst sisu_odf.sst sisu_xml.sst sisu_concordance.sst sisu_document_digest_certificate.sst document_digest_certificate.sst sisu_markup_source.sst sisupod.sst
   #puts files + "\n\n"
   files
 end
@@ -171,7 +171,7 @@ end
 def manpage_move
 #  ../../sisu_manual/man
   files_man1=['sisu.1','sisu_commands.1','sisu_markup.1','sisu_configuration.1','sisu_webrick.1','sisu_help.1','sisu_help_sources.1','sisu_skin.1']
-  files_man7=['sisu_complete.1','sisu_postgresql.1','sisu_sqlite.1','sisu_pdf.1', 'sisu_vim.1'] # 'sisu_output_types.1' 'sisu_sql.1', 'sisu_hyperestraier.1', 'sisu_latex.1', 'sisu_odf.1', 'sisu_xml.1', 'sisu_concordance.1', 'sisu_document_digest_certificate.1', 'sisu_markup_source.1', 'sisupod.1'
+  files_man7=['sisu_complete.1','sisu_doc.1','sisu_postgresql.1','sisu_sqlite.1','sisu_pdf.1', 'sisu_vim.1'] # 'sisu_output_types.1' 'sisu_sql.1', 'sisu_hyperestraier.1', 'sisu_latex.1', 'sisu_odf.1', 'sisu_xml.1', 'sisu_concordance.1', 'sisu_document_digest_certificate.1', 'sisu_markup_source.1', 'sisupod.1'
   files_man8=['sisu_quickstart.1','sisu_howto.1','sisu_faq.1','sisu_syntax_highlighting.1','sisu_remote.1','sisu_search.1']
   man_section(files_man1,'1')
   man_section(files_man7,'7')
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
index 81462785..7e7a1add 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
@@ -1,8 +1,8 @@
 % SiSU master 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Manual [0.58]
+@subtitle: Manual
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst
index ec0500a7..41cac0a2 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_commands.sst
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Commands [0.58]
+@subtitle: Commands
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst
index 873110e7..ac177878 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_complete.sst
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Complete Package [0.58]
+@subtitle: Complete Package
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi
index 9a5cc00c..7b514430 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_config.ssi
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Search [0.58]
+@subtitle: Search
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
index 48f780a6..586ce4d0 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Configuration [0.58]
+@subtitle: Configuration
 
 @creator: Ralph Amissah
 
@@ -43,8 +43,6 @@
 
 :A~? @title @creator
 
-% :B~? SiSU Configuration and Skins
-
 :B~? Configuration of Environment
 
 % :C~ Environment
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
index 9d572c54..ba869922 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_content_directories.ssi
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Content Directories, Organising Content [0.58]
+@subtitle: Content Directories, Organising Content
 
 @creator: Ralph Amissah
 
@@ -45,8 +45,6 @@
 
 :B~? Content Directories
 
-:C~? Content Directories
-
 1~organising_content Organising Content
 
 2~ Directory Structure and Mapping
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi
index 57e8a77c..684aaf60 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_css.ssi
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Skins [0.58]
+@subtitle: CSS - Cascading Style Sheets
 
 @creator: Ralph Amissah
 
@@ -43,10 +43,6 @@
 
 :A~? CSS
 
-:B~? CSS
-
-:C~? CSS
-
 1~css CSS - Cascading Style Sheets (for html, XHTML and XML)
 
 CSS files to modify the appearance of SiSU html, XHTML or XML may be placed in the configuration directory: ./_sisu/css ; ~/.sisu/css or; /etc/sisu/css and these will be copied to the output directories with the command sisu -CC.
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst
index a0ae729c..05930df7 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_description.sst
@@ -1,6 +1,6 @@
 % SiSU 0.57
 
-@title: SiSU - SiSU information Structuring Universe / Structured information, Serialized Units
+@title: SiSU
 
 @subtitle: Description
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst
new file mode 100644
index 00000000..d29874b6
--- /dev/null
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst
@@ -0,0 +1,64 @@
+% SiSU 0.58
+
+@title: SiSU
+
+@subtitle: sisu-doc
+
+@creator: Ralph Amissah
+
+@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+
+@type: information
+
+@subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
+
+@date.created: 2007-09-24
+
+@date.issued: 2007-09-24
+
+@date.available: 2007-09-24
+
+@date.modified: 2007-09-24
+
+@date: 2007-09-24
+
+@level: new=C; break=1; num_top=1
+
+@skin: skin_sisu_manual
+
+@bold: /Gnu|Debian|Ruby|SiSU/
+
+@links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
+{ Book Samples and Markup Examples }http://www.jus.uio.no/sisu/SiSU/2.html
+{ SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
+{ SiSU @ Freshmeat }http://freshmeat.net/projects/sisu/
+{ SiSU @ Ruby Application Archive }http://raa.ruby-lang.org/project/sisu/
+{ SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
+{ SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
+{ SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
+{ SiSU help }http://www.jus.uio.no/sisu/sisu_manual/sisu_help/
+{ SiSU help sources }http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/
+
+:A~? @title @creator
+
+:B~? SiSU Doc
+
+1~sisu-doc sisu-doc
+
+2~ Name
+
+SiSU - Structured information, Serialized Units - a document publishing system.
+
+Information related to sisu documentation
+
+2~ Description
+
+sisu documentation is installed in /usr/share/doc/sisu/sisu_manual or equivalent directory
+
+file:///usr/share/doc/sisu/sisu_manual
+
+file:///usr/share/doc/sisu/sisu_manual/sisu_manual/
+
+http://www.jus.uio.no/sisu/sisu_manual
+
+http://www.sisudoc.org/sisu_manual
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
index a7ac8484..acae3741 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -1,6 +1,6 @@
 % SiSU insert 0.57
 
-@title: SiSU - SiSU information Structuring Universe / Structured information, Serialized Units
+@title: SiSU
 
 @subtitle: Download, Stable and Development Branches
 
@@ -18,9 +18,9 @@
 
 @date.available: 2007-08-28
 
-@date.modified: 2007-09-16
+@date.modified: 2007-09-23
 
-@date: 2007-09-16
+@date: 2007-09-23
 
 @level: new=C; break=1; num_top=1
 
@@ -55,7 +55,7 @@
 
 Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
 
-_* {~^ sisu_0.58.3.orig.tar.gz (of 2007-09-05:36/3) }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.58.3.orig.tar.gz ~{ <br>e9a20a06ffee8d633b8ce525017d89ba 1278987 }~
+_* {~^ sisu_0.59.1.orig.tar.gz (of 2007-09-23:38/7) }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.59.1.orig.tar.gz
 
 _1 cgi generated sample search form
 
@@ -77,7 +77,7 @@ _1 help and man pages, some work man(8) related
 
 _1 sisu-install (install ruby rant script renamed) and permissions set to executable
 
-_* {~^ sisu-markup-samples_1.0.8.orig.tar.gz (of 2007-08-19:33/7 ) }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.7.orig.tar.gz ~{ <br>04ae2812617a4689666600a0fb32301f 3438571 }~ *~sisu-markup-samples
+_* {~^ sisu-markup-samples_1.0.8.orig.tar.gz (of 2007-08-19:33/7 ) }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.7.orig.tar.gz *~sisu-markup-samples
 
 For installation notes see http://www.jus.uio.no/sisu/SiSU/download.html
 
@@ -110,24 +110,23 @@ deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
 
 !_ Source
 
-_* {~^ sisu_0.58.3.orig.tar.gz }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.58.3.orig.tar.gz
+_* {~^ sisu_0.59.1.orig.tar.gz }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.59.1.orig.tar.gz
 
-_* {~^ sisu_0.58.3-1.diff.gz }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.58.3-1.diff.gz
+_* {~^ sisu_0.59.1-1.diff.gz }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.59.1-1.diff.gz
 
-_* {~^ sisu_0.58.3-1.dsc }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.58.3-1.dsc ~{ <br>b8330f8b97a15e6eaecba8f2616acb10 606 sisu_0.58.3-1.dsc }~
+_* {~^ sisu_0.59.1-1.dsc }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.59.1-1.dsc
 
 !_ Debs
 
-_* {~^ sisu_0.58.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.58.3-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+_* {~^ sisu_0.59.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.59.1-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
 
-_* {~^ sisu-complete_0.58.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.58.3-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+_* {~^ sisu-complete_0.59.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.59.1-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
 
+_* {~^ sisu-pdf_0.59.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.59.1-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
 
-_* {~^ sisu-pdf_0.58.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.58.3-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+_* {~^ sisu-postgresql_0.59.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.59.1-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
 
-_* {~^ sisu-postgresql_0.58.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.58.3-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
-
-_* {~^ sisu-sqlite_0.58.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.58.3-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+_* {~^ sisu-sqlite_0.59.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.59.1-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
 
 For changelogs see:
 
@@ -141,7 +140,7 @@ Book markup samples have been moved to non-free as the substantive text of the d
 
 _* {~^ sisu-markup-samples_1.0.8-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.8-1_all.deb ~{ <br>marked up documents and other examples related to sisu, a larger package containing a number of texts <br>Depends: sisu }~
 
-_* {~^ sisu-markup-samples_1.0.8-1.dsc }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.8-1.dsc ~{ <br>ca03c11467097d6049c43c54d0961ef5 606 sisu-markup-samples_1.0.8-1.dsc }~
+_* {~^ sisu-markup-samples_1.0.8-1.dsc }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.8-1.dsc
 
 For changelogs see:
 
@@ -151,12 +150,12 @@ _1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_sam
 
 3~rpm- RPM
 
-The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/programs/alien/ }~ Dependencies are not handled, not even that of the essential Ruby.
+The RPM is generated Alien~{ http://www.kitenet.net/programs/alien/ }~ from two deb packages (sisu and sisu-doc). Dependencies are not handled, not even that of the essential Ruby.
 
-_* {~^ sisu_0.58.3.orig-1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu_0.58.3.orig-1-2.noarch.rpm ~{ <br>31f5cd3e0e577b418e7c98492f71f0af<br> untested, created using: alien -r sisu_0.58.3.orig.tar.gz }~
+_* {~^ sisu-0.59.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.59.1-2.noarch.rpm ~{ <br> untested, created using: alien -r sisu_0.59.1-1_all.deb }~
 
-_* {~^ sisu-0.58.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.58.3-2.noarch.rpm ~{ <br>8b6858f0117351ce441e8559bf5308be<br> untested, created using: alien -r sisu_0.58.3-1_all.deb }~
+_* {~^ sisu-0.59.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-doc-0.59.1-2.noarch.rpm ~{ <br> untested, created using: alien -r sisu-doc_0.59.1-1_all.deb }~
 
-_* {~^ sisu-markup-samples_1.0.8.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br>15eed830b4d004f011bafe831bb816da<br> untested, created using alien }~
+_* {~^ sisu-markup-samples_1.0.8.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> untested, created using alien }~
 
 sudo rpm -i [package name]
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi
index 581a53a6..107087d7 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.ssi
@@ -1,6 +1,6 @@
 % SiSU 0.57
 
-@title: SiSU - SiSU information Structuring Universe / Structured information, Serialized Units
+@title: SiSU
 
 @subtitle: Markup Samples, Output Examples
 
@@ -45,8 +45,6 @@
 
 :B~? SiSU Markup and Output Examples
 
-% :C~? SiSU Markup and Output Examples
-
 1~examples Markup and Output Examples
 
 2~ Markup examples *~markup
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst
index e63eefca..6c30b395 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_examples.sst
@@ -1,6 +1,6 @@
 % SiSU 0.57
 
-@title: SiSU - SiSU information Structuring Universe / Structured information, Serialized Units
+@title: SiSU
 
 @subtitle: Markup Samples, Output Examples
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst
index 5e065ff7..73ce274d 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_faq.sst
@@ -1,6 +1,6 @@
 % SiSU 0.57
 
-@title: SiSU - SiSU information Structuring Universe / Structured information, Serialized Units
+@title: SiSU
 
 @subtitle: FAQ - Frequently Asked/Answered Questions
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
index a031691f..3a3fb37a 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_filetypes.sst
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Filetypes [0.58]
+@subtitle: Filetypes
 
 @creator: Ralph Amissah
 
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 0ccf8a93..b79e2cd7 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
@@ -1,8 +1,8 @@
 % SiSU 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Manual [0.58]
+@subtitle: Help
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
index 086c622c..1ecb0c3a 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_homepages.ssi
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Homepages [0.58]
+@subtitle: Homepages
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst
index 06f3a6e5..80ad314d 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_howto.sst
@@ -1,6 +1,6 @@
 % SiSU insert 0.57
 
-@title: SiSU - SiSU information Structuring Universe / Structured information, Serialized Units
+@title: SiSU
 
 @subtitle: Technical, Howto
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
index b63d8c04..277cb360 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_hyperestraier.ssi
@@ -1,8 +1,8 @@
 % SiSU insert 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Search [0.58]
+@subtitle: Hyperestraier Search
 
 @creator: Ralph Amissah
 
@@ -41,7 +41,7 @@
 
 :A~? @title @creator
 
-:B~? SiSU Search
+:B~? SiSU Search - Hyperestraier
 
 :C~? Search
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi
index eb1f7010..673842e0 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_installation.ssi
@@ -1,6 +1,6 @@
 % SiSU insert 0.38
 
-@title: Download - SiSU information Structuring Universe / Structured information, Serialized Units
+@title: SiSU
 
 @subtitle: Downloads, Stable and Development Branches
 
@@ -43,8 +43,6 @@
 
 :A~? SiSU Installation notes
 
-% :B~? Installation
-
 :C~ Installation
 
 1~installation Installation
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.sst
index 18b57394..9a2e2ddd 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.sst
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Commands [0.58]
+@subtitle: Commands
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
index 26ca4b6a..41d154a2 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
@@ -1,8 +1,8 @@
 % SiSU master 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Manual [0.58]
+@subtitle: Manual
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
index 37528e0a..13faa7db 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Markup [0.58]
+@subtitle: Markup
 
 @creator: Ralph Amissah
 
@@ -111,7 +111,7 @@ code{
 
 @title: SiSU
 
-@subtitle: Markup [0.58]
+@subtitle: Markup
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
index dc17d5dc..054851a1 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_output_overview.sst
@@ -1,6 +1,6 @@
 % SiSU 0.57
 
-@title: SiSU - SiSU information Structuring Universe / Structured information, Serialized Units
+@title: SiSU
 
 @subtitle: SiSU overview of status of features available in various outputs
 
@@ -45,7 +45,7 @@
 
 1~ A Checklist of Output Features
 
-% 5~ features available in various output types
+% 2~ features available in various output types
 
 This table gives an indication of the features that are available
 for various forms of output of SiSU.~{ updated for sisu-0.36.6 on 2006-01-23 }~
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst
index 8e54160c..f78f470b 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_pdf.sst
@@ -1,8 +1,8 @@
 % SiSU 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Search [0.58]
+@subtitle: PDF
 
 @creator: Ralph Amissah
 
@@ -41,11 +41,9 @@
 
 :A~? @title @creator
 
-:B~? SiSU Search
+:B~? SiSU PDF
 
-:C~ SiSU Sqlite
-
-1~sqlite Sqlite
+1~pdf SiSU pdf
 
 2~ Name
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
index 42ed2bbe..3f61e728 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_postgresql.sst
@@ -1,8 +1,8 @@
 % SiSU 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Search [0.58]
+@subtitle: Search
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
index 80f4753e..0725fb77 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_quickstart.sst
@@ -1,6 +1,6 @@
 % SiSU 0.57
 
-@title: SiSU - SiSU information Structuring Universe / Structured information, Serialized Units
+@title: SiSU
 
 @subtitle: Quickstart, installation and use
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst
index 40d96472..5ffdf948 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_remote.sst
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Remote Operations [0.58]
+@subtitle: Remote Operations
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm
index 0b4be15e..1dccc48f 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm
@@ -1,8 +1,8 @@
 % SiSU master 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Search [0.58]
+@subtitle: Search
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
index f27a7828..308f563f 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_cgi.ssi
@@ -1,8 +1,8 @@
 % SiSU insert 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Search [0.58]
+@subtitle: Search
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi
index 2b5ff550..2bfc4b74 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_examples.ssi
@@ -1,8 +1,8 @@
 % SiSU insert 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Search [0.58]
+@subtitle: Search
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
index 50e8f36d..bb9b33b3 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search_intro.ssi
@@ -1,8 +1,8 @@
 % SiSU insert 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Search [0.58]
+@subtitle: Search
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst
index 698a5241..587400fb 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_skin.sst
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Skins [0.58]
+@subtitle: Skins
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi
index 701a2ee5..7a484909 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sql.ssi
@@ -1,8 +1,8 @@
 % SiSU insert 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Search [0.58]
+@subtitle: Search
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
index 530444f3..74f8c84f 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_sqlite.sst
@@ -1,8 +1,8 @@
 % SiSU 0.58
 
-@title: SiSU - SiSU information Structuring Universe
+@title: SiSU
 
-@subtitle: Search [0.58]
+@subtitle: Search
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
index 60666075..8afd72da 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_syntax_highlighting.sst
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: Syntax Highlighting [0.58]
+@subtitle: Syntax Highlighting
 
 @creator: Ralph Amissah
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst
index 2e90bef2..bd8a074c 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_webrick.sst
@@ -2,7 +2,7 @@
 
 @title: SiSU
 
-@subtitle: sisu_webrick [0.58]
+@subtitle: sisu_webrick
 
 @creator: Ralph Amissah