Fix retarded windows linefeeds (brain >:()

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

diff --git a/conf/inspircd.conf.example b/conf/inspircd.conf.example
index 4ded58e6ebaed3b45c52f11d808ee30e6ddbcc77..dc92b66a245a8e7b20735062ef2a5ec72a32b7e9 100644 (file)
--- a/conf/inspircd.conf.example
+++ b/conf/inspircd.conf.example
@@ -351,7 +351,9 @@
 #  connect in the IP range 192.168.1.0-192.168.1.255, and ipv4clone   #
 #  was set to '24', the third connection would be disconnected.       #
 #                                                                     #
-#  Valid values are 0-32, but you *don't* want 0.                     #
+#  Valid values are 0-32, but you *don't* want 0. Using values which  #
+#  are not multiples of 8 can give confusing behaviour.               #
+#  For more info, see: http://www.inspircd.org/wiki/CIDR_Tutorial     #
 #                                                                     #
 # ipv6clone works in the same way, except for ipv6 addresses. Valid   #
 # range is 0-128, but you *don't* want anything too small.            #
@@ -872,10 +874,6 @@
 #                  This can be useful for finding servers which are   #
 #                  at risk of pinging out due to network issues.      #
 #                                                                     #
-#  exemptchanops - This option allows channel operators to be exempted#
-#                  from certain channel modes.                        #
-#                  Supported modes are +SfFgNc. Defaults to off.      #
-#                                                                     #
 #  defaultmodes  - The default modes to be given to each channel on   #
 #                  creation. Defaults to 'nt'. There should be no +   #
 #                  or - symbols in this sequence, if you add them     #
@@ -887,6 +885,14 @@
 #                  is totally freeform, you may place any text here   #
 #                  you wish.                                          #
 #                                                                     #
+#  exemptchanops - This option allows channel operators to be exempted#
+#                  from certain channel modes.                        #
+#                  Supported modes are +SfFgNc. Defaults to off.      #
+#                                                                     #
+#  invitebypassmodes - This option allows /invite to bypass modes     #
+#    other than +i.                                                   #
+#                                                                     #
+#                                                                     #
 
 <options prefixquit="Quit: "
          suffixquit=""
@@ -907,7 +913,8 @@
          allowhalfop="yes"
          defaultmodes="nt"
          moronbanner="You're banned! Email haha@abuse.com with the ERROR line below for help."
-         exemptchanops="">
+         exemptchanops=""
+        invitebypassmodes="yes">
 
 
 #-#-#-#-#-#-#-#-#-#-#-# PERFORMANCE CONFIGURATION #-#-#-#-#-#-#-#-#-#-#
@@ -1137,18 +1144,6 @@
 # You may also log *everything* by using a type of *, and subtract things out
 # of that by using -TYPE - for example "* -USERINPUT -USEROUTPUT".
 #
-# Channel Logging
-# ---------------
-#
-# I'm aware this would probably better belong in the modules section, but this
-# is heavily interrelated to logging, and as such will be documented here.
-#
-# m_chanlog is one of the modules which can alter logging to it's own thing.
-# An example of this may be:
-#
-#<module name="m_chanlog.so">
-#<log method="channel" type="OPER USERS CHANNELS" level="default" target="#services">
-#
 # The following log tag is highly default and uncustomised. It is recommended you
 # sort out your own log tags. This is just here so you get some output.
 <log method="file" type="* -USERINPUT -USEROUTPUT -m_spanningtree" level="default" target="ircd.log">