Patch from aquanight to fix a problem introduced with some of the recent tidyups.

[user/henk/code/inspircd.git] / docs / inspircd.conf.example

diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index 52159a4042c1c0029542dee7be113a9fa6dee283..93e74e8b81b92c7e9abdaa9d232360d0be40454c 100644 (file)
--- a/docs/inspircd.conf.example
+++ b/docs/inspircd.conf.example
@@ -215,7 +215,7 @@
 #                password="blahblah" timeout="10" timeout="blah"      #
 #                flood="5" threshold="8" pingfreq="120" sendq="99999" #
 #                revcq="696969" localmax="3" globalmax="3"            #
-#                port="6660" maxchans="50">                           #
+#                port="6660" maxchans="50" limit="999">               #
 #                                                                     #
 #       <connect name="blocked" deny="127.0.0.1" port="6667">         #
 #                                                                     #
@@ -292,6 +292,11 @@
 #   only incoming connections on the specified port will match. Port  #
 #   tags may be used on connect allow and connect deny tags.          #
 #                                                                     #
+#   The limit value determines the maximum number of users which may  #
+#   be in this class. Combine this with CIDR masks for various ISP    #
+#   subnets to limit the number of users which may connect at any one #
+#   time from a certain ISP. Omit this value to not limit the tag.    #
+#                                                                     #
 
 <connect allow="196.12.*"  password="secret" port="6667">
 
@@ -303,7 +308,8 @@
          sendq="262144"
          recvq="8192"
          localmax="3"
-         globalmax="3">
+         globalmax="3"
+        limit="5000">
 
 <connect deny="69.254.*">
 <connect deny="3ffe::0/32">
@@ -728,6 +734,16 @@
 #                  QUITS. If specified, overrides both prefixquit     #
 #                  and suffixquit options.                            #
 #                                                                     #
+#  prefixpart    - A prefix to be placed on the start of a client's   #
+#                  part message                                       #
+#                                                                     #
+#  suffixpart    - A suffix to be placed on the end of a client's     #
+#                  part message.                                      #
+#                                                                     #
+#  fixedpart     - A fixed part message to display for all client     #
+#                  parts. If specified, overrides both prefixpart     #
+#                  and suffixpart options.                            #
+#                                                                     #
 #  loglevel      - specifies what detail of messages to log in the    #
 #                  log file. You may select from debug, verbose,      #
 #                  default, sparse and none.                          #
@@ -942,6 +958,8 @@
 #                                                                     #
 
 <options prefixquit="Quit: "
+         prefixpart="\""
+         suffixpart="\""
          loglevel="default"
          netbuffersize="10240"
          maxwho="128"
@@ -1508,6 +1526,14 @@
 # channel messages and channel notices.
 #<module name="m_deaf.so">
 
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+# Delay join module: Adds the channel mode +D which delays all JOIN
+# messages from users until they speak. If they quit or part before
+# speaking, their quit or part message will not be shown to the channel
+# which helps cut down noise on large channels in a more friendly way
+# than the auditorium mode. Only channel ops may set the +D mode.
+#<module name="m_delayjoin.so">
+
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Deny Channels: Deny Channels from being used by users
 #<module name="m_denychans.so"> 
@@ -1517,13 +1543,18 @@
 # If you have the m_denychans.so module loaded, you need to specify   #
 # the channels to deny:                                               #
 #                                                                     #
-# name        -      The channel name to deny.                        #
+# name        -      The channel name to deny. (glob masks are ok)    #
 #                                                                     #
 # allowopers  -      If operators are allowed to override the deny.   #
 #                                                                     #
 # reason      -      Reason given for the deny.                       #
 #                                                                     #
-#<badchan name="#gods" allowopers="yes" reason="Tortoises!">
+#<badchan name="#gods*" allowopers="yes" reason="Tortoises!">         #
+#                                                                     #
+# Additionally, you may specify channels which are allowed, even if   #
+# a badchan tag specifies it would be denied:                         #
+#<goodchan name="#godsleeps">                                         #
+# Glob masks are accepted here also.
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Devoice Module: Let users devoice themselves.
@@ -1804,6 +1835,7 @@
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Oper modes module: Allows you to specify modes to add/remove on oper
 # Specify the modes as the 'modes' parameter of the <type> tag
+# and/or as the 'modes' parameter of the <oper> tag.
 #<module name="m_opermodes.so">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#