Merge branch 'typos'

plugins/Channel/plugin.py

@@ -419,7 +419,7 @@ class Channel(callbacks.Plugin):
         nick = msg.args[1]
         nick = ircutils.toLower(nick)
         replyIrc = self.invites.pop((irc, nick), None)
-        if replyirc is not None:
+        if replyIrc is not None:
             replyIrc.error(format('There is no %s on this server.', nick))
 
     class lobotomy(callbacks.Commands):

plugins/Factoids/plugin.py

@@ -386,7 +386,7 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
         """[<channel>] [--values] [--{regexp} <value>] [<glob> ...]
 
         Searches the keyspace for keys matching <glob>.  If --regexp is given,
-        it associated value is taken as a regexp and matched against the keys.
+        its associated value is taken as a regexp and matched against the keys.
         If --values is given, search the value space instead of the keyspace.
         """
         if not optlist and not globs:

plugins/Karma/plugin.py

@@ -280,7 +280,7 @@ class Karma(callbacks.Plugin):
         N karmas, where N is determined by the config variable
         supybot.plugins.Karma.rankingDisplay.  If one <thing> is given, returns
         the details of its karma; if more than one <thing> is given, returns
-        the total karma of each of the the things. <channel> is only necessary
+        the total karma of each of the things. <channel> is only necessary
         if the message isn't sent on the channel itself.
         """
         if len(things) == 1:

plugins/NickCapture/plugin.py

@@ -35,7 +35,7 @@ import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks
 
 class NickCapture(callbacks.Plugin):
-    """This module constantly tries to take whatever nick is configured as
+    """This plugin constantly tries to take whatever nick is configured as
     supybot.nick.  Just make sure that's set appropriately, and thus plugin
     will do the rest."""
     public = False

plugins/Protector/plugin.py

@@ -96,7 +96,7 @@ class Protector(callbacks.Plugin):
         channel = msg.args[0]
         chanOp = ircdb.makeChannelCapability(channel, 'op')
         chanVoice = ircdb.makeChannelCapability(channel, 'voice')
-        chanhalfop = ircdb.makeChannelCapability(channel, 'halfop')
+        chanHalfOp = ircdb.makeChannelCapability(channel, 'halfop')
         if not ircdb.checkCapability(msg.prefix, chanOp):
             irc.sendMsg(ircmsgs.deop(channel, msg.nick))
         for (mode, value) in ircutils.separateModes(msg.args[1:]):

plugins/Topic/plugin.py

@@ -468,7 +468,7 @@ class Topic(callbacks.Plugin):
     def unlock(self, irc, msg, args, channel):
         """[<channel>]
 
-        Locks the topic (sets the mode +t) in <channel>.  <channel> is only
+        Unlocks the topic (sets the mode -t) in <channel>.  <channel> is only
         necessary if the message isn't sent in the channel itself.
         """
         if not self._checkManageCapabilities(irc, msg, channel):