From 8bafe4ee12a7be4f311e1782a7dd56666a9da2dd Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Tue, 25 Mar 2003 06:35:53 +0000
Subject: [PATCH] Changed module docstring and the order of arguments for
 startnickserv

---
 plugins/NickServ.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/NickServ.py b/plugins/NickServ.py
index 79a8ee53f..04abd5b3a 100644
--- a/plugins/NickServ.py
+++ b/plugins/NickServ.py
@@ -29,7 +29,12 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
-"""NickServ: Handles management of nicks with NickServ."""
+"""
+NickServ: Handles management of nicks with NickServ.
+
+Commands include:
+  startnickserv (bot's nick, password, NickServ's nick [defaults to NickServ])
+"""
 
 from baseplugin import *
 
@@ -47,11 +52,14 @@ class NickServ(callbacks.Privmsg):
         self.started = False
         
     def startnickserv(self, irc, msg, args):
-        "<bot's nick> <name of the NICKSERV> <password>"
+        "<bot's nick> <password> <NickServ's nick (defaults to NickServ)>"
         if ircutils.isChannel(msg.args[0]):
             irc.error(msg, 'Command must not be done in a channel.')
         if ircdb.checkCapability(msg.prefix, 'owner'):
-            (self.nick, self.nickserv, self.password)=privmsgs.getArgs(args, 3)
+            (self.nick, self.password, nickserv) = privmsgs.getArgs(args, 
+                                                                    needed=2, 
+                                                                    optional=1)
+            self.nickserv = nickserv or 'NickServ'
             self.sentGhost = 0
             self._ghosted = re.compile('%s.*killed' % self.nick)
             irc.reply(msg, conf.replySuccess)