Document the mode/<name> oper permission now preferred in 2.1

1 files changed, 25 insertions, 25 deletions

diff --git a/docs/opers.conf.example b/docs/opers.conf.example
index 50e742c77..4399b6d44 100644
--- a/docs/opers.conf.example
+++ b/docs/opers.conf.example
@@ -26,17 +26,14 @@
      #   - users/mass-message: allows opers with this priv to PRIVMSG and NOTICE to a server mask (e.g. NOTICE $*)
      # OVERRIDE:
      #   - override/<permname>: allows permisison to be overridden via m_override
+     # MODES:
+     #   - mode/<modename>: allows setting/unsetting of oper-only modes
+     #     (the 2.0 usermodes/chanmodes parameters are still supported for lettered modes)
      #
-	 # NOTE: many of the settings (channels/high-join-limit, users/flood/*) have changed to
-	 # numerical settings in the <connect> class to allow them to be assigned to users.
+     # NOTE: many of the settings (channels/high-join-limit, users/flood/*) have changed to
+     # numerical settings in the <connect> class to allow them to be assigned to users.
      #
-     privs="users/auspex channels/auspex servers/auspex users/mass-message channels/high-join-limit"
-
-     # usermodes: Oper-only usermodes that opers with this class can use.
-     usermodes="*"
-
-     # chanmodes: Oper-only channel modes that opers with this class can use.
-     chanmodes="*">
+     privs="users/auspex channels/auspex servers/auspex users/mass-message channels/high-join-limit mode/*">
 
 <class name="ServerLink" commands="CONNECT SQUIT CONNECT MKPASSWD ALLTIME SWHOIS CLOSE JUMPSERVER LOCKSERV" usermodes="*" chanmodes="*" privs="servers/auspex">
 <class name="BanControl" commands="KILL GLINE KLINE ZLINE QLINE ELINE TLINE RLINE CHECK NICKLOCK SHUN CLONES CBAN" usermodes="*" chanmodes="*">
@@ -52,24 +49,26 @@
 #                                                                     #
 
 <type
-    # name: Name of type. Used in actual olines below.
-    # Cannot contain spaces. If you would like a space, use
-    # the _ character instead and it will translate to a space on whois.
-    name="NetAdmin"
+	# name: Name of type. Used in actual olines below.
+	# Cannot contain spaces. If you would like a space, use
+	# the _ character instead and it will translate to a space on whois.
+	name="NetAdmin"
 
-    # classes: classes (above blocks) that this type belongs to.
-    classes="OperChat BanControl HostCloak Shutdown ServerLink"
+	# classes: classes (above blocks) that this type belongs to.
+	classes="OperChat BanControl HostCloak Shutdown ServerLink"
+	# Note: for faster configuration, you can specify commands/privs directly in
+	# the <type> or <oper> blocks; in this case, no <class> blocks are required.
 
 	# class: A named <connect> class for this oper; use to raise general user limits
 	class="OperOnlyClass"
 
-    # vhost: host oper gets on oper-up. This is optional.
-    vhost="netadmin.omega.org.za"
+	# vhost: host oper gets on oper-up. This is optional.
+	vhost="netadmin.omega.org.za"
 
-    # modes: usermodes besides +o that are set on a oper of this type
-    # when they oper up. Used for snomasks and other things.
-    # Requires that m_opermodes.so be loaded.
-    modes="+s +cCqQ">
+	# modes: usermodes besides +o that are set on a oper of this type
+	# when they oper up. Used for snomasks and other things.
+	# Requires that m_opermodes.so be loaded.
+	modes="+s +cCqQ">
 
 <type name="GlobalOp" classes="OperChat BanControl HostCloak ServerLink" vhost="ircop.omega.org.za">
 <type name="Helper" classes="HostCloak" vhost="helper.omega.org.za">
@@ -119,12 +118,13 @@
       # This setting only takes effect if m_sslinfo is loaded.
       #sslonly="yes"
 
-      # vhost: overrides the vhost in the type block. Class and modes may also
-      # be overridden
+      # vhost: overrides the vhost in the type block. You can also override
+      # any fields in <type> or <class> blocks; permissions and command lists
+      # are merged (the oper gets all specified permissions)
       vhost="brain.netadmin.omega"
 
-      # type: What oper type this oline is. See the block above for list
-      # of types. NOTE: This is case-sensitive as well.
+      # type: What oper type this oline is. Must match a <type> block defined
+      # above. Note: this is case sensitive. Use "_" for a space.
       type="NetAdmin">
 
 # oline with plain-text password and no comments..for all who like copy & paste