* Port [3011] to 1.2.11

 * Fix typo for help 'channel' (reference to old flag +f)


svn: 3012

doc/UPDATES

@@ -3,7 +3,7 @@ Numbers expressed as '#12' are references to a ticket/bug posting which can be v
 Lines prefixed with '-' were disabled before release and are not finished, or are planned changes.
 
 1.2.11
-* Fixed typo in help for .set/.conf
+* Fixed typo in help for .set/.conf/.channel
 * Fixed a bug in cmd_chattr with |m users. (fixes #267)
 * Suicide now removes userfile backups, most pid files, and crontab entries. (Fixes #125)
 * Fixed removed bots not being automatically unlinked from botnet. (fixes #254)

misc/help.txt

@@ -525,8 +525,8 @@ See also: %{-}%{+n}+chan, -chan%{-}%{+m|m}, chanset%{-}
    a person is using.  The time displayed is the time the user
    joined the channel.  The next field is the attributes:
       n - bot owner                      o - can get ops (+o)
-      m - bot master or owner            f - channel friend
-      b - another bot                    d - cannot get ops (+d)
+      m - bot master or owner            b - another bot
+      d - cannot get ops (+d)
    The last field is the user@host he is using irc from.
  
 See also: status, whois