Merge branch 'upstream' into debian/sid

5 files changed, 79 insertions, 54 deletions

diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html
index aee67590..88717ed6 100644
--- a/data/doc/sisu/html/sisu.1.html
+++ b/data/doc/sisu/html/sisu.1.html
@@ -685,26 +685,35 @@ as code<br>
 <p>  Some interactive help on markup is available, by typing sisu and selecting
 
 <p>markup or sisu --help markup 
+<p>  To check the markup in a file: 
+<p>    sisu --identify
+&nbsp;[filename].sst<br>
+ 
+<p>  For brief descriptive summary of markup history 
+<p>    sisu --query-history<br>
+ 
+<p>  or if for a particular version: 
+<p>    sisu --query-0.38<br>
+ 
 <p> 7.2 MARKUP EXAMPLES 
 <p> 7.2.1 ONLINE 
-<p>  Online markup
-examples are available together with the respective outputs produced from
-&lt;<a href='http://www.jus.uio.no/sisu/SiSU/examples.html'>http://www.jus.uio.no/sisu/SiSU/examples.html</a>
-&gt; or from &lt;<a href='http://www.jus.uio.no/sisu/sisu_examples/'>http://www.jus.uio.no/sisu/sisu_examples/</a>
-&gt;
-
-<p>  There is of course this document, which provides a cursory overview of
-sisu markup and the respective output produced: &lt;<a href='http://www.jus.uio.no/sisu/sisu_markup/'>http://www.jus.uio.no/sisu/sisu_markup/</a>
+<p>  Online markup examples are available
+together with the respective outputs produced from &lt;<a href='http://www.jus.uio.no/sisu/SiSU/examples.html'>http://www.jus.uio.no/sisu/SiSU/examples.html</a>
 &gt;
-
-<p>  Some example marked up files are available as html with syntax highlighting
-for viewing: &lt;<a href='http://www.jus.uio.no/sisu/sample/syntax'>http://www.jus.uio.no/sisu/sample/syntax</a>
+or from &lt;<a href='http://www.jus.uio.no/sisu/sisu_examples/'>http://www.jus.uio.no/sisu/sisu_examples/</a>
 &gt; 
-<p>  an alternative presentation
-of markup syntax: &lt;<a href='http://www.jus.uio.no/sisu/sample/on_markup.txt'>http://www.jus.uio.no/sisu/sample/on_markup.txt</a>
+<p>  There is of course this
+document, which provides a cursory overview of sisu markup and the respective
+output produced: &lt;<a href='http://www.jus.uio.no/sisu/sisu_markup/'>http://www.jus.uio.no/sisu/sisu_markup/</a>
 &gt; 
-<p> 7.2.2 INSTALLED
+<p>  Some example marked
+up files are available as html with syntax highlighting for viewing: &lt;<a href='http://www.jus.uio.no/sisu/sample/syntax'>http://www.jus.uio.no/sisu/sample/syntax</a>
+&gt;
+
+<p>  an alternative presentation of markup syntax: &lt;<a href='http://www.jus.uio.no/sisu/sample/on_markup.txt'>http://www.jus.uio.no/sisu/sample/on_markup.txt</a>
+&gt;
 
+<p> 7.2.2 INSTALLED 
 <p>  With <b>SiSU</b> installed sample skins may be found in: /usr/share/doc/sisu/sisu_markup_samples/dfsg
 (or equivalent directory) and if sisu-markup-samples is installed also under:
 
@@ -3262,30 +3271,30 @@ html pages[^28]
 <p>  DC Title: <i>SiSU</i> - Manual 
 <p>  DC Creator: <i>Ralph</i> Amissah 
 <p>  DC Rights: <i>Copyright</i>
