Merge branch 'upstream' into debian/sid

9 files changed, 66 insertions, 352 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8752c861..9285442c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.61.0.orig.tar.gz (2007-10-20:42/6) ?
+%% sisu_0.61.0.orig.tar.gz (2007-10-12:41/4)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz
   sisu_0.61.0.orig.tar.gz
   sisu_0.61.0-1.dsc
@@ -18,6 +18,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz
     --no-ocn), in html objects are still named, (i.e. will still work with
     searches though the meaning of the numbers returned is obscured)
 
+  * shared markup source, composite documents, look to processing directory
+    * text: share source
+    * binary: sisupod (make)
+    [fixes shared markup source bug, present in 0.60]
+
   * processing flag shortcuts,
     * sisurc.yml reduced -1 outputs [to -hwpoyv] (minimum output used in
       dynamic building of some documents)
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
index fa9aaa54..40a2c190 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/yml/promo.yml
@@ -15,58 +15,49 @@ site:
     blurb:      ~
   sisu_manual:
     title:      SiSU manual
-    url:        sisu_manual/toc.html
+    url:        http://sisudoc.org/sisu/sisu_manual/toc.html
     #url:        index.html
     blurb:      ~
     links:
     -
       title:    SiSU introduction
-      url:      sisu_introduction/toc.html
+      url:      http://sisudoc.org/sisu/sisu_introduction/toc.html
     -
       title:    SiSU commands
-      url:      sisu_commands/toc.html
+      url:      http://sisudoc.org/sisu/sisu_commands/toc.html
     -
       title:    SiSU markup
-      url:      sisu_markup/toc.html
+      url:      http://sisudoc.org/sisu/sisu_markup/toc.html
     -
       title:    SiSU configuration
-      url:      sisu_configuration/toc.html
+      url:      http://sisudoc.org/sisu/sisu_configuration/toc.html
     -
       title:    SiSU help
-      url:      sisu_help/toc.html
+      url:      http://sisudoc.org/sisu/sisu_help/toc.html
     -
       title:    SiSU help sources
-      url:      sisu_help_sources/toc.html
+      url:      http://sisudoc.org/sisu/sisu_help_sources/toc.html
   ruby_logo:
     url:        http://www.ruby-lang.org/en/
     image:      ruby_logo.png
     blurb:      ~
   sisu:
     title:      SiSU
-    url:        index.html
+    url:        http://www.jus.uio.no/sisu/SiSU/index.html
     blurb:      ~
     links:
     -
       title:    What does SiSU do? Summary
-      url:      SiSU/1.html#summary
+      url:      http://www.jus.uio.no/sisu/SiSU/1.html#summary
     -
       title:    SiSU Book Samples and Markup Examples
-      url:      SiSU/examples.html
-    -
-      title:    Markup
-      url:      sisu_markup/
-    -
-      title:    Commands
-      url:      sisu_commands/
-    -
-      title:    Manual
-      url:      sisu_manual/
+      url:      http://www.jus.uio.no/sisu/SiSU/examples.html
     -
       title:    SiSU Download
-      url:      SiSU/download.html
+      url:      http://www.jus.uio.no/sisu/SiSU/download.html
     -
       title:    SiSU Changelog
-      url:      SiSU/changelog.html
+      url:      http://www.jus.uio.no/sisu/SiSU/changelog.html
       blurb:    ~
     -
       title:    Wikipedia entry
@@ -83,7 +74,7 @@ site:
     subtitle:   How Social Production Transforms Markets and Freedom
     author:     Yochai Benkler
     year:       2006
-    url:        the_wealth_of_networks.yochai_benkler
+    url:        http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
     links:
     -
       title:    Wikipedia entry
@@ -96,7 +87,7 @@ site:
     subtitle:   How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity
     author:     Lawrence Lessig
     year:       2004
-    url:        free_culture.lawrence_lessig
+    url:        http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
     links:
     -
       title:    Wikipedia entry
@@ -112,7 +103,7 @@ site:
     subtitle:   Richard Stallman's Crusade for Free Software
     author:     Sam Williams
     year:       2002
-    url:        free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
+    url:        http://www.jus.uio.no/sisu/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
     links:
     -
       title:    Wikipedia entry
@@ -137,7 +128,7 @@ site:
     subtitle:   How Linux and the Free Software Movement Undercut the High Tech Titans
     author:     Peter Wayner
     year:       2002
