Fixes by misspell-fixer

65 files changed, 125 insertions, 125 deletions

diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index 1544666a9..73a188a4f 100644
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf.example
@@ -737,7 +737,7 @@
              # This can be useful where your main class is more restrictive
              # than some other class a user can be assigned after DNS lookup is complete.
              # Turning this option off will make the server spend more time on users we may
-             # potentially not want. Normally this should be neglible, though.
+             # potentially not want. Normally this should be negligible, though.
              # Default value is true
              clonesonconnect="yes"
 
@@ -907,7 +907,7 @@
 # There are many different types which may be used, and modules may
 # generate their own. A list of useful types:
 #  - USERS - information relating to user connection and disconnection
-#  - OPER - succesful and failed oper attempts
+#  - OPER - successful and failed oper attempts
 #  - KILL - kill related messages
 #  - FILTER - messages related to filter matches (filter module)
 #  - CONFIG - configuration related messages
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index ee60e7f41..85180d78d 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1326,7 +1326,7 @@
 # repeated to whitelist multiple CIDRs.                               #
 #                                                                     #
 # ldaprequire allows further filtering on the LDAP user, by requiring #
-# certain LDAP attibutes to have a given value. It can be repeated,   #
+# certain LDAP attributes to have a given value. It can be repeated,   #
 # in which case the list will act as an OR list, that is, the         #
 # authentication will succeed if any of the requirements in the list  #
 # is satisfied.                                                       #
@@ -1910,7 +1910,7 @@
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # SAMODE module: Adds the /SAMODE command which allows server operators
 # to change modes on a channel without requiring them to have any
-# channel priviliges. Also allows changing user modes for any user.
+# channel privileges. Also allows changing user modes for any user.
 # This module is oper-only.
 # To use, SAMODE must be in one of your oper class blocks.
 #<module name="samode">
@@ -1937,7 +1937,7 @@
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # SATOPIC module: Adds the /SATOPIC command which allows changing the
-# topic on a channel without requiring any channel priviliges.
+# topic on a channel without requiring any channel privileges.
 # This module is oper-only.
 # To use, SATOPIC must be in one of your oper class blocks.
 #<module name="satopic">
diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt.example
index c07e1379a..acb456858 100644
--- a/docs/conf/quotes.txt.example
+++ b/docs/conf/quotes.txt.example
@@ -79,7 +79,7 @@ We are Microsoft. Resistance Is Futile. You Will Be Assimilated
 Windows isn't a virus, viruses do something
 PANIC! buffer = :NickServ WRITE_DB(3). <-- JUST KIDDING!
 It just keeps going and going and going and going and goi <BANG>
-All that I know is that nukes are comming from 127.0.0.1
+All that I know is that nukes are coming from 127.0.0.1
 I know all about the irc and the mirc cops.
 M re ink n ed d, ple s  r fil
 Please refrain from feeding the server operators. Thank you.
@@ -162,7 +162,7 @@ Computing Definition - Error: What someone else has made when they disagree with
 Backup not found: (A)bort (R)etry (P)anic
 WinErr 653: Multitasking attempted - system confused.
 Cannot join #real_life (invite only)
-"Unfortunatly, no one can be told what the Matrix is. You have to see it for yourself." - Matrix
+"Unfortunately, no one can be told what the Matrix is. You have to see it for yourself." - Matrix
 "Reality is a thing of the past" - Matrix
 "The future will not be user friendly" - Matrix
 "The general idea in chat is to make yourself understandable... ..." - Peer
diff --git a/include/channels.h b/include/channels.h
index f01a0434f..c42a64efc 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -33,7 +33,7 @@
  * This class contains a single element in a channel list, such as a banlist.
  */
 
-/** Holds all relevent information for a channel.
+/** Holds all relevant information for a channel.
  * This class represents a channel, and contains its name, modes, topic, topic set time,
  * etc, and an instance of the BanList type.
  */
@@ -158,7 +158,7 @@ class CoreExport Channel : public Extensible
 	 * @param user The user to add
 	 *
 	 * The data inserted into the reference list is a table as it is
-	 * an arbitary pointer compared to other users by its memory address,
+	 * an arbitrary pointer compared to other users by its memory address,
 	 * as this is a very fast 32 or 64 bit integer comparison.
 	 */
 	Membership* AddUser(User* user);
@@ -228,7 +228,7 @@ class CoreExport Channel : public Extensible
 
 	/** Join a user to an existing channel, without doing any permission checks
 	 * @param user The user to join to the channel
-	 * @param privs Priviliges (prefix mode letters) to give to this user, may be NULL
+	 * @param privs Privileges (prefix mode letters) to give to this user, may be NULL
 	 * @param bursting True if this join is the result of a netburst (passed to modules in the OnUserJoin hook)
 	 * @param created_by_local True if this channel was just created by a local user (passed to modules in the OnUserJoin hook)
 	 * @return A newly created Membership object, or NULL if the user was already inside the channel or if the user is a server user
diff --git a/include/clientprotocol.h b/include/clientprotocol.h
index e0ac78a88..16f08a6f6 100644
--- a/include/clientprotocol.h
+++ b/include/clientprotocol.h
@@ -700,7 +700,7 @@ class CoreExport ClientProtocol::Serializer : public DataProvider
 	 * @param tagname Name of the tag.
 	 * @param tagvalue Tag value, may be empty.
 	 * @param tags TagMap to place the tag into, if it gets accepted.
-	 * @return True if no error occured, false if the tag name is invalid or if this tag already exists.
+	 * @return True if no error occurred, false if the tag name is invalid or if this tag already exists.
 	 */
 	bool HandleTag(LocalUser* user, const std::string& tagname, std::string& tagvalue, TagMap& tags) const;
 
diff --git a/include/command_parse.h b/include/command_parse.h
index 9fd135349..d1a9d5e03 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -28,7 +28,7 @@
 
 /** This class handles command management and parsing.
  * It allows you to add and remove commands from the map,
- * call command handlers by name, and chop up comma seperated
+ * call command handlers by name, and chop up comma separated
  * parameters into multiple calls.
  */
 class CoreExport CommandParser
@@ -78,7 +78,7 @@ class CoreExport CommandParser
 	 */
 	Command* GetHandler(const std::string &commandname);
 
-	/** LoopCall is used to call a command handler repeatedly based on the contents of a comma seperated list.
+	/** LoopCall is used to call a command handler repeatedly based on the contents of a comma separated list.
 	 * There are two ways to call this method, either with one potential list or with two potential lists.
 	 * We need to handle two potential lists for JOIN, because a JOIN may contain two lists of items at once:
 	 * the channel names and their keys as follows:
@@ -101,15 +101,15 @@ class CoreExport CommandParser
 	 * If there are two lists and the second list runs out of tokens before the first list then parameters[extra]
 	 * will be an EMPTY string when Handle() is called for the remaining tokens in the first list, even if it is
 	 * in the middle of parameters[]! Moreover, empty tokens in the second list are allowed, and those will also
-	 * result in the appropiate entry being empty in parameters[].
+	 * result in the appropriate entry being empty in parameters[].
 	 * This is different than what command handlers usually expect; the command parser only allows an empty param
 	 * as the last item in the vector.
 	 *
 	 * @param user The user who sent the command
 	 * @param handler The command handler to call for each parameter in the list
 	 * @param parameters Parameter list as a vector of strings
-	 * @param splithere The first parameter index to split as a comma seperated list
-	 * @param extra The second parameter index to split as a comma seperated list, or -1 (the default) if there is only one list
+	 * @param splithere The first parameter index to split as a comma separated list
+	 * @param extra The second parameter index to split as a comma separated list, or -1 (the default) if there is only one list
 	 * @param usemax True to limit the command to MaxTargets targets (default), or false to process all tokens
 	 * @return This function returns true when it identified a list in the given parameter and finished calling the
 	 * command handler for each entry on the list. When this occurs, the caller should return without doing anything,
diff --git a/include/configreader.h b/include/configreader.h
index 5a775a016..e1f9f01ba 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -313,12 +313,12 @@ class CoreExport ServerConfig
 	CommandLineConf cmdline;
 
 	/** Clones CIDR range for ipv4 (0-32)
-	 * Defaults to 32 (checks clones on all IPs seperately)
+	 * Defaults to 32 (checks clones on all IPs separately)
 	 */
 	unsigned char c_ipv4_range;
 
 	/** Clones CIDR range for ipv6 (0-128)
-	 * Defaults to 128 (checks on all IPs seperately)
+	 * Defaults to 128 (checks on all IPs separately)
 	 */
 	unsigned char c_ipv6_range;
 
@@ -332,7 +332,7 @@ class CoreExport ServerConfig
 	std::string XLineMessage;
 
 	/* Holds the network name the local server
-	 * belongs to. This is an arbitary field defined
+	 * belongs to. This is an arbitrary field defined
 	 * by the administrator.
 	 */
 	std::string Network;
diff --git a/include/ctables.h b/include/ctables.h
index 2049738c9..5a2f94940 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -177,7 +177,7 @@ class CoreExport CommandBase : public ServiceProvider
 	 * @param cmd Command name. This must be UPPER CASE.
 	 * @param minpara Minimum parameters required for the command.
 	 * @param maxpara Maximum number of parameters this command may have - extra parameters
-	 * will be tossed into one last space-seperated param.
+	 * will be tossed into one last space-separated param.
 	 */
 	CommandBase(Module* me, const std::string& cmd, unsigned int minpara = 0, unsigned int maxpara = 0);
 
diff --git a/include/extensible.h b/include/extensible.h
index 6c3146884..6b4c4a78a 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -134,7 +134,7 @@ class CoreExport ExtensionItem : public ServiceProvider, public usecountbase
  * a map associated with the object. In this way modules can store their own custom information within user
  * objects, channel objects and server objects, without breaking other modules (this is more sensible than using
  * a flags variable, and each module defining bits within the flag as 'theirs' as it is less prone to conflict and
- * supports arbitary data storage).
+ * supports arbitrary data storage).
  */
 class CoreExport Extensible
 	: public classbase
diff --git a/include/hashcomp.h b/include/hashcomp.h
index 5626a389d..5308d95c4 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -51,7 +51,7 @@
  * mapping arrays internally.
  *******************************************************/
 
-/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
+/** Separate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
  * if it must.
  *
  * This is provided as a pointer so that modules can change it to their custom mapping tables,
@@ -114,7 +114,7 @@ namespace irc
 		bool CoreExport operator()(const std::string& a, const std::string& b) const;
 	};
 
-	/** irc::sepstream allows for splitting token seperated lists.
+	/** irc::sepstream allows for splitting token separated lists.
 	 * Each successive call to sepstream::GetToken() returns
 	 * the next token, until none remain, at which point the method returns
 	 * false.
@@ -177,7 +177,7 @@ namespace irc
 		bool Contains(const std::string& value);
 	};
 
-	/** A derived form of sepstream, which seperates on commas
+	/** A derived form of sepstream, which separates on commas
 	 */
 	class CoreExport commasepstream : public sepstream
 	{
@@ -189,7 +189,7 @@ namespace irc
 		}
 	};
 
-	/** A derived form of sepstream, which seperates on spaces
+	/** A derived form of sepstream, which separates on spaces
 	 */
 	class CoreExport spacesepstream : public sepstream
 	{
@@ -242,7 +242,7 @@ namespace irc
 		bool GetTrailing(std::string& token);
 	};
 
-	/** The portparser class seperates out a port range into integers.
+	/** The portparser class separates out a port range into integers.
 	 * A port range may be specified in the input string in the form
 	 * "6660,6661,6662-6669,7020". The end of the stream is indicated by
 	 * a return value of 0 from portparser::GetToken(). If you attempt
diff --git a/include/inspircd.h b/include/inspircd.h
index 11948e2cf..e30933492 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -212,7 +212,7 @@ class CoreExport InspIRCd
 	 * Reason for it:
 	 * kludge alert!
 	 * SendMode expects a User* to send the numeric replies
-	 * back to, so we create it a fake user that isnt in the user
+	 * back to, so we create it a fake user that isn't in the user
 	 * hash and set its descriptor to FD_MAGIC_NUMBER so the data
 	 * falls into the abyss :p
 	 */
diff --git a/include/inspstring.h b/include/inspstring.h
index 050a375e1..de0f8be42 100644
--- a/include/inspstring.h
+++ b/include/inspstring.h
@@ -31,7 +31,7 @@
 #include "config.h"
 #include <cstring>
 