-(C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3 
+(C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3 
 <p>  DC
 Type: <i>information</i> 
 <p>  DC Date created: <i>2002-08-28</i> 
 <p>  DC Date issued: <i>2002-08-28</i>
 
 <p>  DC Date available: <i>2002-08-28</i> 
-<p>  DC Date modified: <i>2008-02-05</i> 
-<p>  DC Date: <i>2008-02-05</i>
+<p>  DC Date modified: <i>2008-02-12</i> 
+<p>  DC Date: <i>2008-02-12</i>
 
 <p>  <b>Version Information</b> 
 <p>  Sourcefile: <i>sisu.ssm.sst</i> 
 <p>  Filetype: <i>SiSU</i> text insert
 
 <p>0.58 
-<p>  Sourcefile Digest, MD5(sisu.ssm.sst)= <i>587397c3165a622e01a5c800d69d39a0</i>
+<p>  Sourcefile Digest, MD5(sisu.ssm.sst)= <i>1a602f31f72da6a8d1e6fc6b42d1b703</i>
 
 <p>  Skin_Digest: MD5(skin_sisu_manual.rb)= <i>072b2584bedea82ea8a416587b9fa244</i>
 
 <p>  <b>Generated</b> 
-<p>  Document (metaverse) last generated: <i>Tue</i> Feb 05 23:45:59
+<p>  Document (metaverse) last generated: <i>Thu</i> Feb 14 02:44:23
 
 <p>+0000 2008 
-<p>  Generated by: <i>SiSU</i> <i>0.64.3</i> of 2008w05/2 (2008-02-05) 
+<p>  Generated by: <i>SiSU</i> <i>0.64.4</i> of 2008w06/4 (2008-02-14) 
 <p>  Ruby version:
 <i>ruby</i> 1.8.6 (2007-09-24 patchlevel 111) &nbsp;[i486-linux] 
 <p> 
@@ -3403,15 +3412,15 @@ distributable are not freely changeable. </li><b>.</b><li>named index.html or mo
 </dt>
 <dd></dd>
 
-<dt>* Generated by: SiSU 0.64.3 of 2008w05/2 (2008-02-05) </dt>
+<dt>* Generated by: SiSU 0.64.4 of 2008w06/4 (2008-02-14) </dt>
 <dd></dd>
 
 <dt>* Ruby version: ruby
 1.8.6 (2007-09-24 patchlevel 111) [i486-linux] </dt>
 <dd></dd>
 
-<dt>* Last Generated on: Tue Feb
-05 23:45:59 +0000 2008 </dt>
+<dt>* Last Generated on: Thu Feb
+14 02:44:23 +0000 2008 </dt>
 <dd></dd>
 
 <dt>* SiSU <a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a>
diff --git a/data/doc/sisu/html/sisu_vim.7.html b/data/doc/sisu/html/sisu_vim.7.html
index 5099bb3a..385eef0e 100644
--- a/data/doc/sisu/html/sisu_vim.7.html
+++ b/data/doc/sisu/html/sisu_vim.7.html
@@ -9,14 +9,15 @@
 <a href='#toc'>Table of Contents</a><p>
 
 <h2><a name='sect0' href='#toc0'>Name</a></h2>
-sisu_vim - vim syntax and folds file for sisu: documents: markup, structuring,
-publishing in multiple standard formats, and search SISU - VIM, RALPH AMISSAH
- 
+ sisu_vim - vim syntax and folds file for sisu: markup, structuring,
+publishing in multiple standard formats, and search<br>
+ SISU - VIM, RALPH AMISSAH  
 <p> SISU VIM  
 <p> 1. SISU VIM  
 <p>  <b>Synopsis</b> 
-<p>  <b>SiSU</b> has syntax highlighting for
-a number of editors including vim which are documented under: 
+<p>  <b>SiSU</b> has
+syntax highlighting for a number of editors including vim which are documented
+under: 
 <p>    man sisu_syntax_highlighting<br>
  
 <p>    /usr/share/doc/sisu/sisu_manual/sisu_syntax_highlighting/index.html<br>
@@ -32,10 +33,11 @@ and to set some defaults for <b>SiSU</b> markup in installed by sisu.
 <p>  Vim 7 includes
 sisu markup syntax highlighting. 
 <p>  Vim related files are included in: /usr/share/sisu/conf/editor-syntax-etc/vim
-(including the syntax highlighter which may be used for earlier versions
-of Vim). 
-<p>  sisu-vim actions are activated on files with the suffix .sst .ssm
-.ssi  .-sst ._sst (and the same with a further .meta extension)<br>
+(including the syntax highlighter, together with an ftplugin which may
+be sourced if so desired from your vimrc). 
+<p>  sisu-vim actions are activated
+on files with the suffix .sst .ssm .ssi  .-sst ._sst (and the same with a further
+.meta extension)<br>
  
 <p> 
 <p> <br>
@@ -65,7 +67,7 @@ of Vim).
 <i>SiSU</i> - Vim 
 <p>  DC Creator: <i>Ralph</i> Amissah 
 <p>  DC Rights: <i>Copyright</i> (C) Ralph
-Amissah 2007, part of SiSU documentation, License GPL 3 
+Amissah 2008, part of SiSU documentation, License GPL 3 
 <p>  DC Type: <i>information</i>
 
 <p>  DC Date created: <i>2002-11-12</i> 
@@ -73,23 +75,23 @@ Amissah 2007, part of SiSU documentation, License GPL 3
 <p>  DC Date available:
 
 <p><i>2002-11-12</i> 
-<p>  DC Date modified: <i>2007-09-16</i> 
-<p>  DC Date: <i>2007-09-16</i> 
+<p>  DC Date modified: <i>2008-02-12</i> 
+<p>  DC Date: <i>2008-02-12</i> 
 <p>  <b>Version Information</b>
 
 <p>  Sourcefile: <i>sisu_vim.sst</i> 
 <p>  Filetype: <i>SiSU</i> text insert 0.58 
 <p>  Sourcefile
-Digest, MD5(sisu_vim.sst)= <i>a3db74eebef04815aa234d3c3b17f375</i> 
+Digest, MD5(sisu_vim.sst)= <i>b5028f957b128162f7653bbd940042ca</i> 
 <p>  Skin_Digest:
-MD5(skin_sisu_manual.rb)= <i>20fc43cf3eb6590bc3399a1aef65c5a9</i> 
+MD5(skin_sisu_manual.rb)= <i>072b2584bedea82ea8a416587b9fa244</i> 
 <p>  <b>Generated</b> 
 <p>
- Document (metaverse) last generated: <i>Sat</i> Sep 29 17:14:44 +0100 2007 
+ Document (metaverse) last generated: <i>Thu</i> Feb 14 02:44:14 +0000 2008 
 <p> 
-Generated by: <i>SiSU</i> <i>0.59.1</i> of 2007w39/2 (2007-09-25) 
+Generated by: <i>SiSU</i> <i>0.64.4</i> of 2008w06/4 (2008-02-14) 
 <p>  Ruby version: <i>ruby</i> 1.8.6
-(2007-06-07 patchlevel 36) &nbsp;[i486-linux] 
+(2007-09-24 patchlevel 111) &nbsp;[i486-linux] 
 <p> 
 <p> 
 <dl>
@@ -130,15 +132,15 @@ Generated by: <i>SiSU</i> <i>0.59.1</i> of 2007w39/2 (2007-09-25)
 </dt>
 <dd></dd>
 
-<dt>* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25) </dt>
+<dt>* Generated by: SiSU 0.64.4 of 2008w06/4 (2008-02-14) </dt>
 <dd></dd>
 
 <dt>* Ruby version: ruby
