Merge PR #171

ilbelkyr · ilbelkyr · commit 4b033a7b9221 · 2019-10-23T21:26:24.000Z
Not sure why I hadn't merged this before, but it makes my previous +u
commit quite redundant.
diff --git a/help/Makefile.in b/help/Makefile.in
@@ -16,7 +16,7 @@ SYMLINKS=	topic accept cmode admin names links away whowas \
 		version kick who invite quit join list nick oper part \
 		time credits motd userhost users whois ison lusers \
 		user help pass error challenge knock ping pong \
-		cprivmsg cnotice map trace chantrace extban
+		cprivmsg cnotice map trace chantrace extban remove
 
 all:
 build:
diff --git a/help/opers/cmode b/help/opers/cmode
@@ -18,8 +18,8 @@ NO PARAMETERS:
               weakens +i control.
      +z     - Op moderated.  Messages blocked by +m, +b and +q are instead
               sent to ops.
-     +u     - Unfiltered.  Messages to the channel are not subject to
-              content-based spam filtering.
+     +u     - Unfiltered.  Server-side content filters do not check messages
+              to this channel.
      +L     - Large ban list.  Increase maximum number of +beIq entries.
               Only settable by opers.
      +P     - Permanent.  Channel does not disappear when empty.  Only
@@ -50,7 +50,7 @@ WITH PARAMETERS:
      +o     - Op.  Allows a user full control over the channel.
               PARAMS: /mode #channel +o nick
      +b     - Ban.  Prevents a user from entering the channel, and from
-              sending or changing nick if they are on it, based on a 
+              sending or changing nick if they are on it, based on a
               nick!ident@host match.
               PARAMS: /mode #channel +b nick!user@host
      +q     - Quiet.  Prevents a user from sending to the channel or changing
@@ -60,6 +60,6 @@ WITH PARAMETERS:
               they are banned (+b) or quieted (+q), based on a nick!ident@host
               match.
               PARAMS: /mode #channel +e nick!user@host
-     +I     - Invite Exempt.  Allows a user to join a +i channel without an 
+     +I     - Invite Exempt.  Allows a user to join a +i channel without an
               invite, based on a nick!user@host match.
               PARAMS: /mode #channel +I nick!user@host
diff --git a/help/opers/connect b/help/opers/connect
@@ -1,7 +1,7 @@
 CONNECT <server_A> [port] [server_B]
 
 When [server_B] is used, CONNECT asks [server_B] to
-connect to <server_A>.  Requires Oper Priv: R
+connect to <server_A>.  Requires Oper Priv: routing
 
 The [port] must be specified with [server_B], this is
 usually 6667.  To use the default port in the connect
diff --git a/help/opers/die b/help/opers/die
@@ -2,4 +2,4 @@ DIE server.name
 
 Terminates the IRC server
 
-- Requires Oper Priv: D
+- Requires Oper Priv: die
diff --git a/help/opers/dline b/help/opers/dline
@@ -17,4 +17,4 @@ DLINE [duration] <ip> ON irc.server :[reason] [| oper reason]
 will dline the user on irc.server if irc.server accepts
 remote dlines. irc.server can contain wildcards.
 
-- Requires Oper Priv: K
+- Requires Oper Priv: kline
diff --git a/help/opers/grant b/help/opers/grant
@@ -0,0 +1,9 @@
+GRANT <target> deoper
+
+Removes oper status from <target>.
+
+GRANT <target> <privset>
+
+Opers <target> with the privset <privset>.
+
+- Requires Oper Priv: grant
diff --git a/help/opers/kill b/help/opers/kill
@@ -3,5 +3,4 @@ KILL <nick> <reason>
 Disconnects user <nick> from the IRC server he/she
 is connected to with reason <reason>.
 
-- Requires Oper Priv: C
-- Requires Oper Priv: O for users not on your IRC server
+- Requires Oper Priv: kill
diff --git a/help/opers/kline b/help/opers/kline
@@ -23,4 +23,5 @@ KLINE [duration] <user@host> ON irc.server :[reason] [| oper reason]
 will kline the user on irc.server if irc.server accepts
 remote klines. irc.server can contain wildcards.
 