-    url:        free_for_all.peter_wayner
+    url:        http://www.jus.uio.no/sisu/free_for_all.peter_wayner
     links:
     -
       title:    Source
@@ -147,7 +138,7 @@ site:
     subtitle:   Musings on Linux and Open Source by an Accidental Revolutionary
     author:     Erik S. Raymond
     year:       1999
-    url:        the_cathedral_and_the_bazaar.eric_s_raymond
+    url:        http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
     links:
     -
       title:    Wikipedia entry
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
index 20e00d5f..b18f423f 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_doc.sst
@@ -57,8 +57,6 @@ sisu documentation is installed in /usr/share/doc/sisu/sisu_manual or equivalent
 
 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
+http://www.sisudoc.org/sisu/sisu_manual
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 908bcc40..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_manual/sisu_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_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
 
 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_manual/sisu_manual/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_commands/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_complete/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_configuration/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_description/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_examples/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_faq/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_filetypes/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_help/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_help_sources/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_howto/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_introduction/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_manual/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_markup/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_output_overview/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_pdf/index.html
-
-_1 http://sisudoc.org/sisu_manual/sisu_postgresql/index.html
+http://sisudoc.org/sisu/sisu_manual/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_quickstart/index.html
+_1 http://sisudoc.org/sisu/sisu_manual/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_remote/index.html
+_1 http://sisudoc.org/sisu/sisu_commands/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_search/index.html
+_1 http://sisudoc.org/sisu/sisu_complete/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_skin/index.html
+_1 http://sisudoc.org/sisu/sisu_configuration/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_sqlite/index.html
+_1 http://sisudoc.org/sisu/sisu_description/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_syntax_highlighting/index.html
+_1 http://sisudoc.org/sisu/sisu_examples/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_vim/index.html
+_1 http://sisudoc.org/sisu/sisu_faq/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_webrick/index.html
+_1 http://sisudoc.org/sisu/sisu_filetypes/index.html
 
-3~ www.jus.uio.no/sisu
-
-http://www.jus.uio.no/sisu/sisu_manual/sisu_manual/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_commands/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://sisudoc.org/sisu/sisu_help/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_filetypes/index.html
+_1 http://sisudoc.org/sisu/sisu_help_sources/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_help/index.html
+_1 http://sisudoc.org/sisu/sisu_howto/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/index.html
+_1 http://sisudoc.org/sisu/sisu_introduction/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_howto/index.html
+_1 http://sisudoc.org/sisu/sisu_manual/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_introduction/index.html
+_1 http://sisudoc.org/sisu/sisu_markup/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_manual/index.html
+_1 http://sisudoc.org/sisu/sisu_output_overview/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_markup/index.html
+_1 http://sisudoc.org/sisu/sisu_pdf/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_output_overview/index.html
+_1 http://sisudoc.org/sisu/sisu_postgresql/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_pdf/index.html
+_1 http://sisudoc.org/sisu/sisu_quickstart/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_postgresql/index.html
+_1 http://sisudoc.org/sisu/sisu_remote/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_quickstart/index.html
+_1 http://sisudoc.org/sisu/sisu_search/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_remote/index.html
+_1 http://sisudoc.org/sisu/sisu_skin/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_search/index.html
+_1 http://sisudoc.org/sisu/sisu_sqlite/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_skin/index.html
+_1 http://sisudoc.org/sisu/sisu_syntax_highlighting/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_sqlite/index.html
+_1 http://sisudoc.org/sisu/sisu_vim/index.html
 
