From 960e4d09cafeb4d655e0beb08639c270ca60d2b8 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Wed, 7 Sep 2016 13:12:38 -0700 Subject: [PATCH] Documentation: Replace misuse of 'later' when we meant 'latter' Change-Id: I01bfdb8e0bfaa132533732873f7c840cea7935eb --- includes/DefaultSettings.php | 2 +- includes/MediaWiki.php | 2 +- includes/filebackend/FileBackend.php | 2 +- includes/filebackend/FileBackendStore.php | 2 +- includes/filerepo/FileBackendDBRepoWrapper.php | 2 +- includes/libs/objectcache/WANObjectCache.php | 2 +- includes/poolcounter/PoolCounterRedis.php | 4 ++-- includes/user/User.php | 2 +- maintenance/archives/patch-user_rights.sql | 2 +- tests/phpunit/Makefile | 2 +- tests/phpunit/includes/HtmlTest.php | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 97d7e801c9..3bf838121e 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -8275,7 +8275,7 @@ $wgPageLanguageUseDB = false; * Global configuration variable for Virtual REST Services. * * Use the 'path' key to define automatically mounted services. The value for this - * key is a map of path prefixes to service configuration. The later is an array of: + * key is a map of path prefixes to service configuration. The latter is an array of: * - class : the fully qualified class name * - options : map of arguments to the class constructor * Such services will be available to handle queries under their path from the VRS diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index 52eca31c8d..bca7a21755 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -632,7 +632,7 @@ class MediaWiki { fastcgi_finish_request(); } else { // Either all DB and deferred updates should happen or none. - // The later should not be cancelled due to client disconnect. + // The latter should not be cancelled due to client disconnect. ignore_user_abort( true ); } diff --git a/includes/filebackend/FileBackend.php b/includes/filebackend/FileBackend.php index d59c70313c..ed36a1f7b0 100644 --- a/includes/filebackend/FileBackend.php +++ b/includes/filebackend/FileBackend.php @@ -1034,7 +1034,7 @@ abstract class FileBackend { * * Write operations should *never* be done on this file as some backends * may do internal tracking or may be instances of FileBackendMultiWrite. - * In that later case, there are copies of the file that must stay in sync. + * In that latter case, there are copies of the file that must stay in sync. * Additionally, further calls to this function may return the same file. * * @param array $params Parameters include: diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php index db6575e198..bc4d81d0e2 100644 --- a/includes/filebackend/FileBackendStore.php +++ b/includes/filebackend/FileBackendStore.php @@ -1443,7 +1443,7 @@ abstract class FileBackendStore extends FileBackend { /** * Like resolveStoragePath() except null values are returned if * the container is sharded and the shard could not be determined - * or if the path ends with '/'. The later case is illegal for FS + * or if the path ends with '/'. The latter case is illegal for FS * backends and can confuse listings for object store backends. * * This function is used when resolving paths that must be valid diff --git a/includes/filerepo/FileBackendDBRepoWrapper.php b/includes/filerepo/FileBackendDBRepoWrapper.php index 106522397a..596dbded92 100644 --- a/includes/filerepo/FileBackendDBRepoWrapper.php +++ b/includes/filerepo/FileBackendDBRepoWrapper.php @@ -27,7 +27,7 @@ * @brief Proxy backend that manages file layout rewriting for FileRepo. * * LocalRepo may be configured to store files under their title names or by SHA-1. - * This acts as a shim in the later case, providing backwards compatability for + * This acts as a shim in the latter case, providing backwards compatability for * most callers. All "public"/"deleted" zone files actually go in an "original" * container and are never changed. * diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php index 06b87e0483..5563b22225 100644 --- a/includes/libs/objectcache/WANObjectCache.php +++ b/includes/libs/objectcache/WANObjectCache.php @@ -1015,7 +1015,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface { */ final public function getLastError() { if ( $this->lastRelayError ) { - // If the cache and the relayer failed, focus on the later. + // If the cache and the relayer failed, focus on the latter. // An update not making it to the relayer means it won't show up // in other DCs (nor will consistent re-hashing see up-to-date values). // On the other hand, if just the cache update failed, then it should diff --git a/includes/poolcounter/PoolCounterRedis.php b/includes/poolcounter/PoolCounterRedis.php index f2c59d2da1..5e8db070aa 100644 --- a/includes/poolcounter/PoolCounterRedis.php +++ b/includes/poolcounter/PoolCounterRedis.php @@ -246,7 +246,7 @@ LUA; } elseif ( $slot === 'QUEUE_WAIT' ) { // This process is now registered as waiting $keys = ( $doWakeup == self::AWAKE_ALL ) - // Wait for an open slot or wake-up signal (preferring the later) + // Wait for an open slot or wake-up signal (preferring the latter) ? [ $this->getWakeupListKey(), $this->getSlotListKey() ] // Just wait for an actual pool slot : [ $this->getSlotListKey() ]; @@ -292,7 +292,7 @@ LUA; local rMaxWorkers,rMaxQueue,rTimeout,rExpiry,rSess,rTime = unpack(ARGV) -- Initialize if the "next release" time sorted-set is empty. The slot key -- itself is empty if all slots are busy or when nothing is initialized. - -- If the list is empty but the set is not, then it is the later case. + -- If the list is empty but the set is not, then it is the latter case. -- For sanity, if the list exists but not the set, then reset everything. if redis.call('exists',kSlotsNextRelease) == 0 then redis.call('del',kSlots) diff --git a/includes/user/User.php b/includes/user/User.php index 248ea8e194..7109a4aa87 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -5173,7 +5173,7 @@ class User implements IDBAccessObject { [ 'up_property', 'up_value' ], [ 'up_user' => $userId ], __METHOD__ ); // Find prior rows that need to be removed or updated. These rows will - // all be deleted (the later so that INSERT IGNORE applies the new values). + // all be deleted (the latter so that INSERT IGNORE applies the new values). $keysDelete = []; foreach ( $res as $row ) { if ( !isset( $saveOptions[$row->up_property] ) diff --git a/maintenance/archives/patch-user_rights.sql b/maintenance/archives/patch-user_rights.sql index 4947cb1f78..a39ac0af63 100644 --- a/maintenance/archives/patch-user_rights.sql +++ b/maintenance/archives/patch-user_rights.sql @@ -1,7 +1,7 @@ -- Split user table into two parts: -- user -- user_rights --- The later contains only the permissions of the user. This way, +-- The latter contains only the permissions of the user. This way, -- you can store the accounts for several wikis in one central -- database but keep user rights local to the wiki. diff --git a/tests/phpunit/Makefile b/tests/phpunit/Makefile index e1537bf5cc..8503393215 100644 --- a/tests/phpunit/Makefile +++ b/tests/phpunit/Makefile @@ -76,7 +76,7 @@ help: # tap Run the tests individually through Test::Harness's prove(1) # help You're looking at it! # coverage Run the tests and generates an HTML code coverage report - # You will need the Xdebug PHP extension for the later. + # You will need the Xdebug PHP extension for the latter. # [no]parser Skip or only run Parser tests # # list-groups List available Tests groups. diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php index e44db83b44..85c95e4768 100644 --- a/tests/phpunit/includes/HtmlTest.php +++ b/tests/phpunit/includes/HtmlTest.php @@ -271,7 +271,7 @@ class HtmlTest extends MediaWikiTestCase { /** * How do we handle duplicate keys in HTML attributes expansion? * We could pass a "class" the values: 'GREEN' and array( 'GREEN' => false ) - * The later will take precedence. + * The latter will take precedence. * * Feature added by r96188 * @covers Html::expandAttributes -- 2.20.1