Merge branch 'insp4' into master.

1 files changed, 14 insertions, 10 deletions

diff --git a/docs/conf/modules.example.conf b/docs/conf/modules.example.conf
index fb05e08de..9530afd9c 100644
--- a/docs/conf/modules.example.conf
+++ b/docs/conf/modules.example.conf
@@ -1329,10 +1329,10 @@
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # IRCv3 module: Provides the IRCv3 account-notify, away-notify,
-# extended-join, and standard-replies extensions. These are optional
-# enhancements to the client-to-server protocol. An extension is only
-# active for a client when the client specifically requests it, so this
-# module needs the cap module to work.
+# extended-join, no-implicit-names, and standard-replies extensions.
+# These are optional enhancements to the client-to-server protocol.
+# An extension is only active for a client when the client specifically
+# requests it, so this module needs the cap module to work.
 #
 # Further information on these extensions can be found at the IRCv3
 # working group website:
@@ -1340,8 +1340,7 @@
 #
 #<module name="ircv3">
 # The following block can be used to control which extensions are
-# enabled. Note that extended-join can be incompatible with delayjoin
-# and host cycling.
+# enabled.
 #<ircv3 accountnotify="yes"
 #       awaynotify="yes"
 #       extendedjoin="yes"
@@ -1380,10 +1379,10 @@
 #<module name="ircv3_ctctags">
 #
 # If you want to only allow client tags that are intended for processing
-# by the server you can set allowclientonlytags to "none". Alternately,
-# you can set it to "known" to filter to known tags. Doing this is not
-# recommended though as it may break clients.
-#<ctctags allowclientonlytags="all">
+# by the server you can set clientonlytags to "none". Alternately, you
+# can set it to "known" to filter to known tags. Changing this is not
+# recommended though as it is known to break some clients.
+#<ctctags clientonlytags="all">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # IRCv3 echo-message module: Provides the echo-message IRCv3
@@ -2661,6 +2660,11 @@
 # Does not do anything useful without a working TLS module and the
 # sslinfo module (see below).
 #<module name="sslmodes">
+#
+# By default the fingerprint extban can only be used by users who can
+# see fingerprints of other users (i.e. <sslinfo:operonly>). You can
+# override this behaviour with extbanoperonly.
+#<sslmodes extbanoperonly="yes">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Strip color module: Adds channel mode +S that strips IRC formatting