contrib: typofixes

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
index 4c99dfb9038ca034d86b72cbe342373d12ae8cc6..4e23c650fe6341737fa8fb36070ce7999ba1f54b 100755 (executable)
--- a/contrib/gitview/gitview
+++ b/contrib/gitview/gitview
@@ -1205,7 +1205,7 @@ class GitView(object):
 
                #The first parent always continue on the same line
                try:
 
                #The first parent always continue on the same line
                try:

-                       # check we alreay have the value
+                       # check we already have the value

                        tmp_node_pos = self.nodepos[commit.parent_sha1[0]]
                except KeyError:
                        self.colours[commit.parent_sha1[0]] = colour
                        tmp_node_pos = self.nodepos[commit.parent_sha1[0]]
                except KeyError:
                        self.colours[commit.parent_sha1[0]] = colour

diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index 476e0a2bc02d0708e01c63f6e0fc524a840d4c77..3f8d993afaca53024aa75b4118da9ee80e6a6313 100755 (executable)
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -1315,7 +1315,7 @@ sub get_mw_namespace_id {
        # Store "notANameSpace" as special value for inexisting namespaces
        my $store_id = ($id || 'notANameSpace');
 
        # Store "notANameSpace" as special value for inexisting namespaces
        my $store_id = ($id || 'notANameSpace');
 

-       # Store explicitely requested namespaces on disk
+       # Store explicitly requested namespaces on disk

        if (!exists $cached_mw_namespace_id{$name}) {
                run_git(qq(config --add remote.${remotename}.namespaceCache "${name}:${store_id}"));
                $cached_mw_namespace_id{$name} = 1;
        if (!exists $cached_mw_namespace_id{$name}) {
                run_git(qq(config --add remote.${remotename}.namespaceCache "${name}:${store_id}"));
                $cached_mw_namespace_id{$name} = 1;

diff --git a/contrib/mw-to-git/t/test-gitmw-lib.sh b/contrib/mw-to-git/t/test-gitmw-lib.sh
index ca6860ff301163201a484f4e5ca1348410304719..3372b2af346ac23a73a7723ac6d0c81fb8c5e705 100755 (executable)
--- a/contrib/mw-to-git/t/test-gitmw-lib.sh
+++ b/contrib/mw-to-git/t/test-gitmw-lib.sh
@@ -91,7 +91,7 @@ test_diff_directories () {
 # Check that <dir> contains exactly <N> files
 test_contains_N_files () {
        if test `ls -- "$1" | wc -l` -ne "$2"; then
 # Check that <dir> contains exactly <N> files
 test_contains_N_files () {
        if test `ls -- "$1" | wc -l` -ne "$2"; then

-               echo "directory $1 sould contain $2 files"
+               echo "directory $1 should contain $2 files"

                echo "it contains these files:"
                ls "$1"
                false
                echo "it contains these files:"
                ls "$1"
                false

diff --git a/contrib/mw-to-git/t/test.config b/contrib/mw-to-git/t/test.config
index 4cfebe9c69bda210ba8de6882a3ed269415de559..5ba0684162474091e419d201dfcf73abdacbc842 100644 (file)
--- a/contrib/mw-to-git/t/test.config
+++ b/contrib/mw-to-git/t/test.config
@@ -12,7 +12,7 @@ SERVER_ADDR=localhost
 TMP=/tmp
 DB_FILE=wikidb.sqlite
 
 TMP=/tmp
 DB_FILE=wikidb.sqlite
 

-# If LIGHTTPD is not set to true, the script will use the defaut
+# If LIGHTTPD is not set to true, the script will use the default

 # web server running in WIKI_DIR_INST.
 WIKI_DIR_INST=/var/www
 
 # web server running in WIKI_DIR_INST.
 WIKI_DIR_INST=/var/www