sisu_manual right column, use absolute url paths and some url fixes

3 files changed, 65 insertions, 76 deletions

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_sources.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_help_sources.sst
index 908bcc40..6de7b0fa 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
@@ -63,7 +63,7 @@ _1 http://www.jus.uio.no/sisu/man/sisu_help.1.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://sisudoc.org/sisu/sisu_manual_help/index.html
 
 _1 http://www.jus.uio.no/sisu/sisu_manual/sisu_help/index.html
 
@@ -77,7 +77,7 @@ _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://sisudoc.org/sisu/sisu_manual_help_sources/index.html
 
 _1 http://www.jus.uio.no/sisu/sisu_manual/sisu_help_sources/index.html
 
@@ -197,57 +197,57 @@ _1 /usr/share/doc/sisu/sisu_manual/sisu_webrick/index.html
 
 3~ www.sisudoc.org
 
-http://sisudoc.org/sisu_manual/sisu_manual/index.html
+http://sisudoc.org/sisu/sisu_manual_manual/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu/index.html
+_1 http://sisudoc.org/sisu/sisu_manual/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_commands/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_commands/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_complete/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_complete/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_configuration/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_configuration/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_description/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_description/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_examples/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_examples/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_faq/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_faq/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_filetypes/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_filetypes/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_help/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_help/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_help_sources/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_help_sources/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_howto/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_howto/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_introduction/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_introduction/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_manual/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_manual/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_markup/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_markup/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_output_overview/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_output_overview/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_pdf/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_pdf/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_postgresql/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_postgresql/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_quickstart/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_quickstart/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_remote/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_remote/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_search/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_search/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_skin/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_skin/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_sqlite/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_sqlite/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_syntax_highlighting/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_syntax_highlighting/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_vim/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_vim/index.html
 
-_1 http://sisudoc.org/sisu_manual/sisu_webrick/index.html
+_1 http://sisudoc.org/sisu/sisu_manual_webrick/index.html
 
 3~ www.jus.uio.no/sisu
 
@@ -371,43 +371,43 @@ 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/sisu/sisu_manual.1.html
 
-% _1 http://sisudoc.org/man/sisu_commands.1.html
+% _1 http://sisudoc.org/sisu/sisu_manual_commands.1.html
 
-_1 http://sisudoc.org/man/sisu_complete.7.html
+_1 http://sisudoc.org/sisu/sisu_manual_complete.7.html
 
-% _1 http://sisudoc.org/man/sisu_configuration.1.html
+% _1 http://sisudoc.org/sisu/sisu_manual_configuration.1.html
 
-% _1 http://sisudoc.org/man/sisu_faq.8.html
+% _1 http://sisudoc.org/sisu/sisu_manual_faq.8.html
 
-% _1 http://sisudoc.org/man/sisu_help.1.html
+% _1 http://sisudoc.org/sisu/sisu_manual_help.1.html
 
-% _1 http://sisudoc.org/man/sisu_help_sources.1.html
+% _1 http://sisudoc.org/sisu/sisu_manual_help_sources.1.html
 
-% _1 http://sisudoc.org/man/sisu_howto.8.html
+% _1 http://sisudoc.org/sisu/sisu_manual_howto.8.html
 
-% _1 http://sisudoc.org/man/sisu_markup.1.html
+% _1 http://sisudoc.org/sisu/sisu_manual_markup.1.html
 
-_1 http://sisudoc.org/man/sisu_pdf.7.html
+_1 http://sisudoc.org/sisu/sisu_manual_pdf.7.html
 
-_1 http://sisudoc.org/man/sisu_postgresql.7.html
+_1 http://sisudoc.org/sisu/sisu_manual_postgresql.7.html
 
-% _1 http://sisudoc.org/man/sisu_quickstart.8.html
+% _1 http://sisudoc.org/sisu/sisu_manual_quickstart.8.html
 
-% _1 http://sisudoc.org/man/sisu_remote.8.html
+% _1 http://sisudoc.org/sisu/sisu_manual_remote.8.html
 
-% _1 http://sisudoc.org/man/sisu_search.8.html
+% _1 http://sisudoc.org/sisu/sisu_manual_search.8.html
 
-% _1 http://sisudoc.org/man/sisu_skin.1.html
+% _1 http://sisudoc.org/sisu/sisu_manual_skin.1.html
 
-_1 http://sisudoc.org/man/sisu_sqlite.7.html
+_1 http://sisudoc.org/sisu/sisu_manual_sqlite.7.html
 
-% _1 http://sisudoc.org/man/sisu_syntax_highlighting.8.html
+% _1 http://sisudoc.org/sisu/sisu_manual_syntax_highlighting.8.html
 
-% _1 http://sisudoc.org/man/sisu_vim.7.html
+% _1 http://sisudoc.org/sisu/sisu_manual_vim.7.html
 
-_1 http://sisudoc.org/man/sisu_webrick.1.html
+_1 http://sisudoc.org/sisu/sisu_manual_webrick.1.html
 
 3~ www.jus.uio.no/sisu