Add conf/ to include paths and fix some typos

2 files changed, 6 insertions, 10 deletions

diff --git a/docs/modules.conf.example b/docs/modules.conf.example
index b688882d0..116aace52 100644
--- a/docs/modules.conf.example
+++ b/docs/modules.conf.example
@@ -314,7 +314,7 @@
 # specify some censor tags. See also:                                 #
 # http://wiki.inspircd.org/Modules/censor                             #
 #
-#<include file="censor.conf">
+#<include file="conf/censor.conf">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
@@ -765,7 +765,7 @@
 # specfiy below the path to the filter.conf file, or define some      #
 # <filter> tags.                                                      #
 #                                                                     #
-#<include file="filter.conf">
+#<include file="conf/filter.conf">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Gecosban: Implements extended ban r:, which stops anyone matching
@@ -822,12 +822,12 @@
 # specify below the path to the helpop.conf file, or if you like to   #
 # make a mess, define your helpop tags in this conf.                  #
 #                                                                     #
-#<include file="helpop.conf">
+#<include file="conf/inspircd.helpop-full.example">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # HIDECHANS module: Allows opers to hide their channels list from non-
 # opers by setting user mode +I on themselves.
-# <module name="m_hidechans.so">
+#<module name="m_hidechans.so">
 #
 # HIDECHANS can optionally prevent opers from seeing channels on a +I
 # user, for more privacy if set to true.
@@ -838,7 +838,7 @@
 # HIDEOPER module: Allows opers to hide their oper status from non-
 # opers by setting user mode +H on themselves.
 # This module is oper-only.
-# <module name="m_hideoper.so">
+#<module name="m_hideoper.so">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Hostchange module: Allows a different style of cloaking
@@ -994,10 +994,6 @@
 # provided CIDR do not need to authenticate against LDAP. It can be   #
 # repeated to whitelist multiple CIDRs.                               #
 
-# ldapwhitelist indicates that clients connecting from the associated #
-# CIDR do  to authenticate against LDAP. It can be used multiple      #
-# times.                                                              #
-
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # LDAP oper configuration module: Adds the ability to authenticate    #
 # opers via LDAP. This is an extra module which must be enabled       #
diff --git a/include/snomasks.h b/include/snomasks.h
index a3c9e971e..0c62a4229 100644
--- a/include/snomasks.h
+++ b/include/snomasks.h
@@ -38,7 +38,7 @@ class Snomask
 	void Flush();
 };
 
-/** Snomask manager handles routing of SNOMASK (usermode +n) messages to opers.
+/** Snomask manager handles routing of SNOMASK (usermode +s) messages to opers.
  * Modules and the core can enable and disable snomask characters. If they do,
  * then sending snomasks using these characters becomes possible.
  */