Merge up from trunk. cvs up -j branchpoint-2001-10-09-tell -j mergeup-1-2001-10...

[ircbot] / helpinfos

diff --git a/helpinfos b/helpinfos
index 2359e88b55ed7ab20756dfa7690529435af542c8..9d920d2d114c2033d4811a139dec1f35cd58d2a7 100644 (file)
--- a/helpinfos
+++ b/helpinfos
@@ -10,11 +10,11 @@ General commands:           Registration and user settings:
  !help [<cmd>|<opt>|<topic>]  !register [insecure|delete]
  !seen <nick>                 !set [<opt> [<value>]]      who [<nick>]
  !summon <username>           (See `help !identify', `help !blight-id')
- !invite [<chan>] <nick>...  Channel settings (see `help channel'):
- !op [<chan>]                 !channel [<chan>] <setting> [....]
- !leave [<chan>]             Additional help topics:
- !ping [<stuff ...>]          !identify !identpass !invite !blight-id
- !tell <nick> <message ...>
+ !invite [<chan>] <nick>...  For channel managers (see `help channel'):
+ !leave [<chan>]              !channel [<chan>] <setting> [....]
+ !ping [<stuff ...>]          !op [<chan>]                          
+ !tell <nick> <message ...>  Additional help topics:                 
+ !kill <nick> [<reason>]      !identify !identpass !invite !blight-id
 Send commands to me by /msg, or say them in channel with \! in front.
 To get me on a channel, invite me.  To become channel manager, op me.
 
@@ -190,6 +190,12 @@ invite <channel> <nick> ...   privately
  This can be disabled for managed channels - see `help !userinvite'.
 To get me to join a channel, just invite me to it.
 
+:kill
+kill <nick> [<reason>]
+ Asks me to throw that client off IRC completely, using my IRC
+ Operator privilege.  You must have identified yourself as the user
+ to whom the nick is registered.  (See `help !register'.)
+
 :register
 register            register your nick (or make it secure)
 register delete     delete your nick registration
@@ -204,13 +210,15 @@ register insecure   register your nick insecurely
 set                  show your current settings
 set <option>         show the current setting of <option>
 set <option> <value> set <option> to <value>
- Options:   !timeformat ks|hms   !marktime off|once|<!interval>
-            !tellme ...
+ Options:  !timeformat ks|hms|beat
+           !marktime off|once|<n>[k]s|<n>m|<n>h
+           !tellme ...
  See also `help <option>', `help !register' and `help !identify'
 
 :timeformat
-!set timeformat ks   show times in seconds, kiloseconds, etc.
-set timeformat hms  use days, hours, minutes, seconds
+!set timeformat ks    show times in seconds, kiloseconds, etc.
+set timeformat hms   use days, hours, minutes, seconds
+set timeformat beat  use beats (1000 B = 1 day)
 
 :ping
 ping [<string>]