From 08330903ee5bd8ea967622ff7473d13dff19beb5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 24 Mar 2012 08:27:18 +0000
Subject: [PATCH] Fixed a typo

---
 .../interfaces/cache/class_Cacheable.php      |  2 +-
 .../interfaces/class_FrameworkInterface.php   |  4 +-
 .../points/class_BookablePoints.php           |  4 +-
 .../interfaces/registry/class_Register.php    |  4 +-
 .../socket/class_RegisterableSocket.php       |  4 +-
 .../interfaces/request/class_Requestable.php  |  8 +-
 .../resolver/actions/class_ActionResolver.php |  4 +-
 .../commands/class_CommandResolver.php        |  4 +-
 .../resolver/state/class_StateResolver.php    |  4 +-
 .../response/class_Responseable.php           |  2 +-
 .../interfaces/stacker/class_Stackable.php    |  8 +-
 .../template/class_CompileableTemplate.php    |  8 +-
 .../user/class_ManageableAccount.php          | 10 +--
 inc/classes/main/cache/class_MemoryCache.php  |  2 +-
 .../main/class_BaseFrameworkSystem.php        | 18 ++--
 .../socket/class_SocketContainer.php          |  4 +-
 .../main/criteria/class_BaseCriteria.php      |  6 +-
 .../databases/class_LocalFileDatabase.php     |  2 +-
 .../class_XmlRewriterTemplateDecorator.php    | 10 +--
 .../validator/class_EmailValidatorFilter.php  |  4 +-
 .../class_UserNameValidatorFilter.php         |  4 +-
 .../class_UserGuestVerifierFilter.php         |  4 +-
 .../verifier/class_UserNameVerifierFilter.php |  4 +-
 inc/classes/main/helper/class_BaseHelper.php  | 12 +--
 .../web/blocks/class_WebBlockHelper.php       |  4 +-
 .../helper/web/forms/class_WebFormHelper.php  | 84 +++++++++----------
 inc/classes/main/images/class_BaseImage.php   |  4 +-
 inc/classes/main/points/class_UserPoints.php  |  4 +-
 .../main/registry/class_BaseRegistry.php      |  4 +-
 .../main/request/class_BaseRequest.php        | 14 ++--
 .../action/class_BaseActionResolver.php       |  4 +-
 .../command/class_BaseCommandResolver.php     |  4 +-
 .../class_BaseControllerResolver.php          |  6 +-
 .../main/response/class_BaseResponse.php      |  2 +-
 .../console/class_ConsoleResponse.php         |  2 +-
 .../response/image/class_ImageResponse.php    |  2 +-
 .../main/result/class_DatabaseResult.php      | 14 ++--
 .../main/stacker/class_BaseStacker.php        | 12 +--
 .../template/class_BaseTemplateEngine.php     | 16 ++--
 .../image/class_ImageTemplateEngine.php       |  2 +-
 inc/classes/main/user/class_BaseUser.php      | 10 +--
 inc/config/class_FrameworkConfiguration.php   | 12 +--
 inc/loader/class_ClassLoader.php              |  2 +-
 43 files changed, 169 insertions(+), 169 deletions(-)

diff --git a/inc/classes/interfaces/cache/class_Cacheable.php b/inc/classes/interfaces/cache/class_Cacheable.php
index 4c9ee077..31fd0d1b 100644
--- a/inc/classes/interfaces/cache/class_Cacheable.php
+++ b/inc/classes/interfaces/cache/class_Cacheable.php
@@ -26,7 +26,7 @@ interface Cacheable extends FrameworkInterface {
 	 * Does the specified offset exist in cache?
 	 *
 	 * @param	$offset		The offset we are looking for
-	 * @return	$exists		Wether the offset exists
+	 * @return	$exists		Whether the offset exists
 	 */
 	function offsetExists($offset);
 
diff --git a/inc/classes/interfaces/class_FrameworkInterface.php b/inc/classes/interfaces/class_FrameworkInterface.php
index 9ec630aa..5647d138 100644
--- a/inc/classes/interfaces/class_FrameworkInterface.php
+++ b/inc/classes/interfaces/class_FrameworkInterface.php
@@ -34,11 +34,11 @@ interface FrameworkInterface {
 	function getField ($fieldName);
 
 	/**
-	 * Checks wether an object equals this object. You should overwrite this
+	 * Checks whether an object equals this object. You should overwrite this
 	 * method to implement own equality checks
 	 *
 	 * @param	$objectInstance		An instance of a FrameworkInterface object
-	 * @return	$equals				Wether both objects equals
+	 * @return	$equals				Whether both objects equals
 	 */
 	function equals (FrameworkInterface $objectInstance);
 
diff --git a/inc/classes/interfaces/points/class_BookablePoints.php b/inc/classes/interfaces/points/class_BookablePoints.php
index a2e088c5..a62bd63e 100644
--- a/inc/classes/interfaces/points/class_BookablePoints.php
+++ b/inc/classes/interfaces/points/class_BookablePoints.php
@@ -23,10 +23,10 @@
  */
 interface BookablePoints extends FrameworkInterface {
 	/**
-	 * Checks wether the user has the required amount of points left for the specified action
+	 * Checks whether the user has the required amount of points left for the specified action
 	 *
 	 * @param	$action			The action or configuration entry plus prefix the user wants to perform
-	 * @return	$hasRequired	Wether the user has the required points
+	 * @return	$hasRequired	Whether the user has the required points
 	 */
 	function ifUserHasRequiredPoints ($action);
 
diff --git a/inc/classes/interfaces/registry/class_Register.php b/inc/classes/interfaces/registry/class_Register.php
index 4bb1fda4..5ca5ebba 100644
--- a/inc/classes/interfaces/registry/class_Register.php
+++ b/inc/classes/interfaces/registry/class_Register.php
@@ -23,10 +23,10 @@
  */
 interface Register extends FrameworkInterface {
 	/**
-	 * Checks wether an instance key was found
+	 * Checks whether an instance key was found
 	 *
 	 * @param	$instanceKey	The key holding an instance in registry
-	 * @return	$exists			Wether the key exists in registry
+	 * @return	$exists			Whether the key exists in registry
 	 */
 	function instanceExists ($instanceKey);
 
diff --git a/inc/classes/interfaces/registry/socket/class_RegisterableSocket.php b/inc/classes/interfaces/registry/socket/class_RegisterableSocket.php
index fc7f3987..cb4537fa 100644
--- a/inc/classes/interfaces/registry/socket/class_RegisterableSocket.php
+++ b/inc/classes/interfaces/registry/socket/class_RegisterableSocket.php
@@ -23,12 +23,12 @@
  */
 interface RegisterableSocket extends Registerable {
 	/**
-	 * Checks wether given socket resource is registered. If $socketResource is
+	 * Checks whether given socket resource is registered. If $socketResource is
 	 * false only the instance will be checked.
 	 *
 	 * @param	$protocolInstance	An instance of a ProtocolHandler class
 	 * @param	$socketResource		A valid socket resource
-	 * @return	$isRegistered		Wether the given socket resource is registered
+	 * @return	$isRegistered		Whether the given socket resource is registered
 	 */
 	function isSocketRegistered (ProtocolHandler $protocolInstance, $socketResource);
 
diff --git a/inc/classes/interfaces/request/class_Requestable.php b/inc/classes/interfaces/request/class_Requestable.php
index 47431f70..76174b25 100644
--- a/inc/classes/interfaces/request/class_Requestable.php
+++ b/inc/classes/interfaces/request/class_Requestable.php
@@ -30,9 +30,9 @@ interface Requestable extends FrameworkInterface {
 	function prepareRequestData ();
 
 	/**
-	 * Checks wether a request element is set
+	 * Checks whether a request element is set
 	 * @param	$element	Name of the request element we want to check
-	 * @return	$isSet		Wether the request element is set
+	 * @return	$isSet		Whether the request element is set
 	 * @throws	MissingArrayElementsException	Thrown if a request element is not set
 	 */
 	function isRequestElementSet ($element);
@@ -62,9 +62,9 @@ interface Requestable extends FrameworkInterface {
 	function getHeader ($headerName);
 
 	/**
-	 * Sets wether the request was valid (default: true)
+	 * Sets whether the request was valid (default: true)
 	 *
-	 * @param	$isValid		Wether the request is valid
+	 * @param	$isValid		Whether the request is valid
 	 * @return	void
 	 */
 	function requestIsValid ($isValid = true);
diff --git a/inc/classes/interfaces/resolver/actions/class_ActionResolver.php b/inc/classes/interfaces/resolver/actions/class_ActionResolver.php
index 7d7cd0b4..bf0171e9 100644
--- a/inc/classes/interfaces/resolver/actions/class_ActionResolver.php
+++ b/inc/classes/interfaces/resolver/actions/class_ActionResolver.php
@@ -38,10 +38,10 @@ interface ActionResolver extends Resolver {
 	function resolveActionByRequest (Requestable $requestInstance);
 
 	/**
-	 * Checks wether the given action is valid
+	 * Checks whether the given action is valid
 	 *
 	 * @param	$actionName		The default action we shall execute
-	 * @return	$isValid		Wether the given action is valid
+	 * @return	$isValid		Whether the given action is valid
 	 * @throws	EmptyVariableException	Thrown if given action is not set
 	 */
 	function isActionValid ($actionName);
diff --git a/inc/classes/interfaces/resolver/commands/class_CommandResolver.php b/inc/classes/interfaces/resolver/commands/class_CommandResolver.php
index 24a8547a..03821b63 100644
--- a/inc/classes/interfaces/resolver/commands/class_CommandResolver.php
+++ b/inc/classes/interfaces/resolver/commands/class_CommandResolver.php
@@ -31,10 +31,10 @@ interface CommandResolver extends Resolver {
 	function resolveCommandByRequest (Requestable $requestInstance);
 
 	/**
-	 * Checks wether the given command is valid
+	 * Checks whether the given command is valid
 	 *
 	 * @param	$commandName	The default command we shall execute
-	 * @return	$isValid		Wether the given command is valid
+	 * @return	$isValid		Whether the given command is valid
 	 * @throws	EmptyVariableException	Thrown if given command is not set
 	 */
 	function isCommandValid ($commandName);
diff --git a/inc/classes/interfaces/resolver/state/class_StateResolver.php b/inc/classes/interfaces/resolver/state/class_StateResolver.php
index d94d34a6..b225a317 100644
--- a/inc/classes/interfaces/resolver/state/class_StateResolver.php
+++ b/inc/classes/interfaces/resolver/state/class_StateResolver.php
@@ -33,10 +33,10 @@ interface StateResolver extends Resolver {
 	static function resolveStateByPackage (ConnectionHelper $helperInstance, array $packageData, $socketResource);
 
 	/**
-	 * Checks wether the given state is valid
+	 * Checks whether the given state is valid
 	 *
 	 * @param	$stateName	The default state we shall execute
-	 * @return	$isValid	Wether the given state is valid
+	 * @return	$isValid	Whether the given state is valid
 	 * @throws	EmptyVariableException	Thrown if given state is not set
 	 */
 	function isStateValid ($stateName);
diff --git a/inc/classes/interfaces/response/class_Responseable.php b/inc/classes/interfaces/response/class_Responseable.php
index 8f19e8ed..8ecf4b20 100644
--- a/inc/classes/interfaces/response/class_Responseable.php
+++ b/inc/classes/interfaces/response/class_Responseable.php
@@ -54,7 +54,7 @@ interface Responseable extends FrameworkInterface {
 	/**
 	 * Flushs the cached HTTP response to the outer world
 	 *
-	 * @param	$force	Wether we shall force the output or abort if headers are
+	 * @param	$force	Whether we shall force the output or abort if headers are
 	 *					already sent with an exception
 	 * @return	void
 	 * @throws	ResponseHeadersAlreadySentException		Thrown if headers are
diff --git a/inc/classes/interfaces/stacker/class_Stackable.php b/inc/classes/interfaces/stacker/class_Stackable.php
index 34b6cf18..3819a3cb 100644
--- a/inc/classes/interfaces/stacker/class_Stackable.php
+++ b/inc/classes/interfaces/stacker/class_Stackable.php
@@ -53,18 +53,18 @@ interface Stackable extends FrameworkInterface {
 	function getNamed ($stackerName);
 
 	/**
-	 * Checks wether the given stack is initialized (set in array $stackers)
+	 * Checks whether the given stack is initialized (set in array $stackers)
 	 *
 	 * @param	$stackerName	Name of the stack
-	 * @return	$isInitialized	Wether the stack is initialized
+	 * @return	$isInitialized	Whether the stack is initialized
 	 */
 	function isStackInitialized ($stackerName);
 
 	/**
-	 * Checks wether the given stack is empty
+	 * Checks whether the given stack is empty
 	 *
 	 * @param	$stackerName	Name of the stack
-	 * @return	$isEmpty			Wether the stack is empty
+	 * @return	$isEmpty			Whether the stack is empty
 	 * @throws	NoStackerException	If given stack is missing
 	 */
 	function isStackEmpty ($stackerName);
diff --git a/inc/classes/interfaces/template/class_CompileableTemplate.php b/inc/classes/interfaces/template/class_CompileableTemplate.php
index e1070c9d..3b6671e0 100644
--- a/inc/classes/interfaces/template/class_CompileableTemplate.php
+++ b/inc/classes/interfaces/template/class_CompileableTemplate.php
@@ -160,9 +160,9 @@ interface CompileableTemplate extends FrameworkInterface {
 	function enableLanguageSupport ($languageSupport = true);
 
 	/**
-	 * Checks wether language support is enabled
+	 * Checks whether language support is enabled
 	 *
-	 * @return	$languageSupport	Wether language support is enabled or disabled
+	 * @return	$languageSupport	Whether language support is enabled or disabled
 	 */
 	function isLanguageSupportEnabled ();
 
@@ -175,9 +175,9 @@ interface CompileableTemplate extends FrameworkInterface {
 	function enableXmlCompacting ($xmlCompacting = true);
 
 	/**
-	 * Checks wether XML compacting is enabled
+	 * Checks whether XML compacting is enabled
 	 *
-	 * @return	$xmlCompacting	Wether XML compacting is enabled or disabled
+	 * @return	$xmlCompacting	Whether XML compacting is enabled or disabled
 	 */
 	function isXmlCompactingEnabled ();
 
diff --git a/inc/classes/interfaces/user/class_ManageableAccount.php b/inc/classes/interfaces/user/class_ManageableAccount.php
index 15ffcb27..1e7937b9 100644
--- a/inc/classes/interfaces/user/class_ManageableAccount.php
+++ b/inc/classes/interfaces/user/class_ManageableAccount.php
@@ -23,16 +23,16 @@
  */
 interface ManageableAccount extends FrameworkInterface {
 	/**
-	 * Determines wether the username exists or not
+	 * Determines whether the username exists or not
 	 *
-	 * @return	$exists		Wether the username exists
+	 * @return	$exists		Whether the username exists
 	 */
 	function ifUsernameExists ();
 
 	/**
-	 * Determines wether the email exists or not
+	 * Determines whether the email exists or not
 	 *
-	 * @return	$exists		Wether the email exists
+	 * @return	$exists		Whether the email exists
 	 */
 	function ifEmailAddressExists ();
 
@@ -41,7 +41,7 @@ interface ManageableAccount extends FrameworkInterface {
 	 * database.
 	 *
 	 * @param	$requestInstance	A requestable class instance
-	 * @return	$matches			Wether the supplied password hash matches
+	 * @return	$matches			Whether the supplied password hash matches
 	 */
 	function ifPasswordHashMatches (Requestable $requestInstance);
 }
diff --git a/inc/classes/main/cache/class_MemoryCache.php b/inc/classes/main/cache/class_MemoryCache.php
index 61248e0c..b6a131c9 100644
--- a/inc/classes/main/cache/class_MemoryCache.php
+++ b/inc/classes/main/cache/class_MemoryCache.php
@@ -67,7 +67,7 @@ class MemoryCache extends BaseFrameworkSystem implements Cacheable {
 	 * Does the specified offset exist in cache?
 	 *
 	 * @param	$offset		The offset we are looking for
-	 * @return	$exists		Wether the offset exists
+	 * @return	$exists		Whether the offset exists
 	 */
 	public function offsetExists ($offset) {
 		$exists = $this->dataCache->offsetExists($offset);
diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 9fe346ea..adbb27c2 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -726,11 +726,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Checks wether an object equals this object. You should overwrite this
+	 * Checks whether an object equals this object. You should overwrite this
 	 * method to implement own equality checks
 	 *
 	 * @param	$objectInstance		An instance of a FrameworkInterface object
-	 * @return	$equals				Wether both objects equals
+	 * @return	$equals				Whether both objects equals
 	 */
 	public function equals (FrameworkInterface $objectInstance) {
 		// Now test it
@@ -982,10 +982,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Outputs a debug message wether to debug instance (should be set!) or dies with or pints the message
+	 * Outputs a debug message whether to debug instance (should be set!) or dies with or pints the message
 	 *
 	 * @param	$message	Message we shall send out...
-	 * @param	$doPrint	Wether we shall print or die here which first is the default
+	 * @param	$doPrint	Whether we shall print or die here which first is the default
 	 * @return	void
 	 */
 	public function debugOutput ($message, $doPrint = true) {
@@ -1311,10 +1311,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Checks wether the given PHP extension is loaded
+	 * Checks whether the given PHP extension is loaded
 	 *
 	 * @param	$phpExtension	The PHP extension we shall check
-	 * @return	$isLoaded	Wether the PHP extension is loaded
+	 * @return	$isLoaded	Whether the PHP extension is loaded
 	 */
 	public final function isPhpExtensionLoaded ($phpExtension) {
 		// Is it loaded?
@@ -1398,7 +1398,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	/**
 	 * Idles (sleeps) for given milliseconds
 	 *
-	 * @return	$hasSlept	Wether it goes fine
+	 * @return	$hasSlept	Whether it goes fine
 	 */
 	public function idle ($milliSeconds) {
 		// Sleep is fine by default
@@ -1899,10 +1899,10 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Checks wether the given encoded data was encoded with Base64
+	 * Checks whether the given encoded data was encoded with Base64
 	 *
 	 * @param	$encodedData	Encoded data we shall check
-	 * @return	$isBase64		Wether the encoded data is Base64
+	 * @return	$isBase64		Whether the encoded data is Base64
 	 */
 	protected function isBase64Encoded ($encodedData) {
 		// Determine it
diff --git a/inc/classes/main/container/socket/class_SocketContainer.php b/inc/classes/main/container/socket/class_SocketContainer.php
index 8b70b954..d725052d 100644
--- a/inc/classes/main/container/socket/class_SocketContainer.php
+++ b/inc/classes/main/container/socket/class_SocketContainer.php
@@ -58,10 +58,10 @@ class SocketContainer extends BaseContainer implements Registerable {
 	}
 
 	/**
-	 * Checks wether the given address (IP) matches with the one from the socket resource
+	 * Checks whether the given address (IP) matches with the one from the socket resource
 	 *
 	 * @param	$addressPort	The address:port (IP to check
-	 * @return	$matches		Wether $address matches with the one from socket resource
+	 * @return	$matches		Whether $address matches with the one from socket resource
 	 */
 	public final function ifAddressMatches ($addressPort) {
 		// Get current package data
diff --git a/inc/classes/main/criteria/class_BaseCriteria.php b/inc/classes/main/criteria/class_BaseCriteria.php
index 4bec36a6..19983c0b 100644
--- a/inc/classes/main/criteria/class_BaseCriteria.php
+++ b/inc/classes/main/criteria/class_BaseCriteria.php
@@ -98,7 +98,7 @@ class BaseCriteria extends BaseFrameworkSystem {
 	 * Get criteria element or null if not found
 	 *
 	 * @param	$criteria	The criteria we want to have
-	 * @return	$value		Wether the value of the critera or null
+	 * @return	$value		Whether the value of the critera or null
 	 */
 	public function getCriteriaElemnent ($criteria) {
 		// Default is not found
@@ -115,10 +115,10 @@ class BaseCriteria extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Checks wether given array entry matches
+	 * Checks whether given array entry matches
 	 *
 	 * @param	$entryArray		Array with the entries to find
-	 * @return	$matches		Wether the entry matches or not
+	 * @return	$matches		Whether the entry matches or not
 	 */
 	public function ifEntryMatches (array $entryArray) {
 		// First nothing matches and nothing is counted
diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index 6a6dd559..73e4bad6 100644
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -48,7 +48,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 	private $lastContents = array();
 
 	/**
-	 * Wether the "connection is already up
+	 * Whether the "connection is already up
 	 */
 	private $alreadyConnected = false;
 
diff --git a/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php b/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php
index 1f109a41..d331d02e 100644
--- a/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php
+++ b/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php
@@ -54,7 +54,7 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableT
 	 * Settter for variable group
 	 *
 	 * @param	$groupName	Name of variable group
-	 * @param	$add		Wether add this group
+	 * @param	$add		Whether add this group
 	 * @return	void
 	 */
 	public function setVariableGroup ($groupName, $add = true) {
@@ -360,9 +360,9 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableT
 	}
 
 	/**
-	 * Checks wether language support is enabled
+	 * Checks whether language support is enabled
 	 *
-	 * @return	$languageSupport	Wether language support is enabled or disabled
+	 * @return	$languageSupport	Whether language support is enabled or disabled
 	 */
 	public final function isLanguageSupportEnabled () {
 		// Call the inner class' method
@@ -381,9 +381,9 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableT
 	}
 
 	/**
-	 * Checks wether XML compacting is enabled
+	 * Checks whether XML compacting is enabled
 	 *
-	 * @return	$xmlCompacting	Wether XML compacting is enabled or disabled
+	 * @return	$xmlCompacting	Whether XML compacting is enabled or disabled
 	 */
 	public final function isXmlCompactingEnabled () {
 		// Call the inner class' method
diff --git a/inc/classes/main/filter/validator/class_EmailValidatorFilter.php b/inc/classes/main/filter/validator/class_EmailValidatorFilter.php
index 26da852b..6e5b055e 100644
--- a/inc/classes/main/filter/validator/class_EmailValidatorFilter.php
+++ b/inc/classes/main/filter/validator/class_EmailValidatorFilter.php
@@ -126,10 +126,10 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 	}
 
 	/**
-	 * Check wether the email as already been taken
+	 * Check whether the email as already been taken
 	 *
 	 * @param	$email			Email to check for existence
-	 * @return	$alreadyTaken	Wether the email has been taken
+	 * @return	$alreadyTaken	Whether the email has been taken
 	 */
 	private function ifEmailIsTaken ($email) {
 		// Default is already taken
diff --git a/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php b/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php
index c6fa4b2c..e845e57f 100644
--- a/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php
+++ b/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php
@@ -91,10 +91,10 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
 	}
 
 	/**
-	 * Check wether the username as already been taken
+	 * Check whether the username as already been taken
 	 *
 	 * @param	$userName		Username to check for existence
-	 * @return	$alreadyTaken	Wether the username has been taken
+	 * @return	$alreadyTaken	Whether the username has been taken
 	 */
 	private function ifUserNameIsTaken ($userName) {
 		// Default is already taken
diff --git a/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
index 70aa47b6..f4f66a83 100644
--- a/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
@@ -94,10 +94,10 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 	}
 
 	/**
-	 * Check wether the username as already been taken
+	 * Check whether the username as already been taken
 	 *
 	 * @param	$userName		Username to check for existence
-	 * @return	$alreadyTaken	Wether the username has been taken
+	 * @return	$alreadyTaken	Whether the username has been taken
 	 */
 	private function ifUserGuestIsTaken ($userName) {
 		// Default is already taken
diff --git a/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php
index e4685727..aee9f97b 100644
--- a/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php
@@ -91,10 +91,10 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
 	}
 
 	/**
-	 * Check wether the username as already been taken
+	 * Check whether the username as already been taken
 	 *
 	 * @param	$userName		Username to check for existence
-	 * @return	$alreadyTaken	Wether the username has been taken
+	 * @return	$alreadyTaken	Whether the username has been taken
 	 */
 	private function ifUserNameIsTaken ($userName) {
 		// Default is already taken
diff --git a/inc/classes/main/helper/class_BaseHelper.php b/inc/classes/main/helper/class_BaseHelper.php
index 143923c6..c03a4429 100644
--- a/inc/classes/main/helper/class_BaseHelper.php
+++ b/inc/classes/main/helper/class_BaseHelper.php
@@ -428,10 +428,10 @@ class BaseHelper extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Checks wether the specified group is opened
+	 * Checks whether the specified group is opened
 	 *
 	 * @param	$groupId	Id of group to check
-	 * @return	$isOpened	Wether the specified group is open
+	 * @return	$isOpened	Whether the specified group is open
 	 */
 	protected function ifGroupIsOpened ($groupId) {
 		// Is the group open?
@@ -479,9 +479,9 @@ class BaseHelper extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Check wether a group was opened previously
+	 * Check whether a group was opened previously
 	 *
-	 * @return	$groupOpened	Wether any group was opened before
+	 * @return	$groupOpened	Whether any group was opened before
 	 */
 	protected final function ifGroupOpenedPreviously () {
 		$groupOpened = (!empty($this->previousGroupId));
@@ -489,9 +489,9 @@ class BaseHelper extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Check wether a group was opened previously
+	 * Check whether a group was opened previously
 	 *
-	 * @return	$subGroupOpened		Wether any group was opened before
+	 * @return	$subGroupOpened		Whether any group was opened before
 	 */
 	protected final function ifSubGroupOpenedPreviously () {
 		$subGroupOpened = (!empty($this->previousSubGroupId));
diff --git a/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php b/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
index 4b8d22db..dd661939 100644
--- a/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
+++ b/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
@@ -78,9 +78,9 @@ class WebBlockHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether include registration date in this block
+	 * Checks whether include registration date in this block
 	 *
-	 * @return	$withRegistration	Wether with registration date
+	 * @return	$withRegistration	Whether with registration date
 	 */
 	public function ifIncludeRegistrationStamp () {
 		$withRegistration = ($this->getConfigInstance()->getConfigEntry('block_shows_registration') == 'Y');
diff --git a/inc/classes/main/helper/web/forms/class_WebFormHelper.php b/inc/classes/main/helper/web/forms/class_WebFormHelper.php
index ad605ce7..4fb8f08f 100644
--- a/inc/classes/main/helper/web/forms/class_WebFormHelper.php
+++ b/inc/classes/main/helper/web/forms/class_WebFormHelper.php
@@ -23,7 +23,7 @@
  */
 class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	/**
-	 * Wether the form tag is opened (keep at false or else your forms will
+	 * Whether the form tag is opened (keep at false or else your forms will
 	 * never work!)
 	 */
 	private $formOpened = false;
@@ -34,7 +34,7 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	private $formName = '';
 
 	/**
-	 * Wether form tag is enabled (default: true)
+	 * Whether form tag is enabled (default: true)
 	 */
 	private $formEnabled = true;
 
@@ -60,7 +60,7 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	 * @param	$templateInstance	An instance of a valid template engine
 	 * @param	$formName			Name of the form
 	 * @param	$formId				Value for 'id' attribute (default: $formName)
-	 * @param	$withForm			Wether include the form tag
+	 * @param	$withForm			Whether include the form tag
 	 * @return	$helperInstance		A preparedf instance of this helper
 	 */
 	public static final function createWebFormHelper (CompileableTemplate $templateInstance, $formName, $formId = false, $withForm = true) {
@@ -111,7 +111,7 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 		// Close the form is default
 		$formContent = '</form>';
 
-		// Check wether we shall open or close the form
+		// Check whether we shall open or close the form
 		if (($this->formOpened === false) && ($this->formEnabled === true)) {
 			// Add HTML code
 			$formContent = sprintf("<form name=\"%s\" class=\"forms\" action=\"%s/%s\" method=\"%s\" target=\"%s\"",
@@ -284,7 +284,7 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	 * yet opened. The field's name will be set as id.
 	 *
 	 * @param	$fieldName		Input field name
-	 * @param	$fieldChecked	Wether the field is checked (defaut: checked)
+	 * @param	$fieldChecked	Whether the field is checked (defaut: checked)
 	 * @return	void
 	 * @throws	FormClosedException		If the form is not yet opened
 	 */
@@ -295,7 +295,7 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 			throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
 		} // END - if
 
-		// Set wether the check box is checked...
+		// Set whether the check box is checked...
 		$checked = " checked=\"checked\"";
 		if ($fieldChecked === false) $checked = ' ';
 
@@ -699,7 +699,7 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	/**
 	 * Enables/disables the form tag usage
 	 *
-	 * @param	$formEnabled	Wether form is enabled or disabled
+	 * @param	$formEnabled	Whether form is enabled or disabled
 	 * @return	void
 	 */
 	public final function enableForm ($formEnabled = true) {
@@ -726,9 +726,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether the registration requires a valid email address
+	 * Checks whether the registration requires a valid email address
 	 *
-	 * @return	$required	Wether the email address is required
+	 * @return	$required	Whether the email address is required
 	 */
 	public function ifRegisterRequiresEmailVerification () {
 		$required = ($this->getConfigInstance()->getConfigEntry('register_requires_email') == 'Y');
@@ -736,9 +736,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether profile data shall be asked
+	 * Checks whether profile data shall be asked
 	 *
-	 * @return	$required	Wether profile data shall be asked
+	 * @return	$required	Whether profile data shall be asked
 	 */
 	public function ifRegisterIncludesProfile () {
 		$required = ($this->getConfigInstance()->getConfigEntry('register_includes_profile') == 'Y');
@@ -746,9 +746,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether this form is secured by a CAPTCHA
+	 * Checks whether this form is secured by a CAPTCHA
 	 *
-	 * @return	$isSecured	Wether this form is secured by a CAPTCHA
+	 * @return	$isSecured	Whether this form is secured by a CAPTCHA
 	 */
 	public function ifFormSecuredWithCaptcha () {
 		$isSecured = ($this->getConfigInstance()->getConfigEntry($this->getFormName().'_captcha_secured') == 'Y');
@@ -756,9 +756,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether personal data shall be asked
+	 * Checks whether personal data shall be asked
 	 *
-	 * @return	$required	Wether personal data shall be asked
+	 * @return	$required	Whether personal data shall be asked
 	 */
 	public function ifRegisterIncludesPersonaData () {
 		$required = ($this->getConfigInstance()->getConfigEntry('register_personal_data') == 'Y');
@@ -766,9 +766,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether for birthday shall be asked
+	 * Checks whether for birthday shall be asked
 	 *
-	 * @return	$required	Wether birthday shall be asked
+	 * @return	$required	Whether birthday shall be asked
 	 */
 	public function ifProfileIncludesBirthDay () {
 		$required = ($this->getConfigInstance()->getConfigEntry('profile_includes_birthday') == 'Y');
@@ -776,7 +776,7 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether email addresses can only be once used
+	 * Checks whether email addresses can only be once used
 	 *
 	 * @return	$isUnique
 	 */
@@ -786,9 +786,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether the specified chat protocol is enabled in this form
+	 * Checks whether the specified chat protocol is enabled in this form
 	 *
-	 * @return	$required	Wether the specified chat protocol is enabled
+	 * @return	$required	Whether the specified chat protocol is enabled
 	 */
 	public function ifChatEnabled ($chatProtocol) {
 		$required = ($this->getConfigInstance()->getConfigEntry('chat_enabled_' . $chatProtocol) == 'Y');
@@ -796,9 +796,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether login is enabled or disabled
+	 * Checks whether login is enabled or disabled
 	 *
-	 * @return	$isEnabled	Wether the login is enabled or disabled
+	 * @return	$isEnabled	Whether the login is enabled or disabled
 	 */
 	public function ifLoginIsEnabled () {
 		$isEnabled = ($this->getConfigInstance()->getConfigEntry('login_enabled') == 'Y');
@@ -806,9 +806,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether login shall be done by username
+	 * Checks whether login shall be done by username
 	 *
-	 * @return	$isEnabled	Wether the login shall be done by username
+	 * @return	$isEnabled	Whether the login shall be done by username
 	 */
 	public function ifLoginWithUsername () {
 		$isEnabled = ($this->getConfigInstance()->getConfigEntry('login_type') == "username");
@@ -816,9 +816,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether login shall be done by email
+	 * Checks whether login shall be done by email
 	 *
-	 * @return	$isEnabled	Wether the login shall be done by email
+	 * @return	$isEnabled	Whether the login shall be done by email
 	 */
 	public function ifLoginWithEmail () {
 		$isEnabled = ($this->getConfigInstance()->getConfigEntry('login_type') == "email");
@@ -826,9 +826,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether guest login is allowed
+	 * Checks whether guest login is allowed
 	 *
-	 * @return	$isAllowed	Wether guest login is allowed
+	 * @return	$isAllowed	Whether guest login is allowed
 	 */
 	public function ifGuestLoginAllowed () {
 		$isAllowed = ($this->getConfigInstance()->getConfigEntry('guest_login_allowed') == 'Y');
@@ -836,9 +836,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether the email address change must be confirmed
+	 * Checks whether the email address change must be confirmed
 	 *
-	 * @return	$requireConfirm		Wether email change must be confirmed
+	 * @return	$requireConfirm		Whether email change must be confirmed
 	 */
 	public function ifEmailChangeRequireConfirmation () {
 		$requireConfirm = ($this->getConfigInstance()->getConfigEntry('email_change_confirmation') == 'Y');
@@ -846,9 +846,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether the rules has been updated
+	 * Checks whether the rules has been updated
 	 *
-	 * @return	$rulesUpdated	Wether rules has been updated
+	 * @return	$rulesUpdated	Whether rules has been updated
 	 * @todo	Implement check if rules have been changed
 	 */
 	public function ifRulesHaveChanged () {
@@ -856,9 +856,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether email change is allowed
+	 * Checks whether email change is allowed
 	 *
-	 * @return	$emailChange	Wether changing email address is allowed
+	 * @return	$emailChange	Whether changing email address is allowed
 	 */
 	public function ifEmailChangeAllowed () {
 		$emailChange = ($this->getConfigInstance()->getConfigEntry('email_change_allowed') == 'Y');
@@ -866,9 +866,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether the user account is unconfirmed
+	 * Checks whether the user account is unconfirmed
 	 *
-	 * @return	$isUnconfirmed	Wether the user account is unconfirmed
+	 * @return	$isUnconfirmed	Whether the user account is unconfirmed
 	 */
 	public function ifUserAccountUnconfirmed () {
 		$isUnconfirmed = ($this->getValueField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) === $this->getConfigInstance()->getConfigEntry('user_status_unconfirmed'));
@@ -876,9 +876,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether the user account is locked
+	 * Checks whether the user account is locked
 	 *
-	 * @return	$isUnconfirmed	Wether the user account is locked
+	 * @return	$isUnconfirmed	Whether the user account is locked
 	 */
 	public function ifUserAccountLocked () {
 		$isUnconfirmed = ($this->getValueField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) === $this->getConfigInstance()->getConfigEntry('user_status_locked'));
@@ -886,9 +886,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether the user account is a guest
+	 * Checks whether the user account is a guest
 	 *
-	 * @return	$isUnconfirmed	Wether the user account is a guest
+	 * @return	$isUnconfirmed	Whether the user account is a guest
 	 */
 	public function ifUserAccountGuest () {
 		$isUnconfirmed = ($this->getValueField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) === $this->getConfigInstance()->getConfigEntry('user_status_guest'));
@@ -896,10 +896,10 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	}
 
 	/**
-	 * Checks wether the refill page is active which should be not the default
+	 * Checks whether the refill page is active which should be not the default
 	 * on non-web applications.
 	 *
-	 * @return	$refillActive	Wether the refill page is active
+	 * @return	$refillActive	Whether the refill page is active
 	 */
 	public function ifRefillPageActive () {
 		$refillActive = ($this->getConfigInstance()->getConfigEntry('refill_page_active') == 'Y');
diff --git a/inc/classes/main/images/class_BaseImage.php b/inc/classes/main/images/class_BaseImage.php
index f5aebb36..18c565aa 100644
--- a/inc/classes/main/images/class_BaseImage.php
+++ b/inc/classes/main/images/class_BaseImage.php
@@ -94,7 +94,7 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
 	/**
 	 * Private setter for all colors
 	 *
-	 * @param	$colorMode		Wether background or foreground color
+	 * @param	$colorMode		Whether background or foreground color
 	 * @param	$colorChannel	Red, green or blue channel?
 	 * @param	$colorValue		Value to set
 	 */
@@ -240,7 +240,7 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
 	/**
 	 * Prepares the class for string (unused at the moment)
 	 *
-	 * @param	$groupable	Wether this image string is groupable or single
+	 * @param	$groupable	Whether this image string is groupable or single
 	 * @return	void
 	 * @todo	Find something usefull for this method.
 	 */
diff --git a/inc/classes/main/points/class_UserPoints.php b/inc/classes/main/points/class_UserPoints.php
index 4698eafc..56f3302b 100644
--- a/inc/classes/main/points/class_UserPoints.php
+++ b/inc/classes/main/points/class_UserPoints.php
@@ -93,10 +93,10 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
 	}
 
 	/**
-	 * Checks wether the user has the required amount of points left for the specified action
+	 * Checks whether the user has the required amount of points left for the specified action
 	 *
 	 * @param	$action			The action or configuration entry plus prefix the user wants to perform
-	 * @return	$hasRequired	Wether the user has the required points
+	 * @return	$hasRequired	Whether the user has the required points
 	 * @todo	Finish loading part of points
 	 */
 	public function ifUserHasRequiredPoints ($action) {
diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index 718f0a4f..200ea171 100644
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -49,10 +49,10 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	}
 
 	/**
-	 * Checks wether an instance key was found
+	 * Checks whether an instance key was found
 	 *
 	 * @param	$instanceKey	The key holding an instance in registry
-	 * @return	$exists			Wether the key exists in registry
+	 * @return	$exists			Whether the key exists in registry
 	 */
 	public function instanceExists ($instanceKey) {
 		// Does this key exists?
diff --git a/inc/classes/main/request/class_BaseRequest.php b/inc/classes/main/request/class_BaseRequest.php
index 3757607d..475be2b8 100644
--- a/inc/classes/main/request/class_BaseRequest.php
+++ b/inc/classes/main/request/class_BaseRequest.php
@@ -28,7 +28,7 @@ class BaseRequest extends BaseFrameworkSystem {
 	private $requestData = array();
 
 	/**
-	 * Wether this request is valid and can be further processed. The default is
+	 * Whether this request is valid and can be further processed. The default is
 	 * valid so make sure your intercepting filters sets this attribute to false
 	 * when they need to intercept the data flow.
 	 */
@@ -46,9 +46,9 @@ class BaseRequest extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Checks wether a request element is set
+	 * Checks whether a request element is set
 	 * @param	$element	Name of the request element we want to check
-	 * @return	$isSet		Wether the request element is set
+	 * @return	$isSet		Whether the request element is set
 	 */
 	public function isRequestElementSet ($element) {
 		// Is this element found?
@@ -113,9 +113,9 @@ class BaseRequest extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Sets wether the request was valid (default: true)
+	 * Sets whether the request was valid (default: true)
 	 *
-	 * @param	$isValid	Wether the request is valid
+	 * @param	$isValid	Whether the request is valid
 	 * @return	void
 	 */
 	public final function requestIsValid ($isValid = true) {
@@ -123,9 +123,9 @@ class BaseRequest extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Returns wether this request is valid
+	 * Returns whether this request is valid
 	 *
-	 * @return	$requestIsValid		Wether this request is valid
+	 * @return	$requestIsValid		Whether this request is valid
 	 */
 	public final function isRequestValid () {
 		return $this->requestIsValid;
diff --git a/inc/classes/main/resolver/action/class_BaseActionResolver.php b/inc/classes/main/resolver/action/class_BaseActionResolver.php
index d7d309cd..4196b274 100644
--- a/inc/classes/main/resolver/action/class_BaseActionResolver.php
+++ b/inc/classes/main/resolver/action/class_BaseActionResolver.php
@@ -58,10 +58,10 @@ class BaseActionResolver extends BaseResolver {
 	}
 
 	/**
-	 * Checks wether the given action is valid
+	 * Checks whether the given action is valid
 	 *
 	 * @param	$actionName	The default action we shall execute
-	 * @return	$isValid		Wether the given action is valid
+	 * @return	$isValid		Whether the given action is valid
 	 * @throws	EmptyVariableException	Thrown if given action is not set
 	 */
 	public function isActionValid ($actionName) {
diff --git a/inc/classes/main/resolver/command/class_BaseCommandResolver.php b/inc/classes/main/resolver/command/class_BaseCommandResolver.php
index 53775f6b..d767d290 100644
--- a/inc/classes/main/resolver/command/class_BaseCommandResolver.php
+++ b/inc/classes/main/resolver/command/class_BaseCommandResolver.php
@@ -58,10 +58,10 @@ class BaseCommandResolver extends BaseResolver {
 	}
 
 	/**
-	 * Checks wether the given command is valid
+	 * Checks whether the given command is valid
 	 *
 	 * @param	$commandName	The default command we shall execute
-	 * @return	$isValid		Wether the given command is valid
+	 * @return	$isValid		Whether the given command is valid
 	 * @throws	EmptyVariableException	Thrown if given command is not set
 	 */
 	public function isCommandValid ($commandName) {
diff --git a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
index 176fa793..b4032e26 100644
--- a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
@@ -60,7 +60,7 @@ class BaseControllerResolver extends BaseResolver {
 	/**
 	 * "Loads" a given controller and instances it if not yet cached. If the
 	 * controller was not found one of the default controllers will be used
-	 * depending on wether news shall be displayed.
+	 * depending on whether news shall be displayed.
 	 *
 	 * @param	$controllerName			A controller name we shall look for
 	 * @return	$controllerInstance		A loaded controller instance
@@ -124,10 +124,10 @@ class BaseControllerResolver extends BaseResolver {
 	}
 
 	/**
-	 * Checks wether the given controller is valid
+	 * Checks whether the given controller is valid
 	 *
 	 * @param	$controllerName		The default controller we shall execute
-	 * @return	$isValid			Wether the given controller is valid
+	 * @return	$isValid			Whether the given controller is valid
 	 * @throws	EmptyVariableException		Thrown if given controller is not set
 	 * @throws	DefaultControllerException	Thrown if default controller was not found
 	 */
diff --git a/inc/classes/main/response/class_BaseResponse.php b/inc/classes/main/response/class_BaseResponse.php
index 14c2117e..a26e7b1e 100644
--- a/inc/classes/main/response/class_BaseResponse.php
+++ b/inc/classes/main/response/class_BaseResponse.php
@@ -142,7 +142,7 @@ class BaseResponse extends BaseFrameworkSystem {
 	/**
 	 * Flushs the cached HTTP response to the outer world
 	 *
-	 * @param	$force	Wether we shall force the output or abort if headers are
+	 * @param	$force	Whether we shall force the output or abort if headers are
 	 *					already sent with an exception
 	 * @return	void
 	 * @throws	ResponseHeadersAlreadySentException		Thrown if headers are
diff --git a/inc/classes/main/response/console/class_ConsoleResponse.php b/inc/classes/main/response/console/class_ConsoleResponse.php
index 1469bd32..9dead80c 100644
--- a/inc/classes/main/response/console/class_ConsoleResponse.php
+++ b/inc/classes/main/response/console/class_ConsoleResponse.php
@@ -125,7 +125,7 @@ class ConsoleResponse extends BaseResponse implements Responseable {
 	/**
 	 * Flushs the cached console response to the console
 	 *
-	 * @param	$force	Wether we shall force the output or abort if headers are
+	 * @param	$force	Whether we shall force the output or abort if headers are
 	 *					already sent with an exception
 	 * @return	void
 	 * @throws	ResponseHeadersAlreadySentException		Thrown if headers are
diff --git a/inc/classes/main/response/image/class_ImageResponse.php b/inc/classes/main/response/image/class_ImageResponse.php
index c3ef454e..13ce14ac 100644
--- a/inc/classes/main/response/image/class_ImageResponse.php
+++ b/inc/classes/main/response/image/class_ImageResponse.php
@@ -179,7 +179,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 	/**
 	 * Flushs the cached HTTP response to the outer world
 	 *
-	 * @param	$force	Wether we shall force the output or abort if headers are
+	 * @param	$force	Whether we shall force the output or abort if headers are
 	 *					already sent with an exception
 	 * @return	void
 	 */
diff --git a/inc/classes/main/result/class_DatabaseResult.php b/inc/classes/main/result/class_DatabaseResult.php
index 0fab649c..f86fdc95 100644
--- a/inc/classes/main/result/class_DatabaseResult.php
+++ b/inc/classes/main/result/class_DatabaseResult.php
@@ -120,7 +120,7 @@ class DatabaseResult extends BaseFrameworkSystem implements SearchableResult, Up
 	 * "Iterator" method next() to advance to the next valid entry. This method
 	 * does also check if result is invalid
 	 *
-	 * @return	$nextValid	Wether the next entry is valid
+	 * @return	$nextValid	Whether the next entry is valid
 	 */
 	public function next () {
 		// Default is not valid
@@ -177,7 +177,7 @@ class DatabaseResult extends BaseFrameworkSystem implements SearchableResult, Up
 	/**
 	 * Checks if next() and rewind will give a valid result
 	 *
-	 * @return	$isValid Wether the next/rewind entry is valid
+	 * @return	$isValid Whether the next/rewind entry is valid
 	 */
 	public function valid () {
 		// By default nothing is valid
@@ -194,9 +194,9 @@ class DatabaseResult extends BaseFrameworkSystem implements SearchableResult, Up
 	}
 
 	/**
-	 * Determines wether the status of the query was fine (LocalfileDatabase::RESULT_OKAY)
+	 * Determines whether the status of the query was fine (LocalfileDatabase::RESULT_OKAY)
 	 *
-	 * @return	$ifStatusOkay	Wether the status of the query was okay
+	 * @return	$ifStatusOkay	Whether the status of the query was okay
 	 */
 	public function ifStatusIsOkay () {
 		return ((isset($this->resultArray[BaseDatabaseFrontend::RESULT_INDEX_STATUS])) && ($this->resultArray[BaseDatabaseFrontend::RESULT_INDEX_STATUS] === LocalfileDatabase::RESULT_OKAY));
@@ -306,9 +306,9 @@ class DatabaseResult extends BaseFrameworkSystem implements SearchableResult, Up
 	}
 
 	/**
-	 * Checks wether we have out-dated entries or not
+	 * Checks whether we have out-dated entries or not
 	 *
-	 * @return	$needsUpdate	Wether we have out-dated entries
+	 * @return	$needsUpdate	Whether we have out-dated entries
 	 */
 	public function ifDataNeedsFlush () {
 		$needsUpdate = (count($this->outDated) > 0);
@@ -337,7 +337,7 @@ class DatabaseResult extends BaseFrameworkSystem implements SearchableResult, Up
 	 * Find a key inside the result array
 	 *
 	 * @param	$key	The key we shall find
-	 * @return	$found	Wether the key was found or not
+	 * @return	$found	Whether the key was found or not
 	 */
 	public function find ($key) {
 		// By default nothing is found
diff --git a/inc/classes/main/stacker/class_BaseStacker.php b/inc/classes/main/stacker/class_BaseStacker.php
index ea31904d..9a6cf4b3 100644
--- a/inc/classes/main/stacker/class_BaseStacker.php
+++ b/inc/classes/main/stacker/class_BaseStacker.php
@@ -67,10 +67,10 @@ class BaseStacker extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Checks wether the given stack is initialized (set in array $stackers)
+	 * Checks whether the given stack is initialized (set in array $stackers)
 	 *
 	 * @param	$stackerName	Name of the stack
-	 * @return	$isInitialized	Wether the stack is initialized
+	 * @return	$isInitialized	Whether the stack is initialized
 	 */
 	public final function isStackInitialized ($stackerName) {
 		// Is is there?
@@ -81,10 +81,10 @@ class BaseStacker extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Checks wether the given stack is full
+	 * Checks whether the given stack is full
 	 *
 	 * @param	$stackerName	Name of the stack
-	 * @return	$isFull			Wether the stack is full
+	 * @return	$isFull			Whether the stack is full
 	 * @throws	NoStackerException	If given stack is missing
 	 */
 	protected final function isStackFull ($stackerName) {
@@ -102,10 +102,10 @@ class BaseStacker extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Checks wether the given stack is empty
+	 * Checks whether the given stack is empty
 	 *
 	 * @param	$stackerName		Name of the stack
-	 * @return	$isEmpty			Wether the stack is empty
+	 * @return	$isEmpty			Whether the stack is empty
 	 * @throws	NoStackerException	If given stack is missing
 	 */
 	public final function isStackEmpty ($stackerName) {
diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php
index 188caa21..d8a6719a 100644
--- a/inc/classes/main/template/class_BaseTemplateEngine.php
+++ b/inc/classes/main/template/class_BaseTemplateEngine.php
@@ -198,10 +198,10 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Checks wether the given variable stack is set
+	 * Checks whether the given variable stack is set
 	 *
 	 * @param	$stack	Variable stack to check
-	 * @return	$isSet	Wether the given variable stack is set
+	 * @return	$isSet	Whether the given variable stack is set
 	 */
 	protected final function isVarStackSet ($stack) {
 		// Check it
@@ -278,7 +278,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	/**
 	 * Returns all variables of current group or empty array
 	 *
-	 * @return	$result		Wether array of found variables or empty array
+	 * @return	$result		Whether array of found variables or empty array
 	 */
 	private function readCurrentGroup () {
 		// Default is not found
@@ -298,7 +298,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	 * Settter for variable group
 	 *
 	 * @param	$groupName	Name of variable group
-	 * @param	$add		Wether add this group
+	 * @param	$add		Whether add this group
 	 * @return	void
 	 */
 	public function setVariableGroup ($groupName, $add = true) {
@@ -1475,9 +1475,9 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Checks wether language support is enabled
+	 * Checks whether language support is enabled
 	 *
-	 * @return	$languageSupport	Wether language support is enabled or disabled
+	 * @return	$languageSupport	Whether language support is enabled or disabled
 	 */
 	public final function isLanguageSupportEnabled () {
 		return $this->languageSupport;
@@ -1494,9 +1494,9 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Checks wether XML compacting is enabled
+	 * Checks whether XML compacting is enabled
 	 *
-	 * @return	$xmlCompacting	Wether XML compacting is enabled or disabled
+	 * @return	$xmlCompacting	Whether XML compacting is enabled or disabled
 	 */
 	public final function isXmlCompactingEnabled () {
 		return $this->xmlCompacting;
diff --git a/inc/classes/main/template/image/class_ImageTemplateEngine.php b/inc/classes/main/template/image/class_ImageTemplateEngine.php
index d59c91fa..17c9a396 100644
--- a/inc/classes/main/template/image/class_ImageTemplateEngine.php
+++ b/inc/classes/main/template/image/class_ImageTemplateEngine.php
@@ -320,7 +320,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl
 	/**
 	 * "Setter" for image-string. For more details see above method!
 	 *
-	 * @param	$groupable	Wether this image string is groupable
+	 * @param	$groupable	Whether this image string is groupable
 	 * @return	void
 	 * @see		ImageTemplateEngine::setImageResolution
 	 */
diff --git a/inc/classes/main/user/class_BaseUser.php b/inc/classes/main/user/class_BaseUser.php
index a26da5d5..247b85af 100644
--- a/inc/classes/main/user/class_BaseUser.php
+++ b/inc/classes/main/user/class_BaseUser.php
@@ -112,9 +112,9 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
 	}
 
 	/**
-	 * Determines wether the username exists or not
+	 * Determines whether the username exists or not
 	 *
-	 * @return	$exists		Wether the username exists
+	 * @return	$exists		Whether the username exists
 	 */
 	public function ifUsernameExists () {
 		// By default the username does not exist
@@ -156,9 +156,9 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
 	}
 
 	/**
-	 * Determines wether the email exists or not
+	 * Determines whether the email exists or not
 	 *
-	 * @return	$exists		Wether the email exists
+	 * @return	$exists		Whether the email exists
 	 */
 	public function ifEmailAddressExists () {
 		// By default the email does not exist
@@ -213,7 +213,7 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
 	 * database.
 	 *
 	 * @param	$requestInstance	A requestable class instance
-	 * @return	$matches			Wether the supplied password hash matches
+	 * @return	$matches			Whether the supplied password hash matches
 	 */
 	public function ifPasswordHashMatches (Requestable $requestInstance) {
 		// By default nothing matches... ;)
diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index b3bc491f..bebc1cde 100644
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -103,10 +103,10 @@ class FrameworkConfiguration implements Registerable {
 	}
 
 	/**
-	 * Checks wether the given configuration entry is set
+	 * Checks whether the given configuration entry is set
 	 *
 	 * @param	$configEntry	The configuration entry we shall check
-	 * @return	$isset			Wether the given configuration entry is set
+	 * @return	$isset			Whether the given configuration entry is set
 	 */
 	protected function isConfigurationEntrySet ($configEntry) {
 		// Is it set?
@@ -233,9 +233,9 @@ class FrameworkConfiguration implements Registerable {
 	}
 
 	/**
-	 * Checks wether HTTPS is set in $_SERVER
+	 * Checks whether HTTPS is set in $_SERVER
 	 *
-	 * @return $isset	Wether HTTPS is set
+	 * @return $isset	Whether HTTPS is set
 	 */
 	public function isHttpSecured () {
 		return (isset($_SERVER['HTTPS']));
@@ -323,11 +323,11 @@ class FrameworkConfiguration implements Registerable {
 	}
 
 	/**
-	 * Checks wether an object equals this object. You should overwrite this
+	 * Checks whether an object equals this object. You should overwrite this
 	 * method to implement own equality checks
 	 *
 	 * @param	$objectInstance		An instance of a FrameworkInterface object
-	 * @return	$equals				Wether both objects equals
+	 * @return	$equals				Whether both objects equals
 	 */
 	public function equals (FrameworkInterface $objectInstance) {
 		// Now test it
diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 61d5effc..8d559fd5 100644
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -74,7 +74,7 @@ class ClassLoader {
 	private $debug = false;
 
 	/**
-	 * Wether the file list is cached or not
+	 * Whether the file list is cached
 	 */
 	private $listCached = false;
 
-- 
2.39.5