-1.8.6 (2007-06-07 patchlevel 36) [i486-linux] </dt>
+1.8.6 (2007-09-24 patchlevel 111) [i486-linux] </dt>
 <dd></dd>
 
-<dt>* Last Generated on: Sat Sep 29
-17:14:44 +0100 2007 </dt>
+<dt>* Last Generated on: Thu Feb
+14 02:44:14 +0000 2008 </dt>
 <dd></dd>
 
 <dt>* SiSU <a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a>
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 50265706..54bbe2a3 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
@@ -6,7 +6,7 @@
 
 @creator: Ralph Amissah
 
-@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+@rights: Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
 
 @type: information
 
@@ -18,9 +18,9 @@
 
 @date.available: 2002-08-28
 
-@date.modified: 2008-02-05
+@date.modified: 2008-02-12
 
-@date: 2008-02-05
+@date: 2008-02-12
 
 @level: new=C; break=1; num_top=1
 
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 9c797dcc..741c26a8 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
@@ -6,7 +6,7 @@
 
 @creator: Ralph Amissah
 
-@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+@rights: Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
 
 @type: information
 
@@ -18,9 +18,9 @@
 
 @date.available: 2002-08-28
 
-@date.modified: 2007-09-16
+@date.modified: 2008-02-12
 
-@date: 2007-09-16
+@date: 2008-02-12
 
 @level: new=C; break=1; num_top=1
 
@@ -73,6 +73,18 @@ _1* paragraph actions, such as indent, bulleted, numbered-lists, etc.
 
 Some interactive help on markup is available, by typing sisu and selecting markup or sisu --help markup
 
+To check the markup in a file:
+
+_1 sisu --identify [filename].sst
+
+For brief descriptive summary of markup history
+
+_1 sisu --query-history
+
+or if for a particular version:
+
+_1 sisu --query-0.38
+
 2~ Markup Examples
 
 3~ Online
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst
index a1c324aa..b8018fa8 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_vim.sst
@@ -6,7 +6,7 @@
 
 @creator: Ralph Amissah
 
-@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
+@rights: Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL 3
 
 @type: information
 
@@ -18,14 +18,16 @@
 
 @date.available: 2002-11-12
 
-@date.modified: 2007-09-16
+@date.modified: 2008-02-12
 
-@date: 2007-09-16
+@date: 2008-02-12
 
 @level: new=C; break=1; num_top=1
 
 @skin: skin_sisu_manual
 
+@man: name= sisu_vim \- vim syntax and folds file for sisu: markup, structuring, publishing in multiple standard formats, and search;
+
 @bold: /Gnu|Debian|Ruby|SiSU/
 
 @links: { SiSU Manual }http://www.jus.uio.no/sisu/sisu_manual/
@@ -65,7 +67,7 @@ Vim 7 includes sisu markup syntax highlighting.
 
 Vim related files are included in:
 /usr/share/sisu/conf/editor-syntax-etc/vim
-(including the syntax highlighter which may be used for earlier versions of Vim).
+(including the syntax highlighter, together with an ftplugin which may be sourced if so desired from your vimrc).
 
 sisu-vim actions are activated on files with the suffix .sst .ssm .ssi .-sst ._sst (and the same with a further .meta extension)