From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 28 May 2019 21:46:27 +0000 (+0000)
Subject: Merge "Fix typos in MessageCache"
X-Git-Tag: 1.34.0-rc.0~1569
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=cb1f3f90dd02b74166c863204bc7c3b987283a82;hp=344ecb7e40ba92e720a3c91b72b3e34eca882d99

Merge "Fix typos in MessageCache"
---

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 328cc2f8e0..b0716b18b3 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -217,7 +217,7 @@ class MessageCache {
 	/**
 	 * Try to load the cache from APC.
 	 *
-	 * @param string $code Optional language code, see documenation of load().
+	 * @param string $code Optional language code, see documentation of load().
 	 * @return array|bool The cache array, or false if not in cache.
 	 */
 	protected function getLocalCache( $code ) {
@@ -342,7 +342,7 @@ class MessageCache {
 					} elseif ( $hashVolatile ) {
 						# DB results are replica DB lag prone until the holdoff TTL passes.
 						# By then, updates should be reflected in loadFromDBWithLock().
-						# One thread renerates the cache while others use old values.
+						# One thread regenerates the cache while others use old values.
 						$where[] = 'global cache is expired/volatile';
 						$staleCache = $cache;
 					} else {
@@ -379,7 +379,7 @@ class MessageCache {
 					break;
 				} elseif ( $loadStatus === 'cantacquire' ) {
 					# Wait for the other thread to finish, then retry. Normally,
-					# the memcached get() will then yeild the other thread's result.
+					# the memcached get() will then yield the other thread's result.
 					$where[] = 'waited for other thread to complete';
 					$this->getReentrantScopedLock( $cacheKey );
 				} else {