-_1 http://www.jus.uio.no/sisu/sisu_manual/sisu_syntax_highlighting/index.html
-
-_1 http://www.jus.uio.no/sisu/sisu_manual/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/man/sisu.1.html
-
-% _1 http://sisudoc.org/man/sisu_commands.1.html
-
-_1 http://sisudoc.org/man/sisu_complete.7.html
-
-% _1 http://sisudoc.org/man/sisu_configuration.1.html
-
-% _1 http://sisudoc.org/man/sisu_faq.8.html
-
-% _1 http://sisudoc.org/man/sisu_help.1.html
-
-% _1 http://sisudoc.org/man/sisu_help_sources.1.html
-
-% _1 http://sisudoc.org/man/sisu_howto.8.html
-
-% _1 http://sisudoc.org/man/sisu_markup.1.html
-
-_1 http://sisudoc.org/man/sisu_pdf.7.html
-
-_1 http://sisudoc.org/man/sisu_postgresql.7.html
-
-% _1 http://sisudoc.org/man/sisu_quickstart.8.html
-
-% _1 http://sisudoc.org/man/sisu_remote.8.html
-
-% _1 http://sisudoc.org/man/sisu_search.8.html
-
-% _1 http://sisudoc.org/man/sisu_skin.1.html
-
-_1 http://sisudoc.org/man/sisu_sqlite.7.html
-
-% _1 http://sisudoc.org/man/sisu_syntax_highlighting.8.html
-
-% _1 http://sisudoc.org/man/sisu_vim.7.html
-
-_1 http://sisudoc.org/man/sisu_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
diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v0/defaults.rb
index 4d97aed1..47fbeec8 100644
--- a/lib/sisu/v0/defaults.rb
+++ b/lib/sisu/v0/defaults.rb
@@ -1328,7 +1328,7 @@ WOK
       <b>#{v[:project]}</b>
     </a>
     Copyright <sup>&copy;</sup> Ralph Amissah
-    1997, current  #{@date.year_static}.
+    1997, current #{@date.year_static}.
     All Rights Reserved.
     <br />
     <a href="#{url_sisu}" #{js_sisu}>
diff --git a/lib/sisu/v0/share_src.rb b/lib/sisu/v0/share_src.rb
index b4b75d48..53e19f1c 100644
--- a/lib/sisu/v0/share_src.rb
+++ b/lib/sisu/v0/share_src.rb
@@ -78,7 +78,7 @@ module SiSU_Markup
         unless @opt.fns =~/\.ssm$/; cp(@opt.fns,@output_path)
         else
           req=@opt.fns.gsub(/(.+)?\.ssm$/,'\1.composite.sst')
-          file=@opt.fns.gsub(/(.+)?\.ssm$/,'\1._sst')
+          file="#{@env.path.composite_file}/#{@opt.fnb}._sst"
           if FileTest.file?(file);  cp(file,"#@output_path/#{req}")
           else print "did not find #{file} to copy"
           end
diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb
index 32811f0f..8e6932f0 100644
--- a/lib/sisu/v0/sisupod_make.rb
+++ b/lib/sisu/v0/sisupod_make.rb
@@ -157,10 +157,11 @@ module SiSU_Doc
       @rgx_image=/\{\s*(\S+?\.(?:png|jpg|gif))/
       @rgx_skin=/^(?:@skin:|0~skin)\s+(\S+)/
       @rgx_doc_import=/^%\s\s*\|(\S+?\.ss[ti])\|@\|\^\|>>ok/
-      file_array=IO.readlines(@opt.fns,'')
+      use_file=if @opt.fns =~/(?:\.ssm|\._sst)$/; "#{@env.path.composite_file}/#{@opt.fnb}._sst"
+      else @opt.fns
+      end
+      file_array=IO.readlines(use_file,'')
       skin,images,doc_import=[],[],[]
-      #skin_dir=SiSU_Env::Info_skin.new.select
-      #skin << [skin_dir.gsub(/.+?\/(skin_\S+?)\.rb/,'\1')]
       file_array.each do |f|                                                  #% work area
         if f !~/^%\s/
           skin << f.scan(@rgx_skin).uniq.flatten if f =~@rgx_skin
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index 48161592..4080795d 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -68,7 +68,7 @@ module SiSU_Env
       @dt,@t=Date.today.to_s,Time.now
     end
     def week
-      w=@t.strftime("%W")
+      w=@t.strftime('%W')
       "#{@t.year}w#{w}"
     end
     def month
@@ -79,7 +79,7 @@ module SiSU_Env
     end
     def weekonly
       #@t.cweek
-      @t.strftime("%W")
+      @t.strftime('%W')
     end
     def monthonly
       @t.month
@@ -917,7 +917,8 @@ module SiSU_Env
           table_close='<br />'
         end
         form=if create_form_sisu and type=~/sisusearch/ and
-          defined? rc['search']['sisu']
+          defined? rc['search']['sisu'] and
+          defined? rc['search']['sisu']['action']
           <<WOK
 <!-- SiSU Search -->
 #{table_open}