Typos in code comments, an error message, documentation

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes-1.5.6.3.txt b/Documentation/RelNotes-1.5.6.3.txt
index 942611299d59abd4bdd820e1258662067a304d62..f61dd3504afb9dc3fb7bb2d522e3adb573ef132f 100644 (file)
--- a/Documentation/RelNotes-1.5.6.3.txt
+++ b/Documentation/RelNotes-1.5.6.3.txt
@@ -4,7 +4,7 @@ GIT v1.5.6.3 Release Notes
 Fixes since v1.5.6.2
 --------------------
 
 Fixes since v1.5.6.2
 --------------------
 

-* Setting core.sharerepository to traditional "true" value was supposed to make
+* Setting core.sharedrepository to traditional "true" value was supposed to make

   the repository group writable but should not affect permission for others.
   However, since 1.5.6, it was broken to drop permission for others when umask is
   022, making the repository unreadable by others.
   the repository group writable but should not affect permission for others.
   However, since 1.5.6, it was broken to drop permission for others when umask is
   022, making the repository unreadable by others.

diff --git a/Documentation/RelNotes-1.6.0.2.txt b/Documentation/RelNotes-1.6.0.2.txt
index 51b32f5d94c050f6cb5eae0b94cedda187e00312..e1e24b3295d4079c1bf784d11a8d6ec1691ec819 100644 (file)
--- a/Documentation/RelNotes-1.6.0.2.txt
+++ b/Documentation/RelNotes-1.6.0.2.txt
@@ -17,7 +17,7 @@ Fixes since v1.6.0.1
 * Many commands did not use the correct working tree location when used
   with GIT_WORK_TREE environment settings.
 
 * Many commands did not use the correct working tree location when used
   with GIT_WORK_TREE environment settings.
 

-* Some systems needs to use compatibility fnmach and regex libraries
+* Some systems need to use compatibility fnmatch and regex libraries

   independent from each other; the compat/ area has been reorganized to
   allow this.
 
   independent from each other; the compat/ area has been reorganized to
   allow this.
 

diff --git a/Documentation/RelNotes-1.6.4.3.txt b/Documentation/RelNotes-1.6.4.3.txt
index 4f29babdeb03f9eddf73b7a6cb2a2e9b069baa4f..5643e6537de55ca961245cd1d7d01f46d9e9b855 100644 (file)
--- a/Documentation/RelNotes-1.6.4.3.txt
+++ b/Documentation/RelNotes-1.6.4.3.txt
@@ -11,7 +11,7 @@ Fixes since v1.6.4.2
   been deprecated.
 
 * "git fetch" and "git clone" had an extra sanity check to verify the
   been deprecated.
 
 * "git fetch" and "git clone" had an extra sanity check to verify the

-  presense of the corresponding *.pack file before downloading *.idx
+  presence of the corresponding *.pack file before downloading *.idx

   file by issuing a HEAD request.  Github server however sometimes
   gave 500 (Internal server error) response to HEAD even if a GET
   request for *.pack file to the same URL would have succeeded, and broke
   file by issuing a HEAD request.  Github server however sometimes
   gave 500 (Internal server error) response to HEAD even if a GET
   request for *.pack file to the same URL would have succeeded, and broke

diff --git a/Documentation/RelNotes-1.6.5.4.txt b/Documentation/RelNotes-1.6.5.4.txt
index e42f8b239706465c7d1daf64ae052a31fa8ffcc8..d3a2a3e71243dc4612050d28a8cc779f34ab51ae 100644 (file)
--- a/Documentation/RelNotes-1.6.5.4.txt
+++ b/Documentation/RelNotes-1.6.5.4.txt
@@ -26,7 +26,7 @@ Fixes since v1.6.5.3
    future versions, but not in this release,
 
  * "git merge -m <message> <branch>..." added the standard merge message
    future versions, but not in this release,
 
  * "git merge -m <message> <branch>..." added the standard merge message

