Merge "build: Update grunt-karma from 2.0.0 to 3.0.0"

[lhc/web/wiklou.git] / HISTORY

diff --git a/HISTORY b/HISTORY
index 2dc94ba..bc74a6b 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -5808,7 +5808,7 @@ This is a security and maintenance release of the MediaWiki 1.20 branch.
 * Localisation updates from http://translatewiki.net.
 * mwdocgen.php: Implement --version option.
 * Remove svnstat stuff used in Doxygen generation
-* (bug 43594) Correctly supress warnings that were missed after the upstream
+* (bug 43594) Correctly suppress warnings that were missed after the upstream
 * PHP change to E_STRICT being included in E_ALL.
 
 == MediaWiki 1.20.4 ==
@@ -11905,7 +11905,7 @@ it from source control: https://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11082) Fix check for fully-specced table names in Database::tableName
 * (bug 11067) Fix regression in upload conflict thumbnail display
 * (bug 10985) Resolved cached entries on Special:DoubleRedirects were being
-  supressed, breaking paging - now strikes out "fixed" results
+  suppressed, breaking paging - now strikes out "fixed" results
 * (bug 8393) <sup> and <sub> need to be preserved (without attributes) for
   entries in the table of contents
 * (bug 11114) Fix regression in read-only mode error display during editing
@@ -16315,7 +16315,7 @@ pages for purposes of page relevancy ranking.
 * (bug 1241) Don't show 'cont.' for first entry of the category list
 * (bug 1240) Special:Preferences was broken in Slovenian locale when
   $wgUseDynamicDates is enabled
-* Added magic word MAG_NOCONTENTCONVERT to supress the conversion of the
+* Added magic word MAG_NOCONTENTCONVERT to suppress the conversion of the
   content of an article. Useful in zh:
 * write-lock for updating the zh conversion tables in memcache
 * recursively parse subpages of MediaWiki:Zhconversiontable