Merge branch 'upstream' into debian/sid

2 files changed, 44 insertions, 26 deletions

diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index 678b65b6..0cfae494 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2008-02-05" "0.64.3" "SiSU"
+.TH "sisu" "1" "2008-02-12" "0.64.4" "SiSU"
 .SH NAME
 sisu \- documents: markup, structuring, publishing in multiple standard formats, and search
 .SH SYNOPSIS
@@ -810,6 +810,24 @@ primary outline of the document structure. Markup of substantive text includes:
 Some interactive help on markup is available, by typing sisu and selecting
 markup or sisu \-\-help markup
 
+.BR
+To check the markup in a file:
+
+.BR
+  sisu \-\-identify \ [filename].sst
+
+.BR
+For brief descriptive summary of markup history
+
+.BR
+  sisu \-\-query\-history
+
+.BR
+or if for a particular version:
+
+.BR
+  sisu \-\-query\-0.38
+
 .SH
 7.2 MARKUP EXAMPLES
 
@@ -4533,7 +4551,7 @@ DC Creator:
 
 .BR
 DC Rights:
-.I Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL
+.I Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL
 3
 
 .BR
@@ -4554,11 +4572,11 @@ DC Date available:
 
 .BR
 DC Date modified:
-.I 2008\-02\-05
+.I 2008\-02\-12
 
 .BR
 DC Date:
-.I 2008\-02\-05
+.I 2008\-02\-12
 
 .BR
 .B Version Information
@@ -4573,7 +4591,7 @@ Filetype:
 
 .BR
 Sourcefile Digest, MD5(sisu.ssm.sst)=
-.I 587397c3165a622e01a5c800d69d39a0
+.I 1a602f31f72da6a8d1e6fc6b42d1b703
 
 .BR
 Skin_Digest: MD5(skin_sisu_manual.rb)=
@@ -4584,13 +4602,13 @@ Skin_Digest: MD5(skin_sisu_manual.rb)=
 
 .BR
 Document (metaverse) last generated:
-.I Tue Feb 05 23:45:59 +0000 2008
+.I Thu Feb 14 02:44:23 +0000 2008
 
 .BR
 Generated by:
 .I SiSU
-.I 0.64.3
-of 2008w05/2 (2008\-02\-05)
+.I 0.64.4
+of 2008w06/4 (2008\-02\-14)
 
 .BR
 Ruby version:
@@ -4747,10 +4765,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu/landscape.pdf>
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.64.3 of 2008w05/2 (2008-02-05)
+* Generated by: SiSU 0.64.4 of 2008w06/4 (2008-02-14)
 .TP
 * Ruby version: ruby 1.8.6 (2007-09-24 patchlevel 111) [i486-linux]
 .TP
-* Last Generated on: Tue Feb 05 23:45:59 +0000 2008
+* Last Generated on: Thu Feb 14 02:44:23 +0000 2008
 .TP
 * SiSU http://www.jus.uio.no/sisu
diff --git a/man/man7/sisu_vim.7 b/man/man7/sisu_vim.7
index a6e4ecce..1c22b831 100644
--- a/man/man7/sisu_vim.7
+++ b/man/man7/sisu_vim.7
@@ -1,6 +1,6 @@
-.TH "sisu_vim" "1" "2007-09-16" "0.59.1" "SiSU"
+.TH "sisu_vim" "1" "2008-02-12" "0.64.4" "SiSU"
 .SH NAME
-sisu_vim \- vim syntax and folds file for sisu: documents: markup, structuring, publishing in multiple standard formats, and search
+ sisu_vim \- vim syntax and folds file for sisu: markup, structuring, publishing in multiple standard formats, and search
 .SH
 SISU \- VIM,
 RALPH AMISSAH
@@ -47,8 +47,8 @@ Vim 7 includes sisu markup syntax highlighting.
 
 .BR
 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).
 
 .BR
 sisu\-vim actions are activated on files with the suffix \.sst \.ssm \.ssi
@@ -108,7 +108,7 @@ DC Creator:
 
 .BR
 DC Rights:
-.I Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL
+.I Copyright (C) Ralph Amissah 2008, part of SiSU documentation, License GPL
 3
 
 .BR
@@ -129,11 +129,11 @@ DC Date available:
 
 .BR
 DC Date modified:
-.I 2007\-09\-16
+.I 2008\-02\-12
 
 .BR
 DC Date:
-.I 2007\-09\-16
+.I 2008\-02\-12
 
 .BR
 .B Version Information
@@ -148,28 +148,28 @@ Filetype:
 
 .BR
 Sourcefile Digest, MD5(sisu_vim.sst)=
-.I a3db74eebef04815aa234d3c3b17f375
+.I b5028f957b128162f7653bbd940042ca
 
 .BR
 Skin_Digest: MD5(skin_sisu_manual.rb)=
-.I 20fc43cf3eb6590bc3399a1aef65c5a9
+.I 072b2584bedea82ea8a416587b9fa244
 
 .BR
 .B Generated
 
 .BR
 Document (metaverse) last generated:
-.I Sat Sep 29 17:14:44 +0100 2007
+.I Thu Feb 14 02:44:14 +0000 2008
 
 .BR
 Generated by:
 .I SiSU
-.I 0.59.1
-of 2007w39/2 (2007\-09\-25)
+.I 0.64.4
+of 2008w06/4 (2008\-02\-14)
 
 .BR
 Ruby version:
-.I ruby 1.8.6 (2007\-06\-07 patchlevel 36) \ [i486\-linux]
+.I ruby 1.8.6 (2007\-09\-24 patchlevel 111) \ [i486\-linux]
 
 
 .TP
@@ -188,10 +188,10 @@ manpage: http://www.jus.uio.no/sisu/sisu_vim/sisu_vim.1
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.59.1 of 2007w39/2 (2007-09-25)
+* Generated by: SiSU 0.64.4 of 2008w06/4 (2008-02-14)
 .TP
-* Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux]
+* Ruby version: ruby 1.8.6 (2007-09-24 patchlevel 111) [i486-linux]
 .TP
-* Last Generated on: Sat Sep 29 17:14:44 +0100 2007
+* Last Generated on: Thu Feb 14 02:44:14 +0000 2008
 .TP
 * SiSU http://www.jus.uio.no/sisu