From 887ab0cd350434b67b17c545e5975869bddd8b11 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Thu, 22 Mar 2012 17:44:27 +0000
Subject: Tidied destroy command.

---
 lib/mauve/notifiers/xmpp.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/mauve/notifiers/xmpp.rb b/lib/mauve/notifiers/xmpp.rb
index 8a78fd3..a0ad86e 100644
--- a/lib/mauve/notifiers/xmpp.rb
+++ b/lib/mauve/notifiers/xmpp.rb
@@ -516,13 +516,13 @@ e.g.
 EOF
             when /^destroy/
               <<EOF
-Destroy command: Destroys or more alerts.
+Destroy command: Destroys one or more alerts.
 
 The syntax is
 
   destroy <alert list>
 
- * The alert list is a comma separated list.
+where <alert list> is a comma separated list of alert IDs.
 
 e.g.
   destroy 1,2,3  -- destroys alerts 1, 2, and 3.
@@ -677,9 +677,9 @@ EOF
             end
 
             if alert.destroy!
-              msg << "#{alert_id}: destroyed"
+              msg << "#{alert.to_s} destroyed"
             else
-              msg << "#{alert_id}: destruction failed."
+              msg << "#{alert.to_s}: destruction failed."
             end
           end
 
-- 
cgit v1.2.1