-   on its own after user-supplied message, which should have overrided the
+   on its own after user-supplied message, which should have overridden the

    standard one.
 
 Other minor documentation updates are included.
    standard one.
 
 Other minor documentation updates are included.

diff --git a/Documentation/RelNotes-1.6.5.7.txt b/Documentation/RelNotes-1.6.5.7.txt
index 5b49ea53beb5592f97ccc68840d1b97616b18f23..dc5302c21cd2108a175235bc22efb0debac29670 100644 (file)
--- a/Documentation/RelNotes-1.6.5.7.txt
+++ b/Documentation/RelNotes-1.6.5.7.txt
@@ -10,7 +10,7 @@ Fixes since v1.6.5.6
   an older version of git should just ignore them.  Instead we diagnosed
   it as an error.
 
   an older version of git should just ignore them.  Instead we diagnosed
   it as an error.
 

-* With help.autocorrect set to non-zero value, the logic to guess typoes
+* With help.autocorrect set to non-zero value, the logic to guess typos

   in the subcommand name misfired and ran a random nonsense command.
 
 * If a command is run with an absolute path as a pathspec inside a bare
   in the subcommand name misfired and ran a random nonsense command.
 
 * If a command is run with an absolute path as a pathspec inside a bare

diff --git a/Documentation/RelNotes-1.6.6.txt b/Documentation/RelNotes-1.6.6.txt
index 04e205c457cd11cba91327ad1e8b2c023743ac74..c50b59c4957a5def22fa6b2fc55cc85f3d46d0bc 100644 (file)
--- a/Documentation/RelNotes-1.6.6.txt
+++ b/Documentation/RelNotes-1.6.6.txt
@@ -29,7 +29,7 @@ or adjust to the new behaviour, on the day their sysadmin decides to install
 the new version of git.  When we switched from "git-foo" to "git foo" in
 1.6.0, even though the change had been advertised and the transition
 guide had been provided for a very long time, the users procrastinated
 the new version of git.  When we switched from "git-foo" to "git foo" in
 1.6.0, even though the change had been advertised and the transition
 guide had been provided for a very long time, the users procrastinated

-during the entire transtion period, and ended up panicking on the day
+during the entire transition period, and ended up panicking on the day

 their sysadmins updated their git installation.  We are trying to avoid
 repeating that unpleasantness in the 1.7.0 release.
 
 their sysadmins updated their git installation.  We are trying to avoid
 repeating that unpleasantness in the 1.7.0 release.
 


@@ -94,7 +94,7 @@ users will fare this time.
  * "git diff" traditionally treated various "ignore whitespace" options
    only as a way to filter the patch output.  "git diff --exit-code -b"
    exited with non-zero status even if all changes were about changing the
  * "git diff" traditionally treated various "ignore whitespace" options
    only as a way to filter the patch output.  "git diff --exit-code -b"
    exited with non-zero status even if all changes were about changing the

-   ammount of whitespace and nothing else.  and "git diff -b" showed the
+   amount of whitespace and nothing else.  and "git diff -b" showed the

    "diff --git" header line for such a change without patch text.
 
    In 1.7.0, the "ignore whitespaces" will affect the semantics of the
    "diff --git" header line for such a change without patch text.
 
    In 1.7.0, the "ignore whitespaces" will affect the semantics of the

diff --git a/Documentation/RelNotes-1.7.0.txt b/Documentation/RelNotes-1.7.0.txt
index 43e3f336150e1869bdae01823471d7ab216584a8..0bb8c0b2a2a771ac95b5e5c1fc9b44eac5f2fe5d 100644 (file)
--- a/Documentation/RelNotes-1.7.0.txt
+++ b/Documentation/RelNotes-1.7.0.txt
@@ -202,7 +202,7 @@ release, unless otherwise noted.
    the branch is fully merged to its upstream branch if it is not merged
    to the current branch.  It now deletes it in such a case.
 
    the branch is fully merged to its upstream branch if it is not merged
    to the current branch.  It now deletes it in such a case.
 

