From: Stefano Lattarini stefano.lattar...@gmail.com
Date: Fri, 12 Apr 2013 00:36:10 +0200
Most of these were found using Lucas De Marchi's codespell tool.
Others were pointed out by Eric Sunshine.
Helped-by: Eric Sunshine sunsh...@sunshineco.com
Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
contrib/mw-to-git/git-remote-mediawiki.perl| 6 +++---
contrib/mw-to-git/t/README | 6 +++---
contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +-
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh| 14 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index 094129de..9c14c1f8 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -28,7 +28,7 @@
use constant SLASH_REPLACEMENT = %2F;
# It's not always possible to delete pages (may require some
-# priviledges). Deleted pages are replaced with this content.
+# privileges). Deleted pages are replaced with this content.
use constant DELETED_CONTENT = [[Category:Deleted]]\n;
# It's not possible to create empty pages. New empty files in Git are
@@ -841,7 +841,7 @@ sub mw_import_ref {
if ($fetch_from == 1 $n == 0) {
print STDERR You appear to have cloned an empty MediaWiki.\n;
# Something has to be done remote-helper side. If nothing is
done, an error is
- # thrown saying that HEAD is refering to unknown object
000
+ # thrown saying that HEAD is referring to unknown object
000
# and the clone fails.
}
}
@@ -1067,7 +1067,7 @@ sub mw_push_file {
my $file_content;
if ($page_deleted) {
# Deleting a page usually requires
- # special priviledges. A common
+ # special privileges. A common
# convention is to replace the page
# with this content instead:
$file_content = DELETED_CONTENT;
diff --git a/contrib/mw-to-git/t/README b/contrib/mw-to-git/t/README
index 96e97390..03f6ee5d 100644
--- a/contrib/mw-to-git/t/README
+++ b/contrib/mw-to-git/t/README
@@ -25,7 +25,7 @@ Principles and Technical Choices
The test environment makes it easy to install and manipulate one or
several MediaWiki instances. To allow developers to run the testsuite
-easily, the environment does not require root priviledge (except to
+easily, the environment does not require root privilege (except to
install the required packages if needed). It starts a webserver
instance on the user's account (using lighttpd greatly helps for
that), and does not need a separate database daemon (thanks to the use
@@ -81,7 +81,7 @@ parameters, please refer to the `test-gitmw-lib.sh` and
** `test_check_wiki_precond`:
Check if the tests must be skipped or not. Please use this function
-at the beggining of each new test file.
+at the beginning of each new test file.
** `wiki_getpage`:
Fetch a given page from the wiki and puts its content in the
@@ -113,7 +113,7 @@ Tests if a given page exists on the wiki.
** `wiki_reset`:
Reset the wiki, i.e. flush the database. Use this function at the
-begining of each new test, except if the test re-uses the same wiki
+beginning of each new test, except if the test re-uses the same wiki
(and history) as the previous test.
How to write a new test
diff --git a/contrib/mw-to-git/t/install-wiki/LocalSettings.php
b/contrib/mw-to-git/t/install-wiki/LocalSettings.php
index 29f12511..745e47e8 100644
--- a/contrib/mw-to-git/t/install-wiki/LocalSettings.php
+++ b/contrib/mw-to-git/t/install-wiki/LocalSettings.php
@@ -88,7 +88,7 @@ $wgShellLocale = en_US.utf8;
## Set $wgCacheDirectory to a writable directory on the web server
## to make your wiki go slightly faster. The directory should not
-## be publically accessible from the web.
+## be publicly accessible from the web.
#$wgCacheDirectory = $IP/cache;
# Site language code, should be one of the list in ./languages/Names.php
diff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
index b6405ce2..37021e20 100755
--- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
+++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
@@ -139,7 +139,7 @@ test_expect_success 'character $ in file name (git - mw) '
'
'
-test_expect_failure 'capital at the begining of file names' '
+test_expect_failure 'capital at the beginning of file names' '
wiki_reset
git clone mediawiki::'$WIKI_URL' mw_dir_10
(
@@ -156,7 +156,7 @@ test_expect_failure 'capital at the begining of file names'
'
'
-test_expect_failure 'special character at the begining of file name from mw to
git' '