Merge branch 'upstream' into debian/sid

4 files changed, 14 insertions, 14 deletions

diff --git a/lib/sisu/v0/help.rb b/lib/sisu/v0/help.rb
index 1c1fd4d0..b5077fa1 100644
--- a/lib/sisu/v0/help.rb
+++ b/lib/sisu/v0/help.rb
@@ -1588,7 +1588,7 @@ WOK
         sisu --from-sxml [filename/wildcard [.sxs.xml,.sxd.xml,sxn.xml]]
 
       to attempt to convert a kdissert (.kdi) file to sisu markup:
-        sisu --to-kdi  [kdissert filename]
+        sisu --from-kdi  [kdissert filename]
         (very basic and experimental)
 WOK
     end
diff --git a/lib/sisu/v0/hub.rb b/lib/sisu/v0/hub.rb
index d7e01606..3b145dac 100644
--- a/lib/sisu/v0/hub.rb
+++ b/lib/sisu/v0/hub.rb
@@ -432,7 +432,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
         end
         if @opt.cmd =~/[hHz]/; op('html','html')               #% -h -H -z html css
         end
-        if @opt.cmd =~/a/; op('plaintext','plaintext')   #% -a #-A -f -e -E plaintext -a creates ms-dos type; -A creates unix type, plaintext file
+        if @opt.cmd =~/a/; op('plaintext','plaintext')         #% -a #-A -f -e -E plaintext -a creates ms-dos type; -A creates unix type, plaintext file
         end
         if @opt.cmd =~/g/; op('wikispeak','wikispeak')         #% -g wiki
         end
diff --git a/lib/sisu/v0/manpage.rb b/lib/sisu/v0/manpage.rb
index 20dd0450..334efe80 100644
--- a/lib/sisu/v0/manpage.rb
+++ b/lib/sisu/v0/manpage.rb
@@ -452,7 +452,7 @@ WOK
               format_text=Format_text_object.new(one,two)
               para=format_text.seg_no_paranum
             end
-            para='' if (para =~/<a name="n\d+">/ \
+            if (para =~/<a name="n\d+">/ \
             and para =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/) # -endnote
               para=''
             end
diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index 13a815c1..50cc66f4 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2007-09-29" "0.61.0" "SiSU"
+.TH "sisu" "1" "2007-09-29" "0.62.0" "SiSU"
 .SH NAME
 sisu \- documents: markup, structuring, publishing in multiple standard formats, and search
 .SH SYNOPSIS
@@ -1523,10 +1523,10 @@ about SiSU <http://www.jus.uio.no/sisu/> \ [^13] markup
 
 
 .nf
-      [ tux.png ]
+     [ tux.png ]
   % various url linked images
-      [ tux.png ]
-      [ GnuDebianLinuxRubyBetterWay.png ]
+     [ tux.png ]
+     [ GnuDebianLinuxRubyBetterWay.png ]
   {~^ ruby_logo.png \"Ruby\" }http://www.ruby\-lang.org/en/
 .fi
 
@@ -4565,14 +4565,14 @@ DC Date:
 
 .BR
 Sourcefile:
-.I sisu._sst
+.I sisu.ssm.sst
 
 .BR
 Filetype:
 .I SiSU text insert 0.58
 
 .BR
-Sourcefile Digest, MD5(sisu._sst)=
+Sourcefile Digest, MD5(sisu.ssm.sst)=
 .I 8aad6597f7572baae4f0ef75999e5b4f
 
 .BR
@@ -4584,13 +4584,13 @@ Skin_Digest: MD5(skin_sisu_manual.rb)=
 
 .BR
 Document (metaverse) last generated:
-.I Fri Oct 12 20:14:00 +0100 2007
+.I Tue Oct 16 23:24:03 +0100 2007
 
 .BR
 Generated by:
 .I SiSU
-.I 0.61.0
-of 2007w41/1 (2007\-10\-08)
+.I 0.62.0
+of 2007w41/0 (2007\-10\-14)
 
 .BR
 Ruby version:
@@ -4747,10 +4747,10 @@ pdf: <http://www.jus.uio.no/sisu/sisu/landscape.pdf>
 at: <http://www.jus.uio.no/sisu>
 .TP
 .TP
-* Generated by: SiSU 0.61.0 of 2007w41/1 (2007-10-08)
+* Generated by: SiSU 0.62.0 of 2007w41/0 (2007-10-14)
 .TP
 * Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux]
 .TP
-* Last Generated on: Fri Oct 12 20:14:00 +0100 2007
+* Last Generated on: Tue Oct 16 23:24:03 +0100 2007
 .TP
 * SiSU http://www.jus.uio.no/sisu