Fix a typo in an m_callerid error message, and add m_callerid and m_filter <exemptfromfilter> to example conf.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8748 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 24 insertions, 1 deletions

diff --git a/conf/inspircd.filter.example b/conf/inspircd.filter.example
index 3aa19aa37..8200a028f 100644
--- a/conf/inspircd.filter.example
+++ b/conf/inspircd.filter.example
@@ -55,3 +55,5 @@
 #
 # <keyword pattern="^blah.*?$" reason="Dont blah!" action="gline" duration="1d6h" flags="pnPq">
 
+# An example of excluding a channel from filtering:
+# <exemptfromfilter channel="#help">
diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index 93e74e8b8..9e9256745 100644
--- a/docs/inspircd.conf.example
+++ b/docs/inspircd.conf.example
@@ -1275,6 +1275,27 @@
 #<module name="m_botmode.so">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+# CallerID module: Adds usermode +g which activates hybrid-style 
+# callerid (== block all private messages unless you /accept first)
+#<module name="m_callerid.so">
+# 
+#-#-#-#-#-#-#-#-#-#-#- CALLERID  CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#
+# maxaccepts     - Maximum number of entires a user can add to his    #
+#                  /accept list. Default is 16 entries.               #
+# operoverride   - Can opers (note: ALL opers) ignore callerid mode?  #
+#                  Default is no.                                     #
+# tracknick      - Preserve /accept entries when a user changes nick? #
+#                  If no (the default), the user is removed from      #
+#                  everyone's accept list if he changes nickname.     #
+# cooldown       - Amount of time (in seconds) that must pass since   #
+#                  the last notification sent to a user before he can #
+#                  be sent another. Default is 60 (1 minute).         #
+#<callerid maxaccepts="16"
+#          operoverride="no"
+#          tracknick="no"
+#          cooldown="60"
+
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # CBAN module: Lets you disallow channels from being used at runtime.
 #<module name="m_cban.so">
 
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 4faa67945..6d7d8413f 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -333,7 +333,7 @@ public:
 				throw ModuleException("Invalid cooldown value, negative");
 			default:
 				/* Yikes */
-				throw ModuleException("Invalid maxaccepts value, unknown config error");
+				throw ModuleException("Invalid cooldown value, unknown config error");
 		}
 		maxaccepts = new_maxaccepts;
 		notify_cooldown = new_cooldown;