Skip to content

Commit 2582ab1

Browse files
slattarinigitster
authored andcommitted
git-remote-mediawiki: spelling fixes
Most of these were found using Lucas De Marchi's codespell tool. Others were pointed out by Eric Sunshine. Helped-by: Eric Sunshine <[email protected]> Signed-off-by: Stefano Lattarini <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Acked-by: Matthieu Moy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e1c3bf4 commit 2582ab1

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

contrib/mw-to-git/git-remote-mediawiki.perl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
use constant SLASH_REPLACEMENT => "%2F";
2929

3030
# It's not always possible to delete pages (may require some
31-
# priviledges). Deleted pages are replaced with this content.
31+
# privileges). Deleted pages are replaced with this content.
3232
use constant DELETED_CONTENT => "[[Category:Deleted]]\n";
3333

3434
# It's not possible to create empty pages. New empty files in Git are
@@ -841,7 +841,7 @@ sub mw_import_ref {
841841
if ($fetch_from == 1 && $n == 0) {
842842
print STDERR "You appear to have cloned an empty MediaWiki.\n";
843843
# Something has to be done remote-helper side. If nothing is done, an error is
844-
# thrown saying that HEAD is refering to unknown object 0000000000000000000
844+
# thrown saying that HEAD is referring to unknown object 0000000000000000000
845845
# and the clone fails.
846846
}
847847
}
@@ -1067,7 +1067,7 @@ sub mw_push_file {
10671067
my $file_content;
10681068
if ($page_deleted) {
10691069
# Deleting a page usually requires
1070-
# special priviledges. A common
1070+
# special privileges. A common
10711071
# convention is to replace the page
10721072
# with this content instead:
10731073
$file_content = DELETED_CONTENT;

contrib/mw-to-git/t/README

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Principles and Technical Choices
2525

2626
The test environment makes it easy to install and manipulate one or
2727
several MediaWiki instances. To allow developers to run the testsuite
28-
easily, the environment does not require root priviledge (except to
28+
easily, the environment does not require root privilege (except to
2929
install the required packages if needed). It starts a webserver
3030
instance on the user's account (using lighttpd greatly helps for
3131
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
8181

8282
** `test_check_wiki_precond`:
8383
Check if the tests must be skipped or not. Please use this function
84-
at the beggining of each new test file.
84+
at the beginning of each new test file.
8585

8686
** `wiki_getpage`:
8787
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.
113113

114114
** `wiki_reset`:
115115
Reset the wiki, i.e. flush the database. Use this function at the
116-
begining of each new test, except if the test re-uses the same wiki
116+
beginning of each new test, except if the test re-uses the same wiki
117117
(and history) as the previous test.
118118

119119
How to write a new test

contrib/mw-to-git/t/install-wiki/LocalSettings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888

8989
## Set $wgCacheDirectory to a writable directory on the web server
9090
## to make your wiki go slightly faster. The directory should not
91-
## be publically accessible from the web.
91+
## be publicly accessible from the web.
9292
#$wgCacheDirectory = "$IP/cache";
9393

9494
# Site language code, should be one of the list in ./languages/Names.php

contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ test_expect_success 'character $ in file name (git -> mw) ' '
139139
'
140140

141141

142-
test_expect_failure 'capital at the begining of file names' '
142+
test_expect_failure 'capital at the beginning of file names' '
143143
wiki_reset &&
144144
git clone mediawiki::'"$WIKI_URL"' mw_dir_10 &&
145145
(
@@ -156,7 +156,7 @@ test_expect_failure 'capital at the begining of file names' '
156156
'
157157

158158

159-
test_expect_failure 'special character at the begining of file name from mw to git' '
159+
test_expect_failure 'special character at the beginning of file name from mw to git' '
160160
wiki_reset &&
161161
git clone mediawiki::'"$WIKI_URL"' mw_dir_11 &&
162162
wiki_editpage {char_1 "expect to be renamed {char_1" false &&
@@ -189,7 +189,7 @@ test_expect_success 'Push page with title containing ":" other than namespace se
189189
wiki_page_exist NotANameSpace:Page
190190
'
191191

192-
test_expect_success 'test of correct formating for file name from mw to git' '
192+
test_expect_success 'test of correct formatting for file name from mw to git' '
193193
wiki_reset &&
194194
git clone mediawiki::'"$WIKI_URL"' mw_dir_12 &&
195195
wiki_editpage char_%_7b_1 "expect to be renamed char{_1" false &&
@@ -207,15 +207,15 @@ test_expect_success 'test of correct formating for file name from mw to git' '
207207
'
208208

209209

210-
test_expect_failure 'test of correct formating for file name begining with special character' '
210+
test_expect_failure 'test of correct formatting for file name beginning with special character' '
211211
wiki_reset &&
212212
git clone mediawiki::'"$WIKI_URL"' mw_dir_13 &&
213213
(
214214
cd mw_dir_13 &&
215215
echo "my new file {char_1" >\{char_1.mw &&
216216
echo "my new file [char_2" >\[char_2.mw &&
217217
git add . &&
218-
git commit -am "commiting some exotic file name..." &&
218+
git commit -am "committing some exotic file name..." &&
219219
git push &&
220220
git pull
221221
) &&
@@ -226,15 +226,15 @@ test_expect_failure 'test of correct formating for file name begining with speci
226226
'
227227

228228

229-
test_expect_success 'test of correct formating for file name from git to mw' '
229+
test_expect_success 'test of correct formatting for file name from git to mw' '
230230
wiki_reset &&
231231
git clone mediawiki::'"$WIKI_URL"' mw_dir_14 &&
232232
(
233233
cd mw_dir_14 &&
234234
echo "my new file char{_1" >Char\{_1.mw &&
235235
echo "my new file char[_2" >Char\[_2.mw &&
236236
git add . &&
237-
git commit -m "commiting some exotic file name..." &&
237+
git commit -m "committing some exotic file name..." &&
238238
git push
239239
) &&
240240
wiki_getallpage ref_page_14 &&

0 commit comments

Comments
 (0)