-- Requires Oper Priv: K
+- Requires Oper Priv: kline
+- Requires Oper Priv: remoteban when "ON" is used
diff --git a/help/opers/modlist b/help/opers/modlist
@@ -5,4 +5,4 @@ ircd, along with their address and version.
 When a match string is provided, modlist only prints
 modules with names matching the match string.
 
-- Requires Oper Priv: A
+- Requires Oper Priv: admin
diff --git a/help/opers/modload b/help/opers/modload
@@ -5,4 +5,4 @@ the optional path can be an absolute path
 from / or from the IRCD_PREFIX
 (ie modules/autoload/m_users.so)
 
-- Requires Oper Priv: A
+- Requires Oper Priv: admin
diff --git a/help/opers/modreload b/help/opers/modreload
@@ -3,4 +3,4 @@ MODRELOAD <module.so>
 -- Reload a module in the ircd
 Use just the module name, the path is not needed.
 
-- Requires Oper Priv: A
+- Requires Oper Priv: admin
diff --git a/help/opers/modrestart b/help/opers/modrestart
@@ -4,4 +4,4 @@ MODRESTART
 All modules are unloaded, then those in modules/autoload
 are loaded
 
-- Requires Oper Priv: A
+- Requires Oper Priv: admin
diff --git a/help/opers/modunload b/help/opers/modunload
@@ -5,4 +5,4 @@ Use just the module name, the path is not needed.
 When a module is unloaded, all commands associated
 with it are unloaded as well.
 
-- Requires Oper Priv: A
+- Requires Oper Priv: admin
diff --git a/help/opers/operwall b/help/opers/operwall
@@ -3,4 +3,4 @@ OPERWALL :<message>
 Sends an OPERWALL message of <message> to all
 opers who are umode +z
 
-- Requires Oper Priv: L
+- Requires Oper Priv: operwall
diff --git a/help/opers/rehash b/help/opers/rehash
@@ -17,11 +17,11 @@ ircd.conf file.
   TRESVS   - Clears temporary nick and channel resvs
   TXLINES  - Clears temporary X Lines
 
-- Requires Oper Priv: H
+- Requires Oper Priv: rehash
 
 REHASH [option] irc.server
 
 Rehashes [option], or the config file if none given, on irc.server if
 irc.server accepts remote rehashes.
 
-- Requires Oper Priv: HB
+- Requires Oper Priv: rehash, remoteban
diff --git a/help/opers/remove b/help/opers/remove
@@ -0,0 +1,5 @@
+REMOVE <channel> <nick> :[msg]
+
+The REMOVE command functions identically to a kick,
+but is sent to users as a PART.  You must be a
+channel operator to use this command.
diff --git a/help/opers/restart b/help/opers/restart
@@ -2,4 +2,4 @@ RESTART server.name
 
 Restarts the IRC server.
 
-- Requires Oper Priv: D
+- Requires Oper Priv: die
diff --git a/help/opers/squit b/help/opers/squit
@@ -1,4 +1,5 @@
 SQUIT <server> [reason]
 
 Splits <server> away from your side of the net with [reason].
-- Requires Oper Priv: R for servers not connected to you
+
+- Requires Oper Priv: routing
diff --git a/help/opers/umode b/help/opers/umode
@@ -4,15 +4,17 @@ Usermodes: (* designates that the umode is oper only)
 
      USERMODE     DESCRIPTION
 -----------------------------------------------------------------
-         +i     - Designates this client 'invisible'.
-         +g     - "caller id" mode only allow accept clients to message you
-         +u     - Disables content-based spam filtering for private messages
-                  you receive.
+         +i     - Invisible - hides you from channel listings by users who do
+                  not share the channel with you.
+         +g     - "caller id" mode - prevents anyone from messaging you until
+                  /accept-ed.
          +w     - Can see oper and server wallops.
          +o     - Designates this client is an IRC Operator.
                   Use the /oper command to attain this.
          +O     - Designates this client is a 'helper' -- operator with reduced
                   privilege. Use the /oper command to attain this.
+         +u     - Unfiltered - messages to you will not be subject to
+                  server-side content filtering. Redundant for opers.
        * +a     - Is marked as a server admin in whois.
        * +l     - Can see oper locops (local wallops).
        * +s     - Can see server notices (see /quote help snomask).
