Merge !tell feature. cvs up -j branchpoint-2001-10-09-tell -j merge-2001-10-09-tell

diff --cc bot.tcl
Simple merge

diff --cc helpinfos
index 2444f93d9a9f2e469670b8441cde1948abc628d8,bc96581833e46c9a58034b07f7cf908983a99ee1..8a2e2bdd3bab9e5de8e3863ca3bf55516443fa3d
--- 1/helpinfos
--- 2/helpinfos
+++ b/helpinfos
@@@ -10,11 -10,11 +10,12 @@@ General commands:           Registratio
   !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
-  !kill <nick> [<reason>]
+  !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
++ !ping [<stuff ...>]          !op [<chan>]
++ !kill <nick> [<reason>]      !leave [<chan>]
++ !tell <nick> <message ...>   !channel [<chan>] <setting> [....]
++Additional help topics:
++ !tutorial (long\!)  !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.
  
@@@ -192,15 -229,18 +230,22 @@@ Replies with hopefully-useful informati
    actual message traffic counts, and \!-commands don't count either.
  * The specified string, if any.
  I can tell you this automatically if you like - see `help !marktime'.
+ If you have undelivered messages sent with !tell by or to you, I'll
+ let you know about those too (privately, if you ping on channel).
  
  :marktime
- !set marktime off    Only an explicit `!ping' command sends you info.
- set marktime once   Send ping info shortly after I first see you.
- set marktime <n>s   Also send info every <n> seconds (min 300s).
- set marktime <n>ks  Also send info every <n> kiloseconds (min 1ks).
- set marktime <n>m   Also send info every <n> minutes (min 5m).
- set marktime <n>h   Also send info every <n> hours (min 1h).
+ !set marktime off        Only an explicit `!ping' command sends info.
+ set marktime once       Send ping info shortly after I first see you.
+ set marktime <!interval> Also send info regularly (min. interval 5m).
+ 
+ :interval
+ Intervals in commands are <amount><unit>, where the unit is one of
+ s for seconds, ks for kiloseconds, m for minutes, h for hours.
+ 
++:tutorial
++Sorry, there is no tutorial.  If you would like to contribute by
++writing one, please email ijackson@chiark.greenend.org.uk.
 +
  # Local variables:
  # fill-column: 69
  # End: