Merge branch 'insp3' into master.

9 files changed, 22 insertions, 22 deletions

diff --git a/include/command_parse.h b/include/command_parse.h
index 9411a6ea5..a6b9f6868 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -64,7 +64,7 @@ class CoreExport CommandParser
 	 * and the command completeld successfully. It will return CmdResult::FAILURE if the command handler was found
 	 * and called, but the command did not complete successfully, and it will return CmdResult::INVALID if the
 	 * command simply did not exist at all or the wrong number of parameters were given, or the user
-	 * was not privilaged enough to execute the command.
+	 * was not privileged enough to execute the command.
 	 */
 	CmdResult CallHandler(const std::string& commandname, const CommandBase::Params& parameters, User* user, Command** cmd = NULL);
 
diff --git a/include/extensible.h b/include/extensible.h
index 78640fb73..c4473a857 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -147,7 +147,7 @@ class CoreExport Extensible
 	unsigned int culled:1;
  public:
 	/**
-	 * Get the extension items for iteraton (i.e. for metadata sync during netburst)
+	 * Get the extension items for iteration (i.e. for metadata sync during netburst)
 	 */
 	inline const ExtensibleStore& GetExtList() const { return extensions; }
 
diff --git a/include/mode.h b/include/mode.h
index 6f5244b2f..91e47fd3e 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -532,7 +532,7 @@ class CoreExport ModeWatcher : public Cullable
 	 * @param dest The target user for the mode, if you are watching a user mode
 	 * @param channel The target channel for the mode, if you are watching a channel mode
 	 * @param change Information regarding the mode change.
-	 * If you alter the parameter you are given, the mode handler will see your atered version
+	 * If you alter the parameter you are given, the mode handler will see your altered version
 	 * when it handles the mode.
 	 * @return True to allow the mode change to go ahead, false to abort it. If you abort the
 	 * change, the mode handler (and ModeWatcher::AfterMode()) will never see the mode change.
diff --git a/include/modules.h b/include/modules.h
index 9d255d2d7..9f8fcb24b 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -478,7 +478,7 @@ class CoreExport Module : public Cullable, public usecountbase
 	 * @param user The user joining the channel
 	 * @param chan If the  channel is a new channel, this will be NULL, otherwise it will be a pointer to the channel being joined
 	 * @param cname The channel name being joined. For new channels this is valid where chan is not.
-	 * @param privs A string containing the users privilages when joining the channel. For new channels this will contain "o".
+	 * @param privs A string containing the users privileges when joining the channel. For new channels this will contain "o".
 	 * You may alter this string to alter the user's modes on the channel.
 	 * @param keygiven The key given to join the channel, or an empty string if none was provided
 	 * @param override Whether the channel join can be blocked by returning MOD_RES_DENY.
@@ -578,7 +578,7 @@ class CoreExport Module : public Cullable, public usecountbase
 
 	/** Called before local nickname changes. This can be used to implement Q-lines etc.
 	 * If your method returns nonzero, the nickchange is silently forbidden, and it is down to your
-	 * module to generate some meaninful output.
+	 * module to generate some meaningful output.
 	 * @param user The username changing their nick
 	 * @param newnick Their new nickname
 	 * @return 1 to deny the change, 0 to allow
@@ -635,14 +635,14 @@ class CoreExport Module : public Cullable, public usecountbase
 
 	/** Called whenever a user's hostname is changed.
 	 * This event triggers after the host has been set.
-	 * @param user The user whos host is being changed
+	 * @param user The user whose host is being changed
 	 * @param newhost The new hostname being set
 	 */
 	virtual void OnChangeHost(User* user, const std::string &newhost);
 
 	/** Called whenever a user's real hostname is changed.
 	 * This event triggers before the host has been set.
-	 * @param user The user whos host is being changed
+	 * @param user The user whose host is being changed
 	 * @param newhost The new hostname being set
 	 */
 	virtual void OnChangeRealHost(User* user, const std::string& newhost);
@@ -699,7 +699,7 @@ class CoreExport Module : public Cullable, public usecountbase
 
 	/** Called after any nickchange, local or remote. This can be used to track users after nickchanges
 	 * have been applied. Please note that although you can see remote nickchanges through this function, you should
-	 * NOT make any changes to the User if the user is a remote user as this may cause a desnyc.
+	 * NOT make any changes to the User if the user is a remote user as this may cause a desync.
 	 * check user->server before taking any action (including returning nonzero from the method).
 	 * Because this method is called after the nickchange is taken place, no return values are possible
 	 * to indicate forbidding of the nick change. Use OnUserPreNick for this.
@@ -810,14 +810,14 @@ class CoreExport Module : public Cullable, public usecountbase
 
 	/** Called after a user object is initialised and added to the user list.
 	 * When this is called the user has not had their I/O hooks checked or had their initial
-	 * connect class assigned and may not yet have a serialiser. You probably want to use
+	 * connect class assigned and may not yet have a serializer. You probably want to use
 	 * the OnUserPostInit or OnUserSetIP hooks instead of this one.
 	 * @param user The connecting user.
 	 */
 	virtual void OnUserInit(LocalUser* user);
 
 	/** Called after a user object has had their I/O hooks checked, their initial connection
-	 * class assigned, and had a serialiser set.
+	 * class assigned, and had a serializer set.
 	 * @param user The connecting user.
 	 */
 	virtual void OnUserPostInit(LocalUser* user);
@@ -909,7 +909,7 @@ class CoreExport Module : public Cullable, public usecountbase
 
 	/** Called whenever a change of a local users displayed host is attempted.
 	 * Return 1 to deny the host change, or 0 to allow it.
-	 * @param user The user whos host will be changed
+	 * @param user The user whose host will be changed
 	 * @param newhost The new hostname
 	 * @return 1 to deny the host change, 0 to allow
 	 */
@@ -917,7 +917,7 @@ class CoreExport Module : public Cullable, public usecountbase
 
 	/** Called whenever a change of a local users real name is attempted.
 	 * return MOD_RES_DENY to deny the name change, or MOD_RES_ALLOW to allow it.
-	 * @param user The user whos real name will be changed
+	 * @param user The user whose real name will be changed
 	 * @param newhost The new real name.
 	 * @return MOD_RES_DENY to deny the real name change, MOD_RES_ALLOW to allow
 	 */
diff --git a/include/modules/httpd.h b/include/modules/httpd.h
index 17546d422..145dd70b3 100644
--- a/include/modules/httpd.h
+++ b/include/modules/httpd.h
@@ -87,7 +87,7 @@ struct HTTPRequestURI
 	std::string fragment;
 };
 
-/** A modifyable list of HTTP header fields
+/** A modifiable list of HTTP header fields
  */
 class HTTPHeaders
 {
diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index 546eb2835..3e73bdac8 100644
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -111,7 +111,7 @@ class ssl_cert : public refcountbase
 		return unknownsigner;
 	}
 
-	/** Get revokation status.
+	/** Get revocation status.
 	 * @return True if the certificate is revoked.
 	 * Note that this only works properly for GnuTLS
 	 * right now.
diff --git a/include/serialize.h b/include/serialize.h
index 36c4dd284..16055cf24 100644
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -60,7 +60,7 @@ class CoreExport Serializable
 
 		/** Loads the value with the specified key.
 		 * @param key The key by which this data is identified.
-		 * @param out The location to store the value for this keu
+		 * @param out The location to store the value for this key.
 		 */
 		Data& Load(const std::string& key, std::string& out);
 
@@ -109,7 +109,7 @@ class CoreExport Serializable
 	 */
 	virtual bool Deserialize(Data& data) = 0;
 
-	/** Serializes the this object into the specified Data obect.
+	/** Serializes the this object into the specified Data object.
 	 * @param data The Data object to serialize to.
 	 * @return True if the serialisation succeeded; otherwise, false.
 	 */
diff --git a/include/socketengine.h b/include/socketengine.h
index e3345087d..1443f6071 100644
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -68,7 +68,7 @@ enum EventMask
 	/** Mask for all read events */
 	FD_WANT_READ_MASK = 0x0F,
 
-	/** Do not test this socket for writeability
+	/** Do not test this socket for writability
 	 */
 	FD_WANT_NO_WRITE = 0x10,
 	/** Give a write event at all times when writes will not block.
diff --git a/include/users.h b/include/users.h
index 51c5ca81c..66c5deaee 100644
--- a/include/users.h
+++ b/include/users.h
@@ -476,7 +476,7 @@ class CoreExport User : public Extensible
 	void SetMode(ModeHandler* mh, bool value);
 	void SetMode(ModeHandler& mh, bool value) { SetMode(&mh, value); }
 
-	/** Returns true or false for if a user can execute a privilaged oper command.
+	/** Returns true or false for if a user can execute a privileged oper command.
 	 * This is done by looking up their oper type from User::oper, then referencing
 	 * this to their oper classes and checking the commands they can execute.
 	 * @param command A command (should be all CAPS)
@@ -488,7 +488,7 @@ class CoreExport User : public Extensible
 	 * This is used to check whether or not users may perform certain actions which admins may not wish to give to
 	 * all operators, yet are not commands. An example might be oper override, mass messaging (/notice $*), etc.
 	 *
-	 * @param privstr The priv to chec, e.g. "users/override/topic". These are loaded free-form from the config file.
+	 * @param privstr The priv to check, e.g. "users/override/topic". These are loaded free-form from the config file.
 	 * @return True if this user has the permission in question.
 	 */
 	virtual bool HasPrivPermission(const std::string& privstr);
@@ -595,7 +595,7 @@ class CoreExport User : public Extensible
 
 	/** Change the ident (username) of a user.
 	 * ALWAYS use this function, rather than writing User::ident directly,
-	 * as this triggers module events allowing the change to be syncronized to
+	 * as this triggers module events allowing the change to be synchronized to
 	 * remote servers.
 	 * @param newident The new ident to set
 	 * @return True if the change succeeded, false if it didn't
@@ -776,7 +776,7 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local
 	 */
 	void WriteRemoteNotice(const std::string& text) override;
 
-	/** Returns true or false for if a user can execute a privilaged oper command.
+	/** Returns true or false for if a user can execute a privileged oper command.
 	 * This is done by looking up their oper type from User::oper, then referencing
 	 * this to their oper classes and checking the commands they can execute.
 	 * @param command A command (should be all CAPS)
@@ -788,7 +788,7 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local
 	 * This is used to check whether or not users may perform certain actions which admins may not wish to give to
 	 * all operators, yet are not commands. An example might be oper override, mass messaging (/notice $*), etc.
 	 *
-	 * @param privstr The priv to chec, e.g. "users/override/topic". These are loaded free-form from the config file.
+	 * @param privstr The priv to check, e.g. "users/override/topic". These are loaded free-form from the config file.
 	 * @return True if this user has the permission in question.
 	 */
 	bool HasPrivPermission(const std::string& privstr) override;