Use a consistent naming scheme for operator privileges.

- users/callerid-override is now users/ignore-callerid.
- users/privdeaf-override is now users/ignore-privdeaf.

2 files changed, 4 insertions, 4 deletions

diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example
index 4f3008c07..8c8ab12d9 100644
--- a/docs/conf/helpop.conf.example
+++ b/docs/conf/helpop.conf.example
@@ -1074,7 +1074,7 @@ Note that all /STATS use is broadcast to online IRC operators.">
  r      Allows receipt of local oper commands (requires the operlog module).
  R      Allows receipt of remote oper commands (requires the operlog module).
  t      Allows receipt of attempts to use /STATS (local and remote).
- v      Allows receipt of oper-override notices (requires the override module).
+ v      Allows receipt of oper override notices (requires the override module).
  x      Allows receipt of local X-line notices (G/Z/Q/K/E/R/SHUN/CBan).
  X      Allows receipt of remote X-line notices (G/Z/Q/K/E/R/SHUN/CBan).">
 
diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf.example
index 62e2399e6..685a252ca 100644
--- a/docs/conf/opers.conf.example
+++ b/docs/conf/opers.conf.example
@@ -30,13 +30,13 @@
      #   - channels/ignore-noctcp: allows opers with this priv to send a CTCP to a +C channel.
      #   - channels/ignore-nonicks: allows opers with this priv to change their nick when on a +N channel.
      #   - channels/restricted-create: allows opers with this priv to create channels if the restrictchans module is loaded.
+     #   - users/flood/increased-buffers: allows opers with this priv to send and receive data without worrying about being disconnected for exceeding limits (*NOTE).
      #   - users/flood/no-fakelag: prevents opers from being penalized with fake lag for flooding (*NOTE).
      #   - users/flood/no-throttle: allows opers with this priv to send commands without being throttled (*NOTE).
-     #   - users/flood/increased-buffers: allows opers with this priv to send and receive data without worrying about being disconnected for exceeding limits (*NOTE).
-     #   - users/callerid-override: allows opers with this priv to message people using callerid without being on their callerid list.
+     #   - users/ignore-callerid: allows opers with this priv to message people using callerid without being on their callerid list.
      #   - users/ignore-commonchans: allows opers with this priv to send a message to a +c user without sharing common channels.
      #   - users/ignore-noctcp: allows opers with this priv to send a CTCP to a +T user.
-     #   - users/privdeaf-override: allows opers with this priv to message users with +D set.
+     #   - users/ignore-privdeaf: allows opers with this priv to message users with +D set.
      #   - users/sajoin-others: allows opers with this priv to /SAJOIN users other than themselves.
      #   - servers/use-disabled-commands: allows opers with this priv to use disabled commands.
      #   - servers/use-disabled-modes: allows opers with this priv to use disabled modes.