- * "fiter-branch" command incorrectly said --prune-empty and --filter-commit
+ * "filter-branch" command incorrectly said --prune-empty and --filter-commit

    were incompatible; the latter should be read as --commit-filter.
 
  * When using "git status" or asking "git diff" to compare the work tree
    were incompatible; the latter should be read as --commit-filter.
 
  * When using "git status" or asking "git diff" to compare the work tree

diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt
index ff5c0bc27a416de16f106c15b9076082c6509e42..6fd711996a775d1da8ab2051db98896a601c8971 100644 (file)
--- a/Documentation/howto/revert-a-faulty-merge.txt
+++ b/Documentation/howto/revert-a-faulty-merge.txt
@@ -229,7 +229,7 @@ reverting W.  Mainline's history would look like this:
    A---B---C
 
 But if you don't actually need to change commit A, then you need some way to
    A---B---C
 
 But if you don't actually need to change commit A, then you need some way to

-recreate it as a new commit with the same changes in it.  The rebase commmand's
+recreate it as a new commit with the same changes in it.  The rebase command's

 --no-ff option provides a way to do this:
 
     $ git rebase [-i] --no-ff P
 --no-ff option provides a way to do this:
 
     $ git rebase [-i] --no-ff P

diff --git a/builtin/blame.c b/builtin/blame.c
index 01e62fdeb00b2d085efe96a07f2ee77776081a69..28e3be2eadadc71723da96334b8ff1dd22e73205 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2376,11 +2376,11 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
         *
         * The remaining are:
         *
         *
         * The remaining are:
         *

-        * (1) if dashdash_pos != 0, its either
+        * (1) if dashdash_pos != 0, it is either

         *     "blame [revisions] -- <path>" or
         *     "blame -- <path> <rev>"
         *
         *     "blame [revisions] -- <path>" or
         *     "blame -- <path> <rev>"
         *

-        * (2) otherwise, its one of the two:
+        * (2) otherwise, it is one of the two:

         *     "blame [revisions] <path>"
         *     "blame <path> <rev>"
         *
         *     "blame [revisions] <path>"
         *     "blame <path> <rev>"
         *

diff --git a/compat/mingw.c b/compat/mingw.c
index 9a8e3365827d303c6513475726113a3952fe0040..96be8a02cf2e48d9ff816638aec57987cc41c3af 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -641,7 +641,7 @@ static char *lookup_prog(const char *dir, const char *cmd, int isexe, int exe_on
 }
 
 /*
 }
 
 /*

- * Determines the absolute path of cmd using the the split path in path.
+ * Determines the absolute path of cmd using the split path in path.

  * If cmd contains a slash or backslash, no lookup is performed.
  */
 static char *path_lookup(const char *cmd, char **path, int exe_only)
  * If cmd contains a slash or backslash, no lookup is performed.
  */
 static char *path_lookup(const char *cmd, char **path, int exe_only)

diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index 74c42e31626480900898aba8e12704335330e11e..87260d26425dbb167f64710e71235f60e467a9b5 100644 (file)
--- a/compat/nedmalloc/malloc.c.h
+++ b/compat/nedmalloc/malloc.c.h
@@ -2069,7 +2069,7 @@ static void init_malloc_global_mutex() {
   Each freshly allocated chunk must have both cinuse and pinuse set.
   That is, each allocated chunk borders either a previously allocated
   and still in-use chunk, or the base of its memory arena. This is
   Each freshly allocated chunk must have both cinuse and pinuse set.
   That is, each allocated chunk borders either a previously allocated
   and still in-use chunk, or the base of its memory arena. This is

-  ensured by making all allocations from the the `lowest' part of any
+  ensured by making all allocations from the `lowest' part of any

   found chunk.  Further, no free chunk physically borders another one,
   so each free chunk is known to be preceded and followed by either
   inuse chunks or the ends of memory.
   found chunk.  Further, no free chunk physically borders another one,
   so each free chunk is known to be preceded and followed by either
   inuse chunks or the ends of memory.

diff --git a/compat/regex/regex.c b/compat/regex/regex.c
index 556d8ab11f40550335066f491d08383557e02a00..be851fc50267b10ae311dce042eec27c0f498461 100644 (file)
--- a/compat/regex/regex.c
+++ b/compat/regex/regex.c
@@ -3122,7 +3122,7 @@ re_match (bufp, string, size, pos, regs)
 
 
 /* re_match_2 matches the compiled pattern in BUFP against the
 
 
 /* re_match_2 matches the compiled pattern in BUFP against the

-   the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1
+   (virtual) concatenation of STRING1 and STRING2 (of length SIZE1

    and SIZE2, respectively).  We start matching at POS, and stop
    matching at STOP.
 
    and SIZE2, respectively).  We start matching at POS, and stop
    matching at STOP.
 

diff --git a/contrib/workdir/git-new-workdir b/contrib/workdir/git-new-workdir
index 993cacf324b8595e5be583ff372b25353c7af95c..3ad2c0cea56392fb941282ec6225c5f9a3ce05ea 100755 (executable)
--- a/contrib/workdir/git-new-workdir
+++ b/contrib/workdir/git-new-workdir
@@ -54,13 +54,13 @@ then
        die "destination directory '$new_workdir' already exists."
 fi
 
        die "destination directory '$new_workdir' already exists."
 fi
 

-# make sure the the links use full paths
+# make sure the links use full paths

 git_dir=$(cd "$git_dir"; pwd)
 
 # create the workdir
 mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
 
 git_dir=$(cd "$git_dir"; pwd)
 
 # create the workdir
 mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
 

-# create the links to the original repo.  explictly exclude index, HEAD and
+# create the links to the original repo.  explicitly exclude index, HEAD and

 # logs/HEAD from the list since they are purely related to the current working
 # directory, and should not be shared.
 for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn
 # logs/HEAD from the list since they are purely related to the current working
 # directory, and should not be shared.
 for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn

diff --git a/gitweb/README b/gitweb/README
index 0e19be8d216aa813221c8663d6424f96f80bfb14..d4811987965e5a5036b7ed71e32d93578579073a 100644 (file)
--- a/gitweb/README
+++ b/gitweb/README
@@ -95,7 +95,7 @@ You can specify the following configuration variables when building GIT:
    in the browser's URL bar and next to site name in bookmarks).  Relative
    to base URI of gitweb.  [Default: static/git-favicon.png]
  * GITWEB_JS
    in the browser's URL bar and next to site name in bookmarks).  Relative
    to base URI of gitweb.  [Default: static/git-favicon.png]
  * GITWEB_JS

-   Points to the localtion where you put gitweb.js on your web server
+   Points to the location where you put gitweb.js on your web server

    (or to be more generic URI of JavaScript code used by gitweb).
    Relative to base URI of gitweb.  [Default: static/gitweb.js (or
    static/gitweb.min.js if JSMIN build variable is defined / JavaScript
    (or to be more generic URI of JavaScript code used by gitweb).
    Relative to base URI of gitweb.  [Default: static/gitweb.js (or
    static/gitweb.min.js if JSMIN build variable is defined / JavaScript


@@ -233,7 +233,7 @@ not include variables usually directly set during build):
    is false.
  * $maxload
    Used to set the maximum load that we will still respond to gitweb queries.
    is false.
  * $maxload
    Used to set the maximum load that we will still respond to gitweb queries.

-   If server load exceed this value then return "503 Service Unavaliable" error.
+   If server load exceed this value then return "503 Service Unavailable" error.

    Server load is taken to be 0 if gitweb cannot determine its value.  Set it to
    undefined value to turn it off.  The default is 300.
 
    Server load is taken to be 0 if gitweb cannot determine its value.  Set it to
    undefined value to turn it off.  The default is 300.
 

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 6deec87e5d26b963902f80049ca0e34f76daa0bc..84261bba34dcdf436bb3b87ab88c67353ea4f4dd 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -245,7 +245,7 @@ sub evaluate_uri {
        # return value of feature-sub indicates if to enable specified feature
        #
        # if there is no 'sub' key (no feature-sub), then feature cannot be
        # return value of feature-sub indicates if to enable specified feature
        #
        # if there is no 'sub' key (no feature-sub), then feature cannot be

-       # overriden
+       # overridden

        #
        # use gitweb_get_feature(<feature>) to retrieve the <feature> value
        # (an array) or gitweb_check_feature(<feature>) to check if <feature>
        #
        # use gitweb_get_feature(<feature>) to retrieve the <feature> value
        # (an array) or gitweb_check_feature(<feature>) to check if <feature>


@@ -1323,7 +1323,7 @@ sub esc_param {
        return $str;
 }
 
        return $str;
 }
 

-# quote unsafe chars in whole URL, so some charactrs cannot be quoted
+# quote unsafe chars in whole URL, so some characters cannot be quoted

 sub esc_url {
        my $str = shift;
        return undef unless defined $str;
 sub esc_url {
        my $str = shift;
        return undef unless defined $str;


@@ -3782,9 +3782,9 @@ sub git_print_authorship {
 }
 
 # Outputs table rows containing the full author or committer information,
 }
 
 # Outputs table rows containing the full author or committer information,

-# in the format expected for 'commit' view (& similia).
+# in the format expected for 'commit' view (& similar).

 # Parameters are a commit hash reference, followed by the list of people
 # Parameters are a commit hash reference, followed by the list of people

-# to output information for. If the list is empty it defalts to both
+# to output information for. If the list is empty it defaults to both

 # author and committer.
 sub git_print_authorship_rows {
        my $co = shift;
 # author and committer.
 sub git_print_authorship_rows {
        my $co = shift;


@@ -4513,8 +4513,8 @@ sub git_patchset_body {
                print "</div>\n"; # class="patch"
        }
 
                print "</div>\n"; # class="patch"
        }
 

-       # for compact combined (--cc) format, with chunk and patch simpliciaction
-       # patchset might be empty, but there might be unprocessed raw lines
+       # for compact combined (--cc) format, with chunk and patch simplification
+       # the patchset might be empty, but there might be unprocessed raw lines

        for (++$patch_idx if $patch_number > 0;
             $patch_idx < @$difftree;
             ++$patch_idx) {
        for (++$patch_idx if $patch_number > 0;
             $patch_idx < @$difftree;
             ++$patch_idx) {

diff --git a/graph.c b/graph.c
index ac7c60540645761d3c99fb405a69cb2d06aaddc2..85ab150787bfcdd593ad13e7c00396a1c96c134d 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -439,7 +439,7 @@ static void graph_update_width(struct git_graph *graph,
                max_cols++;
 
        /*
                max_cols++;
 
        /*

-        * We added a column for the the current commit as part of
+        * We added a column for the current commit as part of

         * graph->num_parents.  If the current commit was already in
         * graph->columns, then we have double counted it.
         */
         * graph->num_parents.  If the current commit was already in
         * graph->columns, then we have double counted it.
         */

diff --git a/pack-check.c b/pack-check.c
index 395fb9527a3bc6dd8ca648233911a1c35604440d..9d0cb9a114cb3e5b0a4a4a132b9289ef18d8ae21 100644 (file)
--- a/pack-check.c
+++ b/pack-check.c
@@ -77,7 +77,7 @@ static int verify_packfile(struct packed_git *p,
                err = error("%s SHA1 checksum mismatch",
                            p->pack_name);
        if (hashcmp(index_base + index_size - 40, pack_sig))
                err = error("%s SHA1 checksum mismatch",
                            p->pack_name);
        if (hashcmp(index_base + index_size - 40, pack_sig))

-               err = error("%s SHA1 does not match its inddex",
+               err = error("%s SHA1 does not match its index",

                            p->pack_name);
        unuse_pack(w_curs);
 
                            p->pack_name);
        unuse_pack(w_curs);