Merge branch 'master' into next

commit a6a34697a08d2c177d4bdc7178f77c6ababbed3d
parent 0e2fd0c8e4835dd4ae48565a970b16689984da66
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Sat,  2 Feb 2008 20:53:50 -0800

Merge branch 'master' into next

Diffstat:

bin/sup

++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/sup b/bin/sup
@@ -94,7 +94,7 @@ rescue Index::LockError => e
 
   case h.ask("Should I ask that process to kill itself? ")
   when /^\s*y\s*$/i
-    h.say "Ok, suggesting sepuku..."
+    h.say "Ok, suggesting seppuku..."
     FileUtils.touch Redwood::SUICIDE_FN
     sleep SuicideManager::DELAY * 2
     FileUtils.rm_f Redwood::SUICIDE_FN
@@ -298,7 +298,7 @@ ensure
   Redwood::log "stopped cursing"
 
   if SuicideManager.instantiated? && SuicideManager.die?
-    Redwood::log "I've been ordered to commit sepuku. I obey!"
+    Redwood::log "I've been ordered to commit seppuku. I obey!"
   end
 
   if $exceptions.empty?

sup.git