4 files changed, 18 insertions, 22 deletions
diff --git a/docs/man/man3/hashcomp.h.3 b/docs/man/man3/hashcomp.h.3
index abd940138..91b45a530 100644
--- a/docs/man/man3/hashcomp.h.3
+++ b/docs/man/man3/hashcomp.h.3
@@ -21,18 +21,6 @@ hashcomp.h \-
 .RI "namespace \fBnspace\fP"
 .br
 .in -1c
-.SS "Compounds"
-
-.in +1c
-.ti -1c
-.RI "struct \fBInAddr_HashComp\fP"
-.br
-.RI "\fIThis class returns true if two in_addr structs match. \fP"
-.ti -1c
-.RI "struct \fBStrHashComp\fP"
-.br
-.RI "\fIThis class returns true if two strings match. \fP"
-.in -1c
 .SS "Defines"
 
 .in +1c
diff --git a/docs/man/man3/irc.3 b/docs/man/man3/irc.3
index a825271ad..c1bcb5dfc 100644
--- a/docs/man/man3/irc.3
+++ b/docs/man/man3/irc.3
@@ -11,9 +11,17 @@ irc \- The irc namespace contains a number of helper classes.
 
 .in +1c
 .ti -1c
+.RI "struct \fBInAddr_HashComp\fP"
+.br
+.RI "\fIThis class returns true if two in_addr structs match. \fP"
+.ti -1c
 .RI "struct \fBirc_char_traits\fP"
 .br
 .RI "\fIThe \fBirc_char_traits\fP class is used for RFC-style comparison of strings. \fP"
+.ti -1c
+.RI "struct \fBStrHashComp\fP"
+.br
+.RI "\fIThis class returns true if two strings match. \fP"
 .in -1c
 .SS "Typedefs"
 
@@ -30,7 +38,7 @@ The irc namespace contains a number of helper classes.
 .PP 
 .SS "typedef basic_string<char, \fBirc_char_traits\fP, allocator<char> > \fBirc::string\fP"
 .PP
-This typedef declares \fBirc::string\fP based upon \fBirc_char_traits\fP. Definition at line 111 of file hashcomp.h.
+This typedef declares \fBirc::string\fP based upon \fBirc_char_traits\fP. Definition at line 114 of file hashcomp.h.
 .SH "Author"
 .PP 
 Generated automatically by Doxygen for InspIRCd from the source code.
diff --git a/docs/man/man3/irc_irc_char_traits.3 b/docs/man/man3/irc_irc_char_traits.3
index 1ee931ba6..d9ea0b512 100644
--- a/docs/man/man3/irc_irc_char_traits.3
+++ b/docs/man/man3/irc_irc_char_traits.3
@@ -42,7 +42,7 @@ The \fBirc_char_traits\fP class is used for RFC-style comparison of strings.
 
 This class is used to implement \fBirc::string\fP, a case-insensitive, RFC- comparing string class.
 .PP
-Definition at line 86 of file hashcomp.h.
+Definition at line 89 of file hashcomp.h.
 .SH "Member Function Documentation"
 .PP 
 .SS "int irc::irc_char_traits::compare (const char * str1, const char * str2, size_t n)\fC [static]\fP"
diff --git a/docs/man/man3/modules.cpp.3 b/docs/man/man3/modules.cpp.3
index dfea1301b..1c92ebe6c 100644
--- a/docs/man/man3/modules.cpp.3
+++ b/docs/man/man3/modules.cpp.3
@@ -74,16 +74,16 @@ modules.cpp \-
 
 .in +1c
 .ti -1c
-.RI "typedef nspace::hash_map< std::string, \fBuserrec\fP *, nspace::hash< string >, \fBStrHashComp\fP > \fBuser_hash\fP"
+.RI "typedef nspace::hash_map< std::string, \fBuserrec\fP *, nspace::hash< string >, \fBirc::StrHashComp\fP > \fBuser_hash\fP"
 .br
 .ti -1c
-.RI "typedef nspace::hash_map< std::string, \fBchanrec\fP *, nspace::hash< string >, \fBStrHashComp\fP > \fBchan_hash\fP"
+.RI "typedef nspace::hash_map< std::string, \fBchanrec\fP *, nspace::hash< string >, \fBirc::StrHashComp\fP > \fBchan_hash\fP"
 .br
 .ti -1c
-.RI "typedef nspace::hash_map< in_addr, string *, nspace::hash< in_addr >, \fBInAddr_HashComp\fP > \fBaddress_cache\fP"
+.RI "typedef nspace::hash_map< in_addr, string *, nspace::hash< in_addr >, \fBirc::InAddr_HashComp\fP > \fBaddress_cache\fP"
 .br
 .ti -1c
-.RI "typedef nspace::hash_map< std::string, \fBWhoWasUser\fP *, nspace::hash< string >, \fBStrHashComp\fP > \fBwhowas_hash\fP"
+.RI "typedef nspace::hash_map< std::string, \fBWhoWasUser\fP *, nspace::hash< string >, \fBirc::StrHashComp\fP > \fBwhowas_hash\fP"
 .br
 .ti -1c
 .RI "typedef std::deque< \fBcommand_t\fP > \fBcommand_table\fP"
@@ -270,10 +270,10 @@ modules.cpp \-
 .in -1c
 .SH "Typedef Documentation"
 .PP 
-.SS "typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, \fBInAddr_HashComp\fP> \fBaddress_cache\fP"
+.SS "typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, \fBirc::InAddr_HashComp\fP> \fBaddress_cache\fP"
 .PP
 Definition at line 111 of file modules.cpp.
-.SS "typedef nspace::hash_map<std::string, \fBchanrec\fP*, nspace::hash<string>, \fBStrHashComp\fP> \fBchan_hash\fP"
+.SS "typedef nspace::hash_map<std::string, \fBchanrec\fP*, nspace::hash<string>, \fBirc::StrHashComp\fP> \fBchan_hash\fP"
 .PP
 Definition at line 110 of file modules.cpp.
 .SS "typedef std::deque<\fBcommand_t\fP> \fBcommand_table\fP"
@@ -287,10 +287,10 @@ Definition at line 139 of file modules.cpp.
 Definition at line 140 of file modules.cpp.
 .PP
 Referenced by ModeDefined(), ModeDefinedOff(), ModeDefinedOn(), ModeDefinedOper(), ModeIsListMode(), and ModeMakeList().
-.SS "typedef nspace::hash_map<std::string, \fBuserrec\fP*, nspace::hash<string>, \fBStrHashComp\fP> \fBuser_hash\fP"
+.SS "typedef nspace::hash_map<std::string, \fBuserrec\fP*, nspace::hash<string>, \fBirc::StrHashComp\fP> \fBuser_hash\fP"
 .PP
 Definition at line 109 of file modules.cpp.
-.SS "typedef nspace::hash_map<std::string, \fBWhoWasUser\fP*, nspace::hash<string>, \fBStrHashComp\fP> \fBwhowas_hash\fP"
+.SS "typedef nspace::hash_map<std::string, \fBWhoWasUser\fP*, nspace::hash<string>, \fBirc::StrHashComp\fP> \fBwhowas_hash\fP"
 .PP
 Definition at line 112 of file modules.cpp.
 .SH "Function Documentation"