@@ -22,4 +24,4 @@ Usermodes: (* designates that the umode is oper only)
          +Q     - Prevents you from being affected by channel forwarding.
          +R     - Prevents unidentified users from messaging you. You may
                   exempt individuals with /accept .
-         +Z     - Is connected via SSL (cannot be set or unset).
+         +Z     - Is connected via TLS (cannot be set or unset).
diff --git a/help/opers/undline b/help/opers/undline
@@ -2,4 +2,4 @@ UNDLINE <ip>
 
 Will attempt to undline the given <ip>
 
-- Requires Oper Priv: U
+- Requires Oper Priv: unkline
diff --git a/help/opers/unkline b/help/opers/unkline
@@ -7,4 +7,4 @@ UNKLINE <user@host> ON irc.server will unkline
 the user on irc.server if irc.server accepts
 remote unklines.
 
-- Requires Oper Priv: U
+- Requires Oper Priv: unkline
diff --git a/help/opers/unxline b/help/opers/unxline
@@ -2,9 +2,11 @@ UNXLINE <gecos>
 
 Will attempt to unxline the given <gecos>
 
+- Requires Oper Priv: xline
+
 
 UNXLINE <gecos> ON <server>
 
 Will attempt to unxline the given <gecos> on <server>.
 
-- Requires Oper Priv: X
+- Requires Oper Priv: remoteban, xline
diff --git a/help/opers/wallops b/help/opers/wallops
@@ -5,4 +5,4 @@ who are umode +w (including non-opers).
 
 Server sent WALLOPS go to all opers who are umode +w.
 
-- Requires Oper Priv: M
+- Requires Oper Priv: massnotice
diff --git a/help/opers/xline b/help/opers/xline
@@ -1,7 +1,7 @@
 XLINE [time] <gecos> :<reason>
 
 Bans by gecos (aka 'real name') field.  If [time] is not specified
-this is added to the database, otherwise is temporary for [time] 
+this is added to the database, otherwise is temporary for [time]
 minutes.
 
 Eg. /quote xline eggdrop?bot :no bots
@@ -12,17 +12,17 @@ The <gecos> field contains certain special characters:
   @ - Match any letter [A-Za-z]
   # - Match any digit [0-9]
 
-To use a literal one of these characters, escape it with '\'.  A 
+To use a literal one of these characters, escape it with '\'.  A
 literal '\' character must also be escaped.  You may also insert \s
 which will be converted into a space.
 
 If the <gecos> field is purely numeric (ie "123") then the time
-field must be specified.  "0" must be used to denote a permanent 
+field must be specified.  "0" must be used to denote a permanent
 numeric XLINE.
 
 XLINE [time] <gecos> ON <server> :<reason>
 
 Will attempt to set the XLINE on <server> if <server> accepts
 remote xlines.
 
-- Requires Oper Priv: X
+- Requires Oper Priv: xline
diff --git a/help/users/umode b/help/users/umode
@@ -4,13 +4,15 @@ Usermodes:
 
      USERMODE     DESCRIPTION
 -----------------------------------------------------------------
-         +i     - Designates this client 'invisible'.
-         +g     - "caller id" mode only allow accept clients to message you
-         +u     - Disables content-based spam filtering for private messages
-                  you receive.
-         +w     - Can see oper wallops.
+         +i     - Invisible - hides you from channel listings by users who do
+                  not share the channel with you.
+         +g     - "caller id" mode - prevents anyone from messaging you until
+                  /accept-ed.
+         +u     - Unfiltered - messages to you will not be subject to
+                  server-side content filtering.
+         +w     - Wallops - you receive /wallops messages from staff.
          +D     - Deaf - ignores all channel messages.
          +Q     - Prevents you from being affected by channel forwarding.
          +R     - Prevents unidentified users from messaging you. You may
                   exempt individuals with /accept .
-         +Z     - Is connected via SSL (cannot be set or unset).
+         +Z     - Is connected via TLS (cannot be set or unset).

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ DIE server.name`
`2`	`2`
`3`	`3`	`Terminates the IRC server`
`4`	`4`
`5`		`-- Requires Oper Priv: D`
	`5`	`+- Requires Oper Priv: die`