Merge insp20

[user/henk/code/inspircd.git] / docs / conf / helpop.conf.example

diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example
index c17ae87a59f86ff66036441fbf18b5e451be2479..84219dd94b0e9f4eadee4531707adf3867f6a4fc 100644 (file)
--- a/docs/conf/helpop.conf.example
+++ b/docs/conf/helpop.conf.example
@@ -50,7 +50,7 @@ OPER">
 -------------
 
 OPERMOTD  CHECK     CLONES      USERIP   TLINE
-ALLTIME   WALLOPS   GLOBOPS
+ALLTIME   WALLOPS   GLOBOPS     MODENOTICE
 
 SETHOST   SETIDENT  CHGHOST     CHGIDENT CHGNAME
 SETIDLE   SWHOIS
@@ -186,6 +186,10 @@ LOCKSERV       UNLOCKSERV">
                     specified rate (requires nickflood module).
  G                  Censors messages to the channel based on the
                     network configuration (requires censor module).
+ H <num>:<duration> Displays the last <num> lines of chat to joining
+                    users. <duration> is the maximum time to keep
+                    lines in the history buffer (requires chanhistory
+                    module).
  J <seconds>        Prevents rejoin after kick for the specified
                     number of seconds. This prevents auto-rejoin
                     (requires kicknorejoin module).
@@ -195,7 +199,7 @@ LOCKSERV       UNLOCKSERV">
                     module).
  M                  Blocks unregistered users from speaking (requires
                     services account module).
- N                  Prevents users on the channel from chainging nick
+ N                  Prevents users on the channel from changing nick
                     (requires nonicks module).
  O                  Channel is IRCops only (can only be set by IRCops,
                     requires operchans module).
@@ -299,8 +303,6 @@ Acting extbans:
                matching users (requires blockcaps module).
  C:<banmask>   Blocks CTCPs from matching users (requires noctcp
                module).
- M:<account>   Blocks messages from users logged into a matching
-               account (requires services account module).
  N:<banmask>   Blocks nick changes from matching users (requires
                nonicks module).
  Q:<banmask>   Blocks kicks by matching users (requires nokicks
@@ -313,8 +315,8 @@ Acting extbans:
                (requires services account).
 
 A ban given to an Acting extban may either be a nick!user@host mask
-(unless stated otherwise, for example M: taking an account name),
-matched against users as for a normal ban, or a Matching extban.
+(unless stated otherwise), matched against users as for a normal ban,
+or a Matching extban.
 
 There is an additional special type of extended ban, a redirect ban: