Merge insp20

1 files changed, 16 insertions, 8 deletions

diff --git a/docs/conf/helpop-full.conf.example b/docs/conf/helpop-full.conf.example
index 353270c33..7899586f8 100644
--- a/docs/conf/helpop-full.conf.example
+++ b/docs/conf/helpop-full.conf.example
@@ -115,7 +115,7 @@ E.g. /RMODE #Chan b m:* will remove all mute extbans.">
 
 <helpop key="fpart" value="/FPART <channel> <nick> [<reason>]
 
-This behaves identically to /REMOVE. /REMOVE is a builtin mIRC command
+This behaves identically to /REMOVE. /REMOVE is a built-in mIRC command
 which caused trouble for some users.">
 
 <helpop key="devoice" value="/DEVOICE <channel>
@@ -378,7 +378,7 @@ Sets your name to the specified name.">
 -------------
 
 OPERMOTD  CHECK     CLONES      USERIP   TLINE
-ALLTIME   WALLOPS   GLOBOPS
+ALLTIME   WALLOPS   GLOBOPS     MODENOTICE
 
 SETHOST   SETIDENT  CHGHOST     CHGIDENT CHGNAME
 SETIDLE   SWHOIS
@@ -731,7 +731,7 @@ The duration may be specified in seconds, or in the format
 
 <helpop key="eline" value="/ELINE <user@host> [<duration> :<reason>]
 
-Sets or removes a e-line (local ban exception) on host mask.
+Sets or removes a e-line (global ban exception) on host mask.
 You must specify at least 3 parameters to add an exception, and one
 parameter to remove an exception (just the user@host section).
 
@@ -777,6 +777,12 @@ while methods G and Z also add G/Z-Lines for all the targets.
 
 When used, the victims won't see each other getting kicked or quitting.">
 
+<helpop key="modenotice" value="/MODENOTICE <modeletters> <message>
+
+Sends a notice to all users who have the given mode(s) set.
+If multiple mode letters are given, the notice is only sent to users
+who have all of them set.">
+
 ######################
 # User/Channel Modes #
 ######################
@@ -896,6 +902,10 @@ When used, the victims won't see each other getting kicked or quitting.">
                     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).
@@ -905,7 +915,7 @@ When used, the victims won't see each other getting kicked or quitting.">
                     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).
@@ -1060,8 +1070,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
@@ -1074,8 +1082,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: