Merge branch 'upstream' into debian/sid

3 files changed, 3 insertions, 3 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