clean up and clarify example operator blocks

See #1426

default.yaml

@@ -576,10 +576,10 @@ channels:
 
 # operator classes
 oper-classes:
-    # local operator
+    # IRC operator: can ban and unban users from the server
-    "local-oper":
+    "irc-oper":
         # title shown in WHOIS
-        title: Local Operator
+        title: IRC Operator
 
         # capability names
         capabilities:
@@ -590,32 +590,18 @@ oper-classes:
             - "roleplay"
             - "relaymsg"
 
-    # network operator
+    # server admin: has full control of application-level privileges, including
-    "network-oper":
+    # nickname and channel registrations
-        # title shown in WHOIS
-        title: Network Operator
-
-        # oper class this extends from
-        extends: "local-oper"
-
-        # capability names
-        capabilities:
-            - "remote_kill"
-            - "remote_ban"
-            - "remote_unban"
-
-    # server admin
     "server-admin":
         # title shown in WHOIS
         title: Server Admin
 
         # oper class this extends from
-        extends: "local-oper"
+        extends: "irc-oper"
 
         # capability names
         capabilities:
             - "rehash"
-            - "die"
             - "accreg"
             - "sajoin"
             - "samode"
@@ -626,7 +612,7 @@ oper-classes:
 
 # ircd operators
 opers:
-    # operator named 'admin'; log in with /OPER admin [password]
+    # default operator named 'admin'; log in with /OPER admin <password>
     admin:
         # which capabilities this oper has access to
         class: "server-admin"
@@ -661,6 +647,13 @@ opers:
         # granted automatically as soon as you connect with the right fingerprint.
         #auto: true
 
+    # example of a second, less privileged operator named 'alice'
+    # (log in with /OPER alice <password>):
+    #alice:
+    #    class: "irc-oper"
+    #    whois-line: "can help with moderation issues"
+    #    password: "$2a$04$0123456789abcdef0123456789abcdef0123456789abcdef01234"
+
 # logging, takes inspiration from Insp
 logging:
     -

traditional.yaml

@@ -548,10 +548,10 @@ channels:
 
 # operator classes
 oper-classes:
-    # local operator
+    # IRC operator: can ban and unban users from the server
-    "local-oper":
+    "irc-oper":
         # title shown in WHOIS
-        title: Local Operator
+        title: IRC Operator
 
         # capability names
         capabilities:
@@ -562,32 +562,18 @@ oper-classes:
             - "roleplay"
             - "relaymsg"
 
-    # network operator
+    # server admin: has full control of application-level privileges, including
-    "network-oper":
+    # nickname and channel registrations
-        # title shown in WHOIS
-        title: Network Operator
-
-        # oper class this extends from
-        extends: "local-oper"
-
-        # capability names
-        capabilities:
-            - "remote_kill"
-            - "remote_ban"
-            - "remote_unban"
-
-    # server admin
     "server-admin":
         # title shown in WHOIS
         title: Server Admin
 
         # oper class this extends from
-        extends: "local-oper"
+        extends: "irc-oper"
 
         # capability names
         capabilities:
             - "rehash"
-            - "die"
             - "accreg"
             - "sajoin"
             - "samode"
@@ -598,7 +584,7 @@ oper-classes:
 
 # ircd operators
 opers:
-    # operator named 'admin'; log in with /OPER admin [password]
+    # default operator named 'admin'; log in with /OPER admin <password>
     admin:
         # which capabilities this oper has access to
         class: "server-admin"
@@ -633,6 +619,13 @@ opers:
         # granted automatically as soon as you connect with the right fingerprint.
         #auto: true
 
+    # example of a second, less privileged operator named 'alice'
+    # (log in with /OPER alice <password>):
+    #alice:
+    #    class: "irc-oper"
+    #    whois-line: "can help with moderation issues"
+    #    password: "$2a$04$0123456789abcdef0123456789abcdef0123456789abcdef01234"
+
 # logging, takes inspiration from Insp
 logging:
     -