-/** Sets ret to the formated string. last is the last parameter before ..., and format is the format in printf-style */
+/** Sets ret to the formatted string. last is the last parameter before ..., and format is the format in printf-style */
 #define VAFORMAT(ret, last, format) \
 	do { \
 	va_list _vaList; \
diff --git a/include/logger.h b/include/logger.h
index 16c32229a..6af842b79 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -50,7 +50,7 @@ class CoreExport FileWriter
 	 */
 	unsigned int flush;
 
-	/** Number of write operations that have occured
+	/** Number of write operations that have occurred
 	 */
 	unsigned int writeops;
 
@@ -126,7 +126,7 @@ typedef std::map<FileWriter*, int> FileLogMap;
 class CoreExport LogManager : public fakederef<LogManager>
 {
  private:
-	/** Lock variable, set to true when a log is in progress, which prevents further loggging from happening and creating a loop.
+	/** Lock variable, set to true when a log is in progress, which prevents further logging from happening and creating a loop.
 	 */
 	bool Logging;
 
diff --git a/include/mode.h b/include/mode.h
index a7d6ff2b0..97222bf78 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -137,7 +137,7 @@ class CoreExport ModeHandler : public ServiceProvider
 	 * inside the mode parser as in the 1.0 api,
 	 * so the only use of this value (along with
 	 * IsListMode()) is for the core to determine
-	 * wether your module can produce 'lists' or not
+	 * whether your module can produce 'lists' or not
 	 * (e.g. banlists, etc)
 	 */
 	bool list;
@@ -163,7 +163,7 @@ class CoreExport ModeHandler : public ServiceProvider
 
  public:
 	/**
-	 * The constructor for ModeHandler initalizes the mode handler.
+	 * The constructor for ModeHandler initializes the mode handler.
 	 * The constructor of any class you derive from ModeHandler should
 	 * probably call this constructor with the parameters set correctly.
 	 * @param me The module which created this mode
@@ -293,7 +293,7 @@ class CoreExport ModeHandler : public ServiceProvider
 	/**
 	 * If your mode is a listmode, this method will be called to display an empty list (just the end of list numeric)
 	 * @param user The user issuing the command
-	 * @param channel The channel tehy're requesting an item list of (e.g. a banlist, or an exception list etc)
+	 * @param channel The channel they're requesting an item list of (e.g. a banlist, or an exception list etc)
 	 */
 	virtual void DisplayEmptyList(User* user, Channel* channel);
 
@@ -311,7 +311,7 @@ class CoreExport ModeHandler : public ServiceProvider
 
 	/**
 	 * When a MODETYPE_USER mode handler is being removed, the core will call this method for every user on the server.
-	 * The usermode will be removed using the appropiate server mode using InspIRCd::SendMode().
+	 * The usermode will be removed using the appropriate server mode using InspIRCd::SendMode().
 	 * @param user The user which the server wants to remove your mode from
 	 */
 	void RemoveMode(User* user);
@@ -765,7 +765,7 @@ class CoreExport ModeParser : public fakederef<ModeParser>
 	/** Find the mode handler for a given mode and type.
 	 * @param modeletter mode letter to search for
 	 * @param mt type of mode to search for, user or channel
-	 * @returns a pointer to a ModeHandler class, or NULL of there isnt a handler for the given mode
+	 * @returns a pointer to a ModeHandler class, or NULL of there isn't a handler for the given mode
 	 */
 	ModeHandler* FindMode(unsigned const char modeletter, ModeType mt);
 
@@ -782,7 +782,7 @@ class CoreExport ModeParser : public fakederef<ModeParser>
 	 */
 	PrefixMode* FindPrefix(unsigned const char pfxletter);
 
-	/** Generates a list of modes, comma seperated by type:
+	/** Generates a list of modes, comma separated by type:
 	 *  1; Listmodes EXCEPT those with a prefix
 	 *  2; Modes that take a param when adding or removing
 	 *  3; Modes that only take a param when adding
diff --git a/include/modules.h b/include/modules.h
index 82684cac8..2b578e58c 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -185,7 +185,7 @@ class CoreExport Version
 	/** Simple module version */
 	Version(const std::string &desc, int flags = VF_NONE);
 
-	/** Complex version information, including linking compatability data */
+	/** Complex version information, including linking compatibility data */
 	Version(const std::string &desc, int flags, const std::string& linkdata);
 };
 
@@ -227,7 +227,7 @@ enum Implementation
 /** Base class for all InspIRCd modules
  *  This class is the base class for InspIRCd modules. All modules must inherit from this class,
  *  its methods will be called when irc server events occur. class inherited from module must be
- *  instantiated by the ModuleFactory class (see relevent section) for the module to be initialised.
+ *  instantiated by the ModuleFactory class (see relevant section) for the module to be initialised.
  */
 class CoreExport Module : public classbase, public usecountbase
 {
@@ -446,7 +446,7 @@ class CoreExport Module : public classbase, public usecountbase
 
 	/** Called after a user opers locally.
 	 * This is identical to Module::OnOper(), except it is called after OnOper so that other modules
-	 * can be gauranteed to already have processed the oper-up, for example m_spanningtree has sent
+	 * can be guaranteed to already have processed the oper-up, for example m_spanningtree has sent
 	 * out the OPERTYPE, etc.
 	 * @param user The user who is opering up
 	 * @param opername The name of the oper that the user is opering up to. Only valid locally. Empty string otherwise.
@@ -472,7 +472,7 @@ class CoreExport Module : public classbase, public usecountbase
 	virtual ModResult OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout);
 
 	/** Called after a user has been successfully invited to a channel.
-	 * You cannot prevent the invite from occuring using this function, to do that,
+	 * You cannot prevent the invite from occurring using this function, to do that,
 	 * use OnUserPreInvite instead.
 	 * @param source The user who is issuing the INVITE
 	 * @param dest The user being invited
@@ -639,7 +639,7 @@ class CoreExport Module : public classbase, public usecountbase
 
 	/** Called when a 005 numeric is about to be output.
 	 * The module should modify the 005 numeric if needed to indicate its features.
-	* @param tokens The 005 map to be modified if neccessary.
+	* @param tokens The 005 map to be modified if necessary.
 	*/
 	virtual void On005Numeric(std::map<std::string, std::string>& tokens);
 
@@ -665,7 +665,7 @@ class CoreExport Module : public classbase, public usecountbase
 	 * for example loaded "m_killwidgets.so" with "m_makewidgets.so". It is highly
 	 * recommended that modules do *NOT* bail if they cannot satisfy dependencies,
 	 * but instead operate under reduced functionality, unless the dependency is
-	 * absolutely neccessary (e.g. a module that extends the features of another
+	 * absolutely necessary (e.g. a module that extends the features of another
 	 * module).
 	 * @param mod A pointer to the new module
 	 */
@@ -678,7 +678,7 @@ class CoreExport Module : public classbase, public usecountbase
 	 * for example loaded "m_killwidgets.so" with "m_makewidgets.so". It is highly
 	 * recommended that modules do *NOT* bail if they cannot satisfy dependencies,
 	 * but instead operate under reduced functionality, unless the dependency is
-	 * absolutely neccessary (e.g. a module that extends the features of another
+	 * absolutely necessary (e.g. a module that extends the features of another
 	 * module).
 	 * @param mod Pointer to the module being unloaded (still valid)
 	 */
@@ -686,18 +686,18 @@ class CoreExport Module : public classbase, public usecountbase
 
 	/** Called once every five seconds for background processing.
 	 * This timer can be used to control timed features. Its period is not accurate
-	 * enough to be used as a clock, but it is gauranteed to be called at least once in
+	 * enough to be used as a clock, but it is guaranteed to be called at least once in
 	 * any five second period, directly from the main loop of the server.
 	 * @param curtime The current timer derived from time(2)
 	 */
 	virtual void OnBackgroundTimer(time_t curtime);
 
 	/** Called whenever any command is about to be executed.
-	 * This event occurs for all registered commands, wether they are registered in the core,
+	 * This event occurs for all registered commands, whether they are registered in the core,
 	 * or another module, and for invalid commands. Invalid commands may only be sent to this
 	 * function when the value of validated is false. By returning 1 from this method you may prevent the
 	 * command being executed. If you do this, no output is created by the core, and it is
-	 * down to your module to produce any output neccessary.
+	 * down to your module to produce any output necessary.
 	 * Note that unless you return 1, you should not destroy any structures (e.g. by using
 	 * InspIRCd::QuitUser) otherwise when the command's handler function executes after your
 	 * method returns, it will be passed an invalid pointer to the user object and crash!)
@@ -711,7 +711,7 @@ class CoreExport Module : public classbase, public usecountbase
 	virtual ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated);
 
 	/** Called after any command has been executed.
-	 * This event occurs for all registered commands, wether they are registered in the core,
+	 * This event occurs for all registered commands, whether they are registered in the core,
 	 * or another module, but it will not occur for invalid commands (e.g. ones which do not
 	 * exist within the command table). The result code returned by the command handler is
 	 * provided.
@@ -768,7 +768,7 @@ class CoreExport Module : public classbase, public usecountbase
 	virtual ModResult OnUserRegister(LocalUser* user);
 
 	/** Called whenever a user joins a channel, to determine if invite checks should go ahead or not.
-	 * This method will always be called for each join, wether or not the channel is actually +i, and
+	 * This method will always be called for each join, whether or not the channel is actually +i, and
 	 * determines the outcome of an if statement around the whole section of invite checking code.
 	 * return 1 to explicitly allow the join to go ahead or 0 to ignore the event.
 	 * @param user The user joining the channel
@@ -791,7 +791,7 @@ class CoreExport Module : public classbase, public usecountbase
 	virtual ModResult OnRawMode(User* user, Channel* chan, ModeHandler* mh, const std::string& param, bool adding);
 
 	/** Called whenever a user joins a channel, to determine if key checks should go ahead or not.
-	 * This method will always be called for each join, wether or not the channel is actually +k, and
+	 * This method will always be called for each join, whether or not the channel is actually +k, and
 	 * determines the outcome of an if statement around the whole section of key checking code.
 	 * if the user specified no key, the keygiven string will be a valid but empty value.
 	 * return 1 to explicitly allow the join to go ahead or 0 to ignore the event.
@@ -803,7 +803,7 @@ class CoreExport Module : public classbase, public usecountbase
 	virtual ModResult OnCheckKey(User* user, Channel* chan, const std::string &keygiven);
 
 	/** Called whenever a user joins a channel, to determine if channel limit checks should go ahead or not.
-	 * This method will always be called for each join, wether or not the channel is actually +l, and
+	 * This method will always be called for each join, whether or not the channel is actually +l, and
 	 * determines the outcome of an if statement around the whole section of channel limit checking code.
 	 * return 1 to explicitly allow the join to go ahead or 0 to ignore the event.
 	 * @param user The user joining the channel
@@ -1057,17 +1057,17 @@ class CoreExport ModuleManager : public fakederef<ModuleManager>
 	void SetPriority(Module* mod, Priority s);
 
 	/** Attach an event to a module.
-	 * You may later detatch the event with ModuleManager::Detach().
-	 * If your module is unloaded, all events are automatically detatched.
+	 * You may later detach the event with ModuleManager::Detach().
+	 * If your module is unloaded, all events are automatically detached.
 	 * @param i Event type to attach
 	 * @param mod Module to attach event to
 	 * @return True if the event was attached
 	 */
 	bool Attach(Implementation i, Module* mod);
 
-	/** Detatch an event from a module.
+	/** Detach an event from a module.
 	 * This is not required when your module unloads, as the core will
-	 * automatically detatch your module from all events it is attached to.
+	 * automatically detach your module from all events it is attached to.
 	 * @param i Event type to detach
 	 * @param mod Module to detach event from
 	 * @return True if the event was detached
diff --git a/include/modules/sql.h b/include/modules/sql.h
index 927d54ee7..47da6f6bf 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -107,7 +107,7 @@ class SQL::Result : public classbase
 	/**
 	 * Return the number of rows in the result.
 	 *
-	 * Note that if you have perfomed an INSERT or UPDATE query or other
+	 * Note that if you have performed an INSERT or UPDATE query or other
 	 * query which will not return rows, this will return the number of
 	 * affected rows. In this case you SHOULD NEVER access any of the result
 	 * set rows, as there aren't any!
diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index 01e08b2e2..017502fa9 100644
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -65,7 +65,7 @@ class ssl_cert : public refcountbase
 		return issuer;
 	}
 
-	/** Get error string if an error has occured
+	/** Get error string if an error has occurred
 	 * @return The error associated with this users certificate,
 	 * or an empty string if there is no error.
 	 */
@@ -302,7 +302,7 @@ class UserCertificateAPIBase : public DataProvider
 	}
 };
 
-/** API implemented by m_sslinfo that allows modules to retrive the TLS (SSL) certificate
+/** API implemented by m_sslinfo that allows modules to retrieve the TLS (SSL) certificate
  * information of local and remote users. It can also be used to find out whether a
  * user is using TLS (SSL) or not.
  */
diff --git a/include/protocol.h b/include/protocol.h
index c3a3e8f4b..69f78562a 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -62,7 +62,7 @@ class CoreExport ProtocolInterface
 	 * See the protocol documentation for the purpose of ENCAP.
 	 * @param targetmask The target server mask (can contain wildcards)
 	 * @param cmd The ENCAP subcommand
-	 * @param params List of string parameters which are dependant on the subcommand
+	 * @param params List of string parameters which are dependent on the subcommand
 	 * @param source The source of the message (prefix), must be a local user or NULL which means use local server
 	 * @return Always true if the target mask contains wildcards; otherwise true if the server name was found,
 	 * and the message was sent, false if it was not found.
@@ -73,7 +73,7 @@ class CoreExport ProtocolInterface
 	/** Send an ENCAP message to all servers.
 	 * See the protocol documentation for the purpose of ENCAP.
 	 * @param cmd The ENCAP subcommand
-	 * @param params List of string parameters which are dependant on the subcommand
+	 * @param params List of string parameters which are dependent on the subcommand
 	 * @param source The source of the message (prefix), must be a local user or a user behind 'omit'
 	 * or NULL which is equivalent to the local server
 	 * @param omit If non-NULL the message won't be sent in the direction of this server, useful for forwarding messages
diff --git a/include/socketengine.h b/include/socketengine.h
index 2b759dad8..8bb8504a6 100644
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -187,7 +187,7 @@ class CoreExport EventHandler : public classbase
 
 	inline int GetEventMask() const { return event_mask; }
 
-	/** Set a new file desciptor
+	/** Set a new file descriptor
 	 * @param FD The new file descriptor. Do not call this method without
 	 * first deleting the object from the SocketEngine if you have
 	 * added it to a SocketEngine instance.
@@ -393,7 +393,7 @@ public:
 	static bool HasFd(int fd);
 
 	/** Returns the EventHandler attached to a specific fd.
-	 * If the fd isnt in the socketengine, returns NULL.
+	 * If the fd isn't in the socketengine, returns NULL.
 	 * @param fd The event handler to look for
 	 * @return A pointer to the event handler, or NULL
 	 */
@@ -404,7 +404,7 @@ public:
 	 * number of events which occurred during this call.  This method will
 	 * dispatch events to their handlers by calling their
 	 * EventHandler::OnEventHandler*() methods.
-	 * @return The number of events which have occured.
+	 * @return The number of events which have occurred.
 	 */
 	static int DispatchEvents();
 
diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h
index d301aaf88..d1810c812 100644
--- a/include/threadengines/threadengine_pthread.h
+++ b/include/threadengines/threadengine_pthread.h
@@ -70,7 +70,7 @@ class CoreExport ThreadEngine
 /** The Mutex class represents a mutex, which can be used to keep threads
  * properly synchronised. Use mutexes sparingly, as they are a good source
  * of thread deadlocks etc, and should be avoided except where absolutely
- * neccessary. Note that the internal behaviour of the mutex varies from OS
+ * necessary. Note that the internal behaviour of the mutex varies from OS
  * to OS depending on the thread engine, for example in windows a Mutex
  * in InspIRCd uses critical sections, as they are faster and simpler to
  * manage.
diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index 6271db72f..2fdf1cb24 100644
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -75,7 +75,7 @@ class CoreExport ThreadEngine
 /** The Mutex class represents a mutex, which can be used to keep threads
  * properly synchronised. Use mutexes sparingly, as they are a good source
  * of thread deadlocks etc, and should be avoided except where absolutely
- * neccessary. Note that the internal behaviour of the mutex varies from OS
+ * necessary. Note that the internal behaviour of the mutex varies from OS
  * to OS depending on the thread engine, for example in windows a Mutex
  * in InspIRCd uses critical sections, as they are faster and simpler to
  * manage.
diff --git a/include/typedefs.h b/include/typedefs.h
index 3222c5d2f..8dc5b4c54 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -134,7 +134,7 @@ typedef std::map<std::string, XLineLookup > XLineContainer;
  */
 typedef XLineContainer::iterator ContainerIter;
 
-/** An interator in an XLineLookup
+/** An iterator in an XLineLookup
  */
 typedef XLineLookup::iterator LookupIter;
 
diff --git a/include/usermanager.h b/include/usermanager.h
index 2a18393ab..9d7edd34b 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -150,7 +150,7 @@ class CoreExport UserManager : public fakederef<UserManager>
 	 */
 	const CloneCounts& GetCloneCounts(User* user) const;
 
-	/** Return a map containg IP addresses and their clone counts
+	/** Return a map containing IP addresses and their clone counts
 	 * @return The clone count map
 	 */
 	const CloneMap& GetCloneMap() const { return clonemap; }
diff --git a/include/users.h b/include/users.h
index b3afed688..d7a71954e 100644
--- a/include/users.h
+++ b/include/users.h
@@ -70,7 +70,7 @@ enum UserType {
 	USERTYPE_SERVER = 3
 };
 
-/** Holds information relevent to &lt;connect allow&gt; and &lt;connect deny&gt; tags in the config file.
+/** Holds information relevant to &lt;connect allow&gt; and &lt;connect deny&gt; tags in the config file.
  */
 struct CoreExport ConnectClass : public refcountbase
 {
@@ -361,7 +361,7 @@ class CoreExport User : public Extensible
 
 	/** If this is set to true, then all socket operations for the user
 	 * are dropped into the bit-bucket.
-	 * This value is set by QuitUser, and is not needed seperately from that call.
+	 * This value is set by QuitUser, and is not needed separately from that call.
 	 * Please note that setting this value alone will NOT cause the user to quit.
 	 */
 	unsigned int quitting:1;
diff --git a/include/xline.h b/include/xline.h
index fe564358f..75d812581 100644
--- a/include/xline.h
+++ b/include/xline.h
@@ -29,7 +29,7 @@
 /** XLine is the base class for ban lines such as G-lines and K-lines.
  * Modules may derive from this, and their xlines will automatically be
  * handled as expected by any protocol modules (e.g. m_spanningtree will
- * propogate them using AddLine). The process of translating a type+pattern
+ * propagate them using AddLine). The process of translating a type+pattern
  * to a known line type is done by means of an XLineFactory object (see
  * below).
  */
@@ -128,7 +128,7 @@ class CoreExport XLine : public classbase
 	 */
 	time_t set_time;
 
-	/** The duration of the ban, or 0 if permenant
+	/** The duration of the ban, or 0 if permanent
 	 */
 	unsigned long duration;
 
@@ -435,7 +435,7 @@ class CoreExport XLineManager
 	 */
 	~XLineManager();
 
-	/** Split an ident and host into two seperate strings.
+	/** Split an ident and host into two separate strings.
 	 * This allows for faster matching.
 	 */
 	IdentHostPair IdentSplit(const std::string &ident_and_host);
diff --git a/locales/readme.txt b/locales/readme.txt
index 5e366d606..4edc7ef14 100755
--- a/locales/readme.txt
+++ b/locales/readme.txt
@@ -16,10 +16,10 @@ Each file consists of 5-7 lines:
 3: List of additional characters that should be treated as upper-case
 
 4: 255 characters table - to-lower case conversion table. 
-Can be usefull for example for comparing nicknames that contains similar-looking characters with different codes.
+Can be useful for example for comparing nicknames that contains similar-looking characters with different codes.
 
 5: 255 characters table - to-upper case conversion table. 
-Can be usefull for example for comparing nicknames that contains similar-looking characters with different codes.
+Can be useful for example for comparing nicknames that contains similar-looking characters with different codes.
 
 6: List of additional UTF-8 allowed characters
 
diff --git a/src/cidr.cpp b/src/cidr.cpp
index 31546dae2..f45c63b98 100644
--- a/src/cidr.cpp
+++ b/src/cidr.cpp
@@ -37,7 +37,7 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
 
 	/* The caller is trying to match ident@<mask>/bits.
 	 * Chop off the ident@ portion, use match() on it
-	 * seperately.
+	 * separately.
 	 */
 	if (match_with_username)
 	{
diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 717431087..d3befc6c0 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -231,7 +231,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
 		// Iterator to the first excess parameter
 		const CommandBase::Params::iterator firstexcess = lastkeep + 1;
 
-		// Append all excess parameter(s) to the last parameter, seperated by spaces
+		// Append all excess parameter(s) to the last parameter, separated by spaces
 		for (CommandBase::Params::const_iterator i = firstexcess; i != command_p.end(); ++i)
 		{
 			lastkeep->push_back(' ');
@@ -243,7 +243,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
 	}
 
 	/*
-	 * We call OnPreCommand here seperately if the command exists, so the magic above can
+	 * We call OnPreCommand here separately if the command exists, so the magic above can
 	 * truncate to max_params if necessary. -- w00t
 	 */
 	ModResult MOD_RESULT;
diff --git a/src/coremods/core_channel/cmode_k.cpp b/src/coremods/core_channel/cmode_k.cpp
index 5563c0072..ea4b5241d 100644
--- a/src/coremods/core_channel/cmode_k.cpp
+++ b/src/coremods/core_channel/cmode_k.cpp
@@ -45,7 +45,7 @@ ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, s
 			return MODEACTION_DENY;
 		if (exists && (parameter != *key))
 		{
-			/* Key is currently set and the correct key wasnt given */
+			/* Key is currently set and the correct key wasn't given */
 			return MODEACTION_DENY;
 		}
 	} else {
diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp
index 6b356d011..13d6be558 100644
--- a/src/coremods/core_oper/cmd_kill.cpp
+++ b/src/coremods/core_oper/cmd_kill.cpp
@@ -57,7 +57,7 @@ class KillMessage : public ClientProtocol::Message
  */
 CmdResult CommandKill::Handle(User* user, const Params& parameters)
 {
-	/* Allow comma seperated lists of users for /KILL (thanks w00t) */
+	/* Allow comma separated lists of users for /KILL (thanks w00t) */
 	if (CommandParser::LoopCall(user, this, parameters, 0))
 	{
 		// If we got a colon delimited list of nicks then the handler ran for each nick,
diff --git a/src/coremods/core_serialize_rfc.cpp b/src/coremods/core_serialize_rfc.cpp
index 8604eaf9f..dcd67d49e 100644
--- a/src/coremods/core_serialize_rfc.cpp
+++ b/src/coremods/core_serialize_rfc.cpp
@@ -89,7 +89,7 @@ bool RFCSerializer::Parse(LocalUser* user, const std::string& line, ClientProtoc
 		while (ss.GetToken(token))
 		{
 			// Two or more tags with the same key must not be sent, but if a client violates that we accept
-			// the first occurence of duplicate tags and ignore all later occurences.
+			// the first occurrence of duplicate tags and ignore all later occurrences.
 			//
 			// Another option is to reject the message entirely but there is no standard way of doing that.
 			const std::string::size_type p = token.find('=');
diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index 8ac86337e..541fb0bd6 100644
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -312,8 +312,8 @@ CmdResult CommandWhois::HandleLocal(LocalUser* user, const Params& parameters)
 		return CMD_SUCCESS;
 
 	/*
-	 * If 2 paramters are specified (/whois nick nick), ignore the first one like spanningtree
-	 * does, and use the second one, otherwise, use the only paramter. -- djGrrr
+	 * If 2 parameters are specified (/whois nick nick), ignore the first one like spanningtree
+	 * does, and use the second one, otherwise, use the only parameter. -- djGrrr
 	 */
 	if (parameters.size() > 1)
 		userindex = 1;
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index e019a660b..b1692e6d1 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -383,7 +383,7 @@ bool InspIRCd::Duration(const std::string& str, unsigned long& duration)
 		}
 		else
 		{
-			/* Found something thats not a number, find out how much
+			/* Found something that's not a number, find out how much
 			 * it multiplies the built up number by, multiply the total
 			 * and reset the built up number.
 			 */
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 956fb1155..a32c07931 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -52,7 +52,7 @@
 
 InspIRCd* ServerInstance = NULL;
 
-/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
+/** Separate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
  * if it must.
  *
  * This is provided as a pointer so that modules can change it to their custom mapping tables,
@@ -544,7 +544,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	std::cout << "InspIRCd Process ID: " << con_green << getpid() << con_reset << std::endl;
 
 	/* During startup we read the configuration now, not in
-	 * a seperate thread
+	 * a separate thread
 	 */
 	this->Config->Read();
 	this->Config->Apply(NULL, "");
@@ -675,7 +675,7 @@ void InspIRCd::Run()
 		UpdateTime();
 
 		/* Run background module timers every few seconds
-		 * (the docs say modules shouldnt rely on accurate
+		 * (the docs say modules should not rely on accurate
 		 * timing using this event, so we dont have to
 		 * time this exactly).
 		 */
diff --git a/src/modules.cpp b/src/modules.cpp
index 36f5409c4..1668f0215 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -234,7 +234,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Modul
 	}
 
 	/* Eh? this module doesnt exist, probably trying to set priority on an event
-	 * theyre not attached to.
+	 * they're not attached to.
 	 */
 	return false;
 
@@ -315,7 +315,7 @@ swap_now:
 bool ModuleManager::PrioritizeHooks()
 {
 	/* We give every module a chance to re-prioritize when we introduce a new one,
-	 * not just the one thats loading, as the new module could affect the preference
+	 * not just the one that's loading, as the new module could affect the preference
 	 * of others
 	 */
 	for (int tries = 0; tries < 20; tries++)
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index ff2a7a032..1db938b44 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -73,7 +73,7 @@
  * worker thread wakes up, and checks if there is a request at the head of its queue.
  * If there is, it processes this request, blocking the worker thread but leaving the ircd
  * thread to go about its business as usual. During this period, the ircd thread is able
- * to insert futher pending requests into the queue.
+ * to insert further pending requests into the queue.
  *
  * Once the processing of a request is complete, it is removed from the incoming queue to
  * an outgoing queue, and initialized as a 'response'. The worker thread then signals the
@@ -90,7 +90,7 @@
  * one the module was originally instantiated upon, there is a chance of all hell breaking loose
  * if a module is ever put in a re-enterant state (stack corruption could occur, crashes, data
  * corruption, and worse, so DONT think about it until the day comes when InspIRCd is 100%
- * gauranteed threadsafe!)
+ * guaranteed threadsafe!)
  */
 
 class SQLConnection;
@@ -379,7 +379,7 @@ class SQLConnection : public SQL::Provider
 		/* Parse the command string and dispatch it to mysql */
 		if (CheckConnection() && !mysql_real_query(connection, query.data(), query.length()))
 		{
-			/* Successfull query */
+			/* Successful query */
 			MYSQL_RES* res = mysql_use_result(connection);
 			unsigned long rows = mysql_affected_rows(connection);
 			return new MySQLresult(res, rows);
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 20c17783a..109725a43 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -273,7 +273,7 @@ class SQLConn : public SQL::Provider, public EventHandler
 		if(PQsetnonblocking(sql, 1) == -1)
 			return false;
 
-		/* OK, we've initalised the connection, now to get it hooked into the socket engine
+		/* OK, we've initialised the connection, now to get it hooked into the socket engine
 		* and then start polling it.
 		*/
 		this->fd = PQsocket(sql);
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index d3857a82e..df7add05c 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -166,7 +166,7 @@ class ModuleAlias : public Module
 
 	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
 	{
-		/* If theyre not registered yet, we dont want
+		/* If they're not registered yet, we dont want
 		 * to know.
 		 */
 		if (user->registered != REG_ALL)
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index a8728ef72..b575491d6 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -202,7 +202,7 @@ public:
 		parameter = (action.second ? "" : "-") + action.first->uuid;
 	}
 
-	/** Will take any number of nicks (up to MaxTargets), which can be seperated by commas.
+	/** Will take any number of nicks (up to MaxTargets), which can be separated by commas.
 	 * - in front of any nick removes, and an * lists. This effectively means you can do:
 	 * /accept nick1,nick2,nick3,*
 	 * to add 3 nicks and then show your list
@@ -243,12 +243,12 @@ public:
 	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		// There is a list in parameters[0] in two cases:
-		// Either when the source is remote, this happens because 2.0 servers send comma seperated uuid lists,
+		// Either when the source is remote, this happens because 2.0 servers send comma separated uuid lists,
 		// we don't split those but broadcast them, as before.
 		//
 		// Or if the source is local then LoopCall() runs OnPostCommand() after each entry in the list,
 		// meaning the linking module has sent an ACCEPT already for each entry in the list to the
-		// appropiate server and the ACCEPT with the list of nicks (this) doesn't need to be sent anywhere.
+		// appropriate server and the ACCEPT with the list of nicks (this) doesn't need to be sent anywhere.
 		if ((!IS_LOCAL(user)) && (parameters[0].find(',') != std::string::npos))
 			return ROUTE_BROADCAST;
 
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index e506efb97..98bcbf4cd 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -189,7 +189,7 @@ class CommandDccallow : public Command
 		, ext(Ext)
 	{
 		syntax = "[(+|-)<nick> [<time>]]|[LIST|HELP]";
-		/* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
+		/* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a separate param */
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 894111a33..786ea673b 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -542,7 +542,7 @@ ModResult ModuleFilter::OnPreCommand(std::string& command, CommandBase::Params&
 		/* We cant block a part or quit, so instead we change the reason to 'Reason filtered' */
 		parameters[parting ? 1 : 0] = "Reason filtered";
 
-		/* We're warning or blocking, OR theyre quitting and its a KILL action
+		/* We're warning or blocking, OR they're quitting and its a KILL action
 		 * (we cant kill someone whos already quitting, so filter them anyway)
 		 */
 		if ((f->action == FA_WARN) || (f->action == FA_BLOCK) || (((!parting) && (f->action == FA_KILL))) || (f->action == FA_SILENT))
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 8eb44a03b..b6a9e91c4 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -289,7 +289,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 		else
 			rheaders.RemoveHeader("Content-Type");
 
-		/* Supporting Connection: keep-alive causes a whole world of hurt syncronizing timeouts,
+		/* Supporting Connection: keep-alive causes a whole world of hurt synchronizing timeouts,
 		 * so remove it, its not essential for what we need.
 		 */
 		rheaders.SetHeader("Connection", "Close");
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index df80cd82f..18c79b5d8 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -61,7 +61,7 @@ enum
  * our ident lookup class that is outside of this module, or out-
  * side of the control of the class. There are no timers, internal
  * events, or such, which will cause the socket to be deleted,
- * queued for deletion, etc. In fact, theres not even any queueing!
+ * queued for deletion, etc. In fact, there's not even any queueing!
  *
  * Using this framework we have a much more stable module.
  *
@@ -183,7 +183,7 @@ class IdentRequestSocket : public EventHandler
 
 	void Close()
 	{
-		/* Remove ident socket from engine, and close it, but dont detatch it
+		/* Remove ident socket from engine, and close it, but dont detach it
 		 * from its parent user class, or attempt to delete its memory.
 		 */
 		if (HasFd())
diff --git a/src/modules/m_ircv3_capnotify.cpp b/src/modules/m_ircv3_capnotify.cpp
index ba90cfbde..4a7daaf06 100644
--- a/src/modules/m_ircv3_capnotify.cpp
+++ b/src/modules/m_ircv3_capnotify.cpp
@@ -164,7 +164,7 @@ class ModuleIRCv3CapNotify : public Module, public Cap::EventListener, public Re
 
 	void OnReloadModuleRestore(Module* mod, void* data) CXX11_OVERRIDE
 	{
-		// Reloading can change the set of caps provided by a module so assuming that if the reload succeded all
+		// Reloading can change the set of caps provided by a module so assuming that if the reload succeeded all
 		// caps that the module previously provided are available or all were lost if the reload failed is wrong.
 		// Instead, we verify the availability of each cap individually.
 		dynamic_reference_nocheck<Cap::Manager> capmanager(this, "capmanager");
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 86c2f83d5..4bc9c2fad 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -54,7 +54,7 @@ class PermChannel : public ModeHandler
 	}
 };
 
-// Not in a class due to circular dependancy hell.
+// Not in a class due to circular dependency hell.
 static std::string permchannelsconf;
 static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_listmodes)
 {
@@ -152,7 +152,7 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list
 #ifdef _WIN32
 	remove(permchannelsconf.c_str());
 #endif
-	// Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
+	// Use rename to move temporary to new db - this is guaranteed not to fuck up, even in case of a crash.
 	if (rename(permchannelsnewconf.c_str(), permchannelsconf.c_str()) < 0)
 	{
 		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", permchannelsconf.c_str(), permchannelsnewconf.c_str(), strerror(errno), errno);
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 27cb42fca..15ba77a34 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -223,7 +223,7 @@ void TreeSocket::SendCapabilities(int phase)
 	this->WriteLine("CAPAB END");
 }
 
-/* Isolate and return the elements that are different between two comma seperated lists */
+/* Isolate and return the elements that are different between two comma separated lists */
 void TreeSocket::ListDifference(const std::string &one, const std::string &two, char sep,
 		std::string& mleft, std::string& mright)
 {
diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 2e280f14f..a1a44daf5 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -139,7 +139,7 @@ class FwdFJoinBuilder;
 class CommandFJoin : public ServerCommand
 {
 	/** Remove all modes from a channel, including statusmodes (+qaovh etc), simplemodes, parameter modes.
-	 * This does not update the timestamp of the target channel, this must be done seperately.
+	 * This does not update the timestamp of the target channel, this must be done separately.
 	 */
 	static void RemoveStatus(Channel* c);
 
diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index aa669ce49..2f9813860 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -50,7 +50,7 @@ CmdResult CommandFTopic::Handle(User* user, Params& params)
 	/*
 	 * If the topics were updated at the exact same second, accept
 	 * the remote only when it's "bigger" than ours as defined by
-	 * string comparision, so non-empty topics always overridde
+	 * string comparison, so non-empty topics always overridde
 	 * empty topics if their timestamps are equal
 	 *
 	 * Similarly, if the topic texts are equal too, keep one topic
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 8d713b2a5..16a1132fe 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -135,7 +135,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
 			ShowLinks(server, user, hops+1);
 		}
 	}
-	/* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */
+	/* Don't display the line if its a uline, hide ulines is on, and the user isn't an oper */
 	if ((Utils->HideULines) && (Current->IsULine()) && (!user->IsOper()))
 		return;
 	/* Or if the server is hidden and they're not an oper */
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 1469885a6..076369493 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -168,7 +168,7 @@ class ModuleSpanningTree
 	 */
 	void DoConnectTimeout(time_t curtime);
 
-	/** Handle remote VERSON
+	/** Handle remote VERSION
 	 */
 	ModResult HandleVersion(const CommandBase::Params& parameters, User* user);
 
diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index de2830861..80ff832cb 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -144,10 +144,10 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned
 				if (j != child_map.begin())
 				{
 					// If this child is not my last child, then add |
-					// to be able to "link" the next server in my list to me, and to indent this childs servers
+					// to be able to "link" the next server in my list to me, and to indent this children servers
 					if (!last)
 						prefix = "| ";
-					// Otherwise this is my last child, so just use a space as theres nothing else linked to me below this
+					// Otherwise this is my last child, so just use a space as there's nothing else linked to me below this
 					else
 						prefix = "  ";
 				}
diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index 14a96933d..835744db4 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -35,7 +35,7 @@
 #include "treesocket.h"
 
 /** This class is used to resolve server hostnames during /connect and autoconnect.
- * As of 1.1, the resolver system is seperated out from BufferedSocket, so we must do this
+ * As of 1.1, the resolver system is separated out from BufferedSocket, so we must do this
  * resolver step first ourselves if we need it. This is totally nonblocking, and will
  * callback to OnLookupComplete or OnError when completed. Once it has completed we
  * will have an IP address which we can then use to continue our connection.
diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index 3ef80266a..77b5a48b9 100644
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -48,7 +48,7 @@ class SecurityIPResolver : public DNS::Request
 };
 
 /** This class is used to resolve server hostnames during /connect and autoconnect.
- * As of 1.1, the resolver system is seperated out from BufferedSocket, so we must do this
+ * As of 1.1, the resolver system is separated out from BufferedSocket, so we must do this
  * resolver step first ourselves if we need it. This is totally nonblocking, and will
  * callback to OnLookupComplete or OnError when completed. Once it has completed we
  * will have an IP address which we can then use to continue our connection.
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 58f6c745f..6920fc97b 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -127,7 +127,7 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
 	 * be referenced by its server name. The AddHashEntry()
 	 * call below automatically inserts each TreeServer class
 	 * into the hash_map as it is created. There is a similar
-	 * maintainance call in the destructor to tidy up deleted
+	 * maintenance call in the destructor to tidy up deleted
 	 * servers.
 	 */
 
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 6b1ca21d0..29c90c843 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -416,7 +416,7 @@ void TreeSocket::Close()
 
 	// Connection closed.
 	// If the connection is fully up (state CONNECTED)
-	// then propogate a netsplit to all peers.
+	// then propagate a netsplit to all peers.
 	if (MyRoot)
 		MyRoot->SQuit(getError(), true);
 
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index e5061489f..cc5acccf9 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -93,7 +93,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
 		if (*v == '+')
 			continue;
 
-		/* For each mode thats set, find the mode handler and set it on the new user */
+		/* For each mode that's set, find the mode handler and set it on the new user */
 		ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
 		if (!mh)
 			throw ProtocolException("Unrecognised mode '" + std::string(1, *v) + "'");
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 5c7f1fca1..c7fca3854 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -188,7 +188,7 @@ class ModuleSSLModes
 
 		User* target = msgtarget.Get<User>();
 
-		/* If one or more of the parties involved is a ulined service, we wont stop it. */
+		/* If one or more of the parties involved is a ulined service, we won't stop it. */
 		if (user->server->IsULine() || target->server->IsULine())
 			return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index e01f56043..838e129c1 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -53,7 +53,7 @@ class CommandUserip : public Command
 				{
 					if (!checked_privs)
 					{
-						// Do not trigger the insufficient priviliges message more than once
+						// Do not trigger the insufficient privileges message more than once
 						checked_privs = true;
 						has_privs = user->HasPrivPermission("users/auspex");
 						if (!has_privs)
diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 56537db25..0c2ceceb5 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -156,7 +156,7 @@ class ModuleXLineDB
 #ifdef _WIN32
 		remove(xlinedbpath.c_str());
 #endif
-		// Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
+		// Use rename to move temporary to new db - this is guaranteed not to fuck up, even in case of a crash.
 		if (rename(xlinenewdbpath.c_str(), xlinedbpath.c_str()) < 0)
 		{
 			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno);
diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 6f7f666f6..28533e4bd 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -138,7 +138,7 @@ void Snomask::Send(char letter, const std::string& desc, const std::string& msg)
 	for (UserManager::OperList::const_iterator i = opers.begin(); i != opers.end(); ++i)
 	{
 		User* user = *i;
-		// IsNoticeMaskSet() returns false for opers who aren't +s, no need to check for it seperately
+		// IsNoticeMaskSet() returns false for opers who aren't +s, no need to check for it separately
 		if (IS_LOCAL(user) && user->IsNoticeMaskSet(letter))
 			user->WriteNotice(finalmsg);
 	}
diff --git a/src/users.cpp b/src/users.cpp
index bd7d046b8..a8142acfb 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -586,7 +586,7 @@ void LocalUser::FullConnect()
 	/*
 	 * You may be thinking "wtf, we checked this in User::AddClient!" - and yes, we did, BUT.
 	 * At the time AddClient is called, we don't have a resolved host, by here we probably do - which
-	 * may put the user into a totally seperate class with different restrictions! so we *must* check again.
+	 * may put the user into a totally separate class with different restrictions! so we *must* check again.
 	 * Don't remove this! -- w00t
 	 */
 	MyClass = NULL;
diff --git a/src/xline.cpp b/src/xline.cpp
index 04ac67f68..c2022a1d7 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -119,7 +119,7 @@ class ZLineFactory : public XLineFactory
  *  was added, it iterated every existing line for every existing user. Ow. Expiry was also
  *  expensive, as the lists were NOT sorted.
  *
- *  Version 2 moved permanent lines into a seperate list from non-permanent to help optimize
+ *  Version 2 moved permanent lines into a separate list from non-permanent to help optimize
  *  matching speed, but matched in the same way.
  *  Expiry was also sped up by sorting the list by expiry (meaning just remove the items at the
  *  head of the list that are outdated.)
@@ -128,7 +128,7 @@ class ZLineFactory : public XLineFactory
  * than it could have been, something which we address here.
  *
  * VERSION 3:
- *  All lines are (as in v1) stored together -- no seperation of perm and non-perm. They are stored in
+ *  All lines are (as in v1) stored together -- no separation of perm and non-perm. They are stored in
  *  a map of maps (first map is line type, second map is for quick lookup on add/delete/etc).
  *
  *  Expiry is *no longer* performed on a timer, and no longer uses a sorted list of any variety. This
diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp
index f118a86c4..134c2136f 100644
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -32,7 +32,7 @@
  * whereas on POSIX systems, shared objects loaded into an executable share
  * the executable's heap. This means that if we pass an arbitrary pointer to
  * a windows DLL which is not allocated in that dll, without some form of
- * marshalling, we get a page fault. To fix this, these overrided operators
+ * marshalling, we get a page fault. To fix this, these overridden operators
  * new and delete use the windows HeapAlloc and HeapFree functions to claim
  * memory from the windows global heap. This makes windows 'act like' POSIX
  * when it comes to memory usage between dlls and exes.
diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index 7ce23f7a7..99edafc42 100644
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -50,7 +50,7 @@
 #define VC_EXTRALEAN
 #define WIN32_LEAN_AND_MEAN
 
-/* Macros for exporting symbols - dependant on what is being compiled */
+/* Macros for exporting symbols - dependent on what is being compiled */
 
 #ifdef DLL_BUILD
 #define CoreExport __declspec(dllimport)
diff --git a/win/win32service.cpp b/win/win32service.cpp
index 4c2545b1e..46e9d3516 100644
--- a/win/win32service.cpp
+++ b/win/win32service.cpp
@@ -42,7 +42,7 @@ struct Service_Data {
 static Service_Data g_ServiceData;
 
 /** The main part of inspircd runs within this thread function. This allows the service part to run
- * seperately on its own and to be able to kill the worker thread when its time to quit.
+ * separately on its own and to be able to kill the worker thread when its time to quit.
  */
 DWORD WINAPI WorkerThread(LPVOID param)
 {