Fix typos in comments (E-H)

Change-Id: I0748e0d5962fa909fdd6b7fcae4ab259bde4cdf1

17 files changed, 23 insertions, 23 deletions

diff --git a/includes/Hook/EditFilterMergedContentHook.php b/includes/Hook/EditFilterMergedContentHook.php
index 3eddd2d0a3c8..620a99b01471 100644
--- a/includes/Hook/EditFilterMergedContentHook.php
+++ b/includes/Hook/EditFilterMergedContentHook.php
@@ -31,7 +31,7 @@ interface EditFilterMergedContentHook {
 	 * @param User $user User whois performing the edit
 	 * @param bool $minoredit Whether the edit was marked as minor by the user.
 	 * @return bool|void False or no return value with not $status->isOK() to abort the edit
-	 *   and show the edit form, true to continue. But because mutiple triggers of this hook
+	 *   and show the edit form, true to continue. But because multiple triggers of this hook
 	 *   may have different behavior in different version (T273354), you'd better return false
 	 *   and set $status->value to EditPage::AS_HOOK_ERROR_EXPECTED or any other customized value.
 	 */
diff --git a/includes/HookContainer/HookContainer.php b/includes/HookContainer/HookContainer.php
index f0c34fac3326..2616bd694e4a 100644
--- a/includes/HookContainer/HookContainer.php
+++ b/includes/HookContainer/HookContainer.php
@@ -111,7 +111,7 @@ class HookContainer implements SalvageableService {
 	 * @param string $hook Name of the hook
 	 * @param array $args Arguments to pass to hook handler
 	 * @param array $options options map:
-	 *   - abortable: (bool) If false, handlers will not be allowed to abort the call sequenece.
+	 *   - abortable: (bool) If false, handlers will not be allowed to abort the call sequence.
 	 *     An exception will be raised if a handler returns anything other than true or null.
 	 *   - deprecatedVersion: (string) Version of MediaWiki this hook was deprecated in. For supporting
 	 *     Hooks::run() legacy $deprecatedVersion parameter. New core code should add deprecated
diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index 939fa07e490e..d7cd960b2d55 100644
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -176,7 +176,7 @@ class HTMLFileCache extends FileCacheBase {
 	 * Save this cache object with the given text.
 	 * Use this as an ob_start() handler.
 	 *
-	 * Normally this is only registed as a handler if $wgUseFileCache is on.
+	 * Normally this is only registered as a handler if $wgUseFileCache is on.
 	 * If can be explicitly called by rebuildFileCache.php when it takes over
 	 * handling file caching itself, disabling any automatic handling the
 	 * process.
diff --git a/includes/externalstore/ExternalStoreDB.php b/includes/externalstore/ExternalStoreDB.php
index aff2fe080636..df55fa0439e4 100644
--- a/includes/externalstore/ExternalStoreDB.php
+++ b/includes/externalstore/ExternalStoreDB.php
@@ -57,7 +57,7 @@ class ExternalStoreDB extends ExternalStoreMedium {
 	 * Fetch data from given external store URL.
 	 *
 	 * The provided URL is in the form of `DB://cluster/id` or `DB://cluster/id/itemid`
-	 * for concatened storage if ConcatenatedGzipHistoryBlob was used.
+	 * for concatenated storage if ConcatenatedGzipHistoryBlob was used.
 	 *
 	 * @param string $url
 	 * @return string|bool False if missing
@@ -78,7 +78,7 @@ class ExternalStoreDB extends ExternalStoreMedium {
 	 * Fetch multiple URLs from given external store.
 	 *
 	 * The provided URLs are in the form of `DB://cluster/id`, or `DB://cluster/id/itemid`
-	 * for concatened storage if ConcatenatedGzipHistoryBlob was used.
+	 * for concatenated storage if ConcatenatedGzipHistoryBlob was used.
 	 *
 	 * @param array $urls An array of external store URLs
 	 * @return array A map from url to stored content. Failed results
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index bb5b8e2f1ad9..efc220b783de 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -45,7 +45,7 @@ use MediaWiki\User\UserIdentity;
  * concrete functions are also typically overridden by child classes.
  *
  * Note that only the repo object knows what its file class is called. You should
- * never name a file class explictly outside of the repo class. Instead use the
+ * never name a file class explicitly outside of the repo class. Instead use the
  * repo's factory functions to generate file objects, for example:
  *
  * RepoGroup::singleton()->getLocalRepo()->newFile( $title );
@@ -973,7 +973,7 @@ abstract class File implements IDBAccessObject, MediaHandlerState {
 	 * This is a dummy function right now and always returns false. It could be
 	 * implemented to extract a flag from the database. The trusted flag could be
 	 * set on upload, if the user has sufficient privileges, to bypass script-
-	 * and html-filters. It may even be coupled with cryptographics signatures
+	 * and html-filters. It may even be coupled with cryptographic signatures
 	 * or such.
 	 *
 	 * @return bool
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index a4ff89798249..d393a687b62c 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -121,7 +121,7 @@ use MediaWiki\Page\PageReference;
  *    'disable-if'          -- expression given as an array stating when the field
  *                             should be disabled. See 'hide-if' for supported expressions.
  *                             The 'hide-if' logic would also disable fields, you don't need
- *                             to set this attribute with the same condiction manually.
+ *                             to set this attribute with the same condition manually.
  *                             You can pass both 'disabled' and this attribute to omit extra
  *                             ckeck, but this would function only for not 'disabled' fields.
  *    'section'             -- A string name for the section of the form to which the field
@@ -1946,7 +1946,7 @@ class HTMLForm extends ContextSource {
 	 * @return string
 	 */
 	public function getAction() {
-		// If an action is alredy provided, return it
+		// If an action is already provided, return it
 		if ( $this->mAction !== false ) {
 			return $this->mAction;
 		}
diff --git a/includes/htmlform/fields/HTMLInfoField.php b/includes/htmlform/fields/HTMLInfoField.php
index 80d4ad09d29f..770bb78c1a62 100644
--- a/includes/htmlform/fields/HTMLInfoField.php
+++ b/includes/htmlform/fields/HTMLInfoField.php
@@ -9,7 +9,7 @@ class HTMLInfoField extends HTMLFormField {
 	 * @stable to call
 	 *
 	 * @param array $info
-	 *   In adition to the usual HTMLFormField parameters, this can take the following fields:
+	 *   In addition to the usual HTMLFormField parameters, this can take the following fields:
 	 *   - default: the value (text) of the field. Unlike other form field types, HTMLInfoField can
 	 *     take a closure as a default value, which will be evaluated with $info as its only parameter.
 	 *   - raw: if true, the value won't be escaped.
diff --git a/includes/htmlform/fields/HTMLRadioField.php b/includes/htmlform/fields/HTMLRadioField.php
index fe22b343011e..ba6bade7d09f 100644
--- a/includes/htmlform/fields/HTMLRadioField.php
+++ b/includes/htmlform/fields/HTMLRadioField.php
@@ -9,7 +9,7 @@ class HTMLRadioField extends HTMLFormField {
 	/**
 	 * @stable to call
 	 * @param array $params
-	 *   In adition to the usual HTMLFormField parameters, this can take the following fields:
+	 *   In addition to the usual HTMLFormField parameters, this can take the following fields:
 	 *   - flatlist: If given, the options will be displayed on a single line (wrapping to following
 	 *     lines if necessary), rather than each one on a line of its own. This is desirable mostly
 	 *     for very short lists of concisely labelled options.
diff --git a/includes/htmlform/fields/HTMLSelectLimitField.php b/includes/htmlform/fields/HTMLSelectLimitField.php
index c0bd70a696e6..80b0560422b4 100644
--- a/includes/htmlform/fields/HTMLSelectLimitField.php
+++ b/includes/htmlform/fields/HTMLSelectLimitField.php
@@ -19,7 +19,7 @@ class HTMLSelectLimitField extends HTMLSelectField {
 			return true;
 		}
 
-		// Let folks pick an explicit limit not from our list, as long as it's a real numbr.
+		// Let folks pick an explicit limit not from our list, as long as it's a real number.
 		if ( !in_array( $value, $this->mParams['options'] )
 			&& $value == intval( $value )
 			&& $value > 0
diff --git a/includes/htmlform/fields/HTMLUserTextField.php b/includes/htmlform/fields/HTMLUserTextField.php
index ab4a4cb5f85c..501a2371bc68 100644
--- a/includes/htmlform/fields/HTMLUserTextField.php
+++ b/includes/htmlform/fields/HTMLUserTextField.php
@@ -9,8 +9,8 @@ use Wikimedia\IPUtils;
  *
  * Optional parameters:
  * 'exists' - Whether to validate that the user already exists
- * 'ipallowed' - Whether an IP adress is interpreted as "valid"
- * 'iprange' - Whether an IP adress range is interpreted as "valid"
+ * 'ipallowed' - Whether an IP address is interpreted as "valid"
+ * 'iprange' - Whether an IP address range is interpreted as "valid"
  * 'iprangelimits' - Specifies the valid IP ranges for IPv4 and IPv6 in an array.
  *  defaults to IPv4 => 16; IPv6 => 32.
  *
diff --git a/includes/libs/HashRing.php b/includes/libs/HashRing.php
index b2580c61d3ae..65731fd8b803 100644
--- a/includes/libs/HashRing.php
+++ b/includes/libs/HashRing.php
@@ -399,7 +399,7 @@ class HashRing implements Serializable {
 		$now = $this->getCurrentTime();
 
 		if ( $this->liveRing === null || min( $this->ejectExpiryByLocation ) <= $now ) {
-			// Live ring needs to be regerenated...
+			// Live ring needs to be regenerated...
 			$this->ejectExpiryByLocation = array_filter(
 				$this->ejectExpiryByLocation,
 				static function ( $expiry ) use ( $now ) {
diff --git a/includes/libs/filebackend/FSFileBackend.php b/includes/libs/filebackend/FSFileBackend.php
index 852ee8337831..cf92c93e8699 100644
--- a/includes/libs/filebackend/FSFileBackend.php
+++ b/includes/libs/filebackend/FSFileBackend.php
@@ -62,7 +62,7 @@ use Wikimedia\Timestamp\ConvertibleTimestamp;
  * @since 1.19
  */
 class FSFileBackend extends FileBackendStore {
-	/** @var MapCacheLRU Cache for known prepared/usable directorries */
+	/** @var MapCacheLRU Cache for known prepared/usable directories */
 	protected $usableDirCache;
 
 	/** @var string Directory holding the container directories */
@@ -812,7 +812,7 @@ class FSFileBackend extends FileBackendStore {
 	/**
 	 * @param string $fsSrcPath Absolute file system path
 	 * @param string $fsDstPath Absolute file system path
-	 * @param bool $ignoreMissing Whether to no-op if the source file is non-existant
+	 * @param bool $ignoreMissing Whether to no-op if the source file is non-existent
 	 * @return string Command
 	 */
 	private function makeCopyCommand( $fsSrcPath, $fsDstPath, $ignoreMissing ) {
diff --git a/includes/libs/filebackend/FileBackendStore.php b/includes/libs/filebackend/FileBackendStore.php
index 168d2d1135b1..9ffb8a5caa29 100644
--- a/includes/libs/filebackend/FileBackendStore.php
+++ b/includes/libs/filebackend/FileBackendStore.php
@@ -983,7 +983,7 @@ abstract class FileBackendStore extends FileBackend {
 				}
 			}
 		}
-		// Fetch local references of any remaning files...
+		// Fetch local references of any remaining files...
 		$params['srcs'] = array_diff( $params['srcs'], array_keys( $fsFiles ) );
 		foreach ( $this->doGetLocalReferenceMulti( $params ) as $path => $fsFile ) {
 			if ( $fsFile instanceof FSFile ) {
diff --git a/includes/libs/filebackend/fileiteration/FSFileBackendList.php b/includes/libs/filebackend/fileiteration/FSFileBackendList.php
index ead7528b48a6..0783cc646ecd 100644
--- a/includes/libs/filebackend/fileiteration/FSFileBackendList.php
+++ b/includes/libs/filebackend/fileiteration/FSFileBackendList.php
@@ -21,7 +21,7 @@
 
 /**
  * Wrapper around RecursiveDirectoryIterator/DirectoryIterator that
- * catches exception or does any custom behavoir that we may want.
+ * catches exception or does any custom behavior that we may want.
  * Do not use this class from places outside FSFileBackend.
  *
  * @ingroup FileBackend
diff --git a/includes/libs/uuid/GlobalIdGenerator.php b/includes/libs/uuid/GlobalIdGenerator.php
index 56751d3ad08e..3c504521633d 100644
--- a/includes/libs/uuid/GlobalIdGenerator.php
+++ b/includes/libs/uuid/GlobalIdGenerator.php
@@ -522,7 +522,7 @@ class GlobalIdGenerator {
 				$msecCounter = (int)$data[2] % $msecCounterSize;
 				// Bump the counter if the time has not changed yet
 				if ( ++$msecCounter >= $msecCounterSize ) {
-					// More IDs generated with the same time than counterSize can accomodate
+					// More IDs generated with the same time than counterSize can accommodate
 					flock( $handle, LOCK_UN );
 					throw new RuntimeException( "Counter overflow for timestamp value." );
 				}
diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index f6e724abc7b3..c2d80c48831b 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -517,7 +517,7 @@ class Exif {
 
 	/**
 	 * Convert gps in exif form to a single floating point number
-	 * for example 10 degress 20`40`` S -> -10.34444
+	 * for example 10 degrees 20`40`` S -> -10.34444
 	 * @param string $prop A GPS coordinate exif tag name (like GPSLongitude)
 	 */
 	private function exifGPStoNumber( $prop ) {
diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php
index f0e0acde6a73..40d2ec9f6565 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -300,7 +300,7 @@ class ExtensionRegistry {
 	}
 
 	/**
-	 * Queries information about the software environment and constructs an appropiate version checker
+	 * Queries information about the software environment and constructs an appropriate version checker
 	 *
 	 * @return VersionChecker
 	 */
@@ -551,7 +551,7 @@ class ExtensionRegistry {
 	 * Whether a thing has been loaded
 	 * @param string $name
 	 * @param string $constraint The required version constraint for this dependency
-	 * @throws LogicException if a specific contraint is asked for,
+	 * @throws LogicException if a specific constraint is asked for,
 	 *                        but the extension isn't versioned
 	 * @return bool
 	 */