Assorted typo fixes

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 8601949e80991823145a6d4c61cb5da918f98275..90722c21fad453791f53d1e8b62df23450622eae 100644 (file)
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -49,7 +49,7 @@ People on the git mailing list need to be able to read and
 comment on the changes you are submitting.  It is important for
 a developer to be able to "quote" your changes, using standard
 e-mail tools, so that they may comment on specific portions of
 comment on the changes you are submitting.  It is important for
 a developer to be able to "quote" your changes, using standard
 e-mail tools, so that they may comment on specific portions of

-your code.  For this reason, all patches should be submited
+your code.  For this reason, all patches should be submitted

 "inline".  WARNING: Be wary of your MUAs word-wrap
 corrupting your patch.  Do not cut-n-paste your patch; you can
 lose tabs that way if you are not careful.
 "inline".  WARNING: Be wary of your MUAs word-wrap
 corrupting your patch.  Do not cut-n-paste your patch; you can
 lose tabs that way if you are not careful.

diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt
index 1fbca83141e20599e4d6edd880b1cabbf0cd9913..d2b0bd38de7fb39ccff5687013784ea8ceb22f1c 100644 (file)
--- a/Documentation/cvs-migration.txt
+++ b/Documentation/cvs-migration.txt
@@ -93,7 +93,7 @@ machine where the repository is hosted.  If you don't want to give them a
 full shell on the machine, there is a restricted shell which only allows
 users to do git pushes and pulls; see gitlink:git-shell[1].
 
 full shell on the machine, there is a restricted shell which only allows
 users to do git pushes and pulls; see gitlink:git-shell[1].
 

-Put all the committers should in the same group, and make the repository
+Put all the committers in the same group, and make the repository

 writable by that group:
 
 ------------------------------------------------
 writable by that group:
 
 ------------------------------------------------

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 481b8b3aa09539ff71a3f48b0b50b75e9ccce7a7..7248b35d952c3fe97496895059af35300694eb98 100644 (file)
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -37,7 +37,7 @@ omit diff output for unmerged entries and just show "Unmerged".
        commit with these flags.
 
 -q::
        commit with these flags.
 
 -q::

-       Remain silent even on nonexisting files
+       Remain silent even on nonexistent files

 
 Output format
 -------------
 
 Output format
 -------------

diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt
index 8a150d861f5b4c3dc468d46fa09dbfce5be020fc..0a4fc14b97fe690f9546c5d6734dfaaa9d0d656f 100644 (file)
--- a/Documentation/git-init-db.txt
+++ b/Documentation/git-init-db.txt
@@ -25,7 +25,7 @@ DESCRIPTION
 -----------
 This command creates an empty git repository - basically a `.git` directory
 with subdirectories for `objects`, `refs/heads`, `refs/tags`, and
 -----------
 This command creates an empty git repository - basically a `.git` directory
 with subdirectories for `objects`, `refs/heads`, `refs/tags`, and

-templated files.
+template files.

 An initial `HEAD` file that references the HEAD of the master branch
 is also created.
 
 An initial `HEAD` file that references the HEAD of the master branch
 is also created.
 

diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt
index 209e36bacb03c166e1c0c61e8c6e14447cd44f6a..5a17801f6a8d4d307f55e62745a400ad498ebdb9 100644 (file)
--- a/Documentation/git-mailsplit.txt
+++ b/Documentation/git-mailsplit.txt
@@ -25,7 +25,7 @@ OPTIONS
 
 -b::
        If any file doesn't begin with a From line, assume it is a
 
 -b::
        If any file doesn't begin with a From line, assume it is a

-       single mail message instead of signalling error.
+       single mail message instead of signaling error.

 
 -d<prec>::
        Instead of the default 4 digits with leading zeros,
 
 -d<prec>::
        Instead of the default 4 digits with leading zeros,

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 4ce799b520b501b1ea6dddd5643bf3aec2aca344..bebf30ad3db951c0a0bad01ebee619821781eb39 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -83,7 +83,7 @@ your local modifications interfere with the merge, again, it
 stops before touching anything.
 
 So in the above two "failed merge" case, you do not have to
 stops before touching anything.
 
 So in the above two "failed merge" case, you do not have to

-worry about lossage of data --- you simply were not ready to do
+worry about loss of data --- you simply were not ready to do

 a merge, so no merge happened at all.  You may want to finish
 whatever you were in the middle of doing, and retry the same
 pull after you are done and ready.
 a merge, so no merge happened at all.  You may want to finish
 whatever you were in the middle of doing, and retry the same
 pull after you are done and ready.

diff --git a/Documentation/git-p4import.txt b/Documentation/git-p4import.txt
index 0858e5efbe01a8e47ddcfa9b1c7e1c6169f9b7e1..ee9e8fa9090f88d1eb45ddbdb73866e0dc1fd53d 100644 (file)
--- a/Documentation/git-p4import.txt
+++ b/Documentation/git-p4import.txt
@@ -128,7 +128,7 @@ Tags
 A git tag of the form p4/xx is created for every change imported from
 the Perforce repository where xx is the Perforce changeset number.
 Therefore after the import you can use git to access any commit by its
 A git tag of the form p4/xx is created for every change imported from
 the Perforce repository where xx is the Perforce changeset number.
 Therefore after the import you can use git to access any commit by its

-Perforce number, eg. git show p4/327.
+Perforce number, e.g. git show p4/327.

 
 The tag associated with the HEAD commit is also how `git-p4import`
 determines if there are new changes to incrementally import from the
 
 The tag associated with the HEAD commit is also how `git-p4import`
 determines if there are new changes to incrementally import from the


@@ -143,7 +143,7 @@ may delete the tags.
 
 Notes
 -----
 
 Notes
 -----

-You can interrupt the import (eg. ctrl-c) at any time and restart it
+You can interrupt the import (e.g. ctrl-c) at any time and restart it

 without worry.
 
 Author information is automatically determined by querying the
 without worry.
 
 Author information is automatically determined by querying the

diff --git a/Documentation/git-pack-redundant.txt b/Documentation/git-pack-redundant.txt
index 8fb065943862e55c6cc0b3c7408506d06ad510f4..7d54b17e37b1065444b9ce100013e4a505af218d 100644 (file)
--- a/Documentation/git-pack-redundant.txt
+++ b/Documentation/git-pack-redundant.txt
@@ -29,7 +29,7 @@ OPTIONS
 
 
 --all::
 
 
 --all::

-       Processes all packs. Any filenames on the commandline are ignored.
+       Processes all packs. Any filenames on the command line are ignored.

 
 --alt-odb::
        Don't require objects present in packs from alternate object
 
 --alt-odb::
        Don't require objects present in packs from alternate object

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index d5b5ca167ccf3fcfaeb818a305ca79b37dcd7bf8..56afd64f42784457d73463ab9bea196264a3296b 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -67,7 +67,7 @@ Some short-cut notations are also supported.
 
 -f, \--force::
        Usually, the command refuses to update a remote ref that is
 
 -f, \--force::
        Usually, the command refuses to update a remote ref that is

-       not a descendent of the local ref used to overwrite it.
+       not a descendant of the local ref used to overwrite it.

        This flag disables the check.  This can cause the
        remote repository to lose commits; use it with care.
 
        This flag disables the check.  This can cause the
        remote repository to lose commits; use it with care.
 

diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index 803c0d5cae6db0a953380adc6ee3980a0afa72e0..b03d66f61ca4b234e721d671cc2521182a8e12b1 100644 (file)
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/git-repo-config.txt
@@ -119,8 +119,8 @@ you can set the filemode to true with
 % git repo-config core.filemode true
 ------------
 
 % git repo-config core.filemode true
 ------------
 

-The hypothetic proxy command entries actually have a postfix to discern
-to what URL they apply. Here is how to change the entry for kernel.org
+The hypothetical proxy command entries actually have a postfix to discern
+what URL they apply to. Here is how to change the entry for kernel.org

 to "ssh".
 
 ------------
 to "ssh".
 
 ------------

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 6c370e1bef9a83cd756146f6a3739abb4d08b4ed..e220842981627d659a0a9b91a0778b0ef469c2af 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -64,7 +64,7 @@ OPTIONS
 
 --objects-edge::
        Similar to `--objects`, but also print the IDs of
 
 --objects-edge::
        Similar to `--objects`, but also print the IDs of

-       excluded commits refixed with a `-` character.  This is
+       excluded commits prefixed with a `-` character.  This is

        used by `git-pack-objects` to build 'thin' pack, which
        records objects in deltified form based on objects
        contained in these excluded commits to reduce network
        used by `git-pack-objects` to build 'thin' pack, which
        records objects in deltified form based on objects
        contained in these excluded commits to reduce network

diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt
index d79523f56d063aa4a3ee3181fa224694c7970613..0914cbb0ba528653aa50c6a2eb27815bd69d3508 100644 (file)
--- a/Documentation/git-tools.txt
+++ b/Documentation/git-tools.txt
@@ -42,7 +42,7 @@ History Viewers
 
    - *gitk* (shipped with git-core)
 
 
    - *gitk* (shipped with git-core)
 

-   gitk is a simple TK GUI for browsing history of GIT repositories easily.
+   gitk is a simple Tk GUI for browsing history of GIT repositories easily.

 
 
    - *gitview*  (contrib/)
 
 
    - *gitview*  (contrib/)

diff --git a/Documentation/git-upload-tar.txt b/Documentation/git-upload-tar.txt
index a1019a0231fdc36ca5f70b712415114b6cfa6bdb..394af62015590551f313378edcc0d03bfa13802c 100644 (file)
--- a/Documentation/git-upload-tar.txt
+++ b/Documentation/git-upload-tar.txt
@@ -17,7 +17,7 @@ to the other end over the git protocol.
 
 This command is usually not invoked directly by the end user.
 The UI for the protocol is on the 'git-tar-tree' side, and the
 
 This command is usually not invoked directly by the end user.
 The UI for the protocol is on the 'git-tar-tree' side, and the

-program pair is meant to be used to get a tar achive from a
+program pair is meant to be used to get a tar archive from a

 remote repository.
 
 
 remote repository.
 
 

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 51f20c6e67acb8c7eb526fac544992eaec321623..d00cc3ea5219f73aac79709e683e135548555fd3 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -478,7 +478,7 @@ Configuration Mechanism
 
 Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
 is used to hold per-repository configuration options.  It is a
 
 Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
 is used to hold per-repository configuration options.  It is a

-simple text file modelled after `.ini` format familiar to some
+simple text file modeled after `.ini` format familiar to some

 people.  Here is an example:
 
 ------------
 people.  Here is an example:
 
 ------------

diff --git a/Documentation/howto/isolate-bugs-with-bisect.txt b/Documentation/howto/isolate-bugs-with-bisect.txt
index edbcd4c6618d6f9c123c49d4835dfc59b74e07f5..926bbdc3cb1dcab81e0d90de3a0b9b87153e55e6 100644 (file)
--- a/Documentation/howto/isolate-bugs-with-bisect.txt
+++ b/Documentation/howto/isolate-bugs-with-bisect.txt
@@ -28,7 +28,7 @@ Then do
 
 and at this point "git bisect" will churn for a while, and tell you what 
 the mid-point between those two commits are, and check that state out as 
 
 and at this point "git bisect" will churn for a while, and tell you what 
 the mid-point between those two commits are, and check that state out as 

-the head of the bew "bisect" branch.
+the head of the new "bisect" branch.

 
 Compile and reboot.
 
 
 Compile and reboot.
 

diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index c2d4a91c7cf0a631ffd3caadea8a6aa25aa4a24c..fcd64e9b9b6d53b46d31e0c797016e9881651604 100644 (file)
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -124,7 +124,7 @@ up your changes, along with other changes.
 
 The two commits #2' and #3' in the above picture record the same
 changes your e-mail submission for #2 and #3 contained, but
 
 The two commits #2' and #3' in the above picture record the same
 changes your e-mail submission for #2 and #3 contained, but

-probably with the new sign-off line added by the upsteam
+probably with the new sign-off line added by the upstream

 maintainer and definitely with different committer and ancestry
 information, they are different objects from #2 and #3 commits.
 
 maintainer and definitely with different committer and ancestry
 information, they are different objects from #2 and #3 commits.
 

diff --git a/Documentation/technical/pack-heuristics.txt b/Documentation/technical/pack-heuristics.txt
index 9aadd5cee5204b1f11e8ac0511609bc86ab5de81..103eb5d989349c8e7e0147920b2e218caba9daf9 100644 (file)
--- a/Documentation/technical/pack-heuristics.txt
+++ b/Documentation/technical/pack-heuristics.txt
@@ -73,7 +73,7 @@ The traditional insight:
 
     <pasky> yes
 
 
     <pasky> yes
 

-And Bable-like confusion flowed.
+And Babel-like confusion flowed.

 
     <njs`> oh, hmm, and I'm not sure what this sliding window means either
 
 
     <njs`> oh, hmm, and I'm not sure what this sliding window means either
 


@@ -257,7 +257,7 @@ proclaim it a non-issue.  Good style too!
         (type, basename, size)).
 
         Then we walk through this list, and calculate a delta of
         (type, basename, size)).
 
         Then we walk through this list, and calculate a delta of

-        each object against the last n (tunable paramater) objects,
+        each object against the last n (tunable parameter) objects,

         and pick the smallest of these deltas.
 
 Vastly simplified, but the essence is there!
         and pick the smallest of these deltas.
 
 Vastly simplified, but the essence is there!


@@ -395,7 +395,7 @@ used as setup for a later optimization, which is a real word:
         do "object name->location in packfile" translation.
 
     <njs`> I'm assuming the real win for delta-ing large->small is
         do "object name->location in packfile" translation.
 
     <njs`> I'm assuming the real win for delta-ing large->small is

-        more homogenous statistics for gzip to run over?
+        more homogeneous statistics for gzip to run over?

 
         (You have to put the bytes in one place or another, but
         putting them in a larger blob wins on compression)
 
         (You have to put the bytes in one place or another, but
         putting them in a larger blob wins on compression)


@@ -448,7 +448,7 @@ design options, etc.
 
         Bugs happen, but they are "simple" bugs. And bugs that
         actually get some object store detail wrong are almost always
 
         Bugs happen, but they are "simple" bugs. And bugs that
         actually get some object store detail wrong are almost always

-        so obious that they never go anywhere.
+        so obvious that they never go anywhere.

 
     <njs`> Yeah.
 
 
     <njs`> Yeah.
 

diff --git a/INSTALL b/INSTALL
index f8337e2a4d154157ed805eeb10f52d01513f7adb..7da2c8982978e9ff069eb1cc2338330a45669100 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -44,7 +44,7 @@ Issues of note:
 
        - "libcurl" and "curl" executable.  git-http-fetch and
          git-fetch use them.  If you do not use http
 
        - "libcurl" and "curl" executable.  git-http-fetch and
          git-fetch use them.  If you do not use http

-         transfer, you are probabaly OK if you do not have
+         transfer, you are probably OK if you do not have

          them.
 
        - expat library; git-http-push uses it for remote lock
          them.
 
        - expat library; git-http-push uses it for remote lock


@@ -69,7 +69,7 @@ Issues of note:
          git, and if you only use git to track other peoples work you'll
          never notice the lack of it. 
 
          git, and if you only use git to track other peoples work you'll
          never notice the lack of it. 
 

-        - "wish", the TCL/Tk windowing shell is used in gitk to show the
+        - "wish", the Tcl/Tk windowing shell is used in gitk to show the

           history graphically
 
        - "ssh" is used to push and pull over the net
           history graphically
 
        - "ssh" is used to push and pull over the net

diff --git a/Makefile b/Makefile
index 588d9255d3288d07089b284ef6467cd57449bce8..13f7c898e489db4b4ca2146d860a27049a831a53 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ all:
 # Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
 # a missing newline at the end of the file.
 #
 # Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
 # a missing newline at the end of the file.
 #

-# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
+# Define NO_PYTHON if you want to lose all benefits of the recursive merge.

 #
 # Define COLLISION_CHECK below if you believe that SHA1's
 # 1461501637330902918203684832716283019655932542976 hashes do not give you
 #
 # Define COLLISION_CHECK below if you believe that SHA1's
 # 1461501637330902918203684832716283019655932542976 hashes do not give you


@@ -469,7 +469,7 @@ ifdef NO_ACCURATE_DIFF
        ALL_CFLAGS += -DNO_ACCURATE_DIFF
 endif
 
        ALL_CFLAGS += -DNO_ACCURATE_DIFF
 endif
 

-# Shell quote (do not use $(call) to accomodate ancient setups);
+# Shell quote (do not use $(call) to accommodate ancient setups);

 
 SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
 
 
 SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
 

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 5ccca4f99f31b9fa370baaf7e85795ed2bf49f13..c30ef7042751034c5efbc4c2752e5badc69d4f4e 100755 (executable)
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -779,7 +779,7 @@ sub req_update
 
     #$log->debug("update state : " . Dumper($state));
 
 
     #$log->debug("update state : " . Dumper($state));
 

-    # foreach file specified on the commandline ...
+    # foreach file specified on the command line ...

     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);
     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);


@@ -1031,7 +1031,7 @@ sub req_ci
 
     my @committedfiles = ();
 
 
     my @committedfiles = ();
 

-    # foreach file specified on the commandline ...
+    # foreach file specified on the command line ...

     foreach my $filename ( @{$state->{args}} )
     {
         my $committedfile = $filename;
     foreach my $filename ( @{$state->{args}} )
     {
         my $committedfile = $filename;


@@ -1145,7 +1145,7 @@ sub req_ci
 
     $updater->update();
 
 
     $updater->update();
 

-    # foreach file specified on the commandline ...
+    # foreach file specified on the command line ...

     foreach my $filename ( @committedfiles )
     {
         $filename = filecleanup($filename);
     foreach my $filename ( @committedfiles )
     {
         $filename = filecleanup($filename);


@@ -1190,7 +1190,7 @@ sub req_status
     # if no files were specified, we need to work out what files we should be providing status on ...
     argsfromdir($updater);
 
     # if no files were specified, we need to work out what files we should be providing status on ...
     argsfromdir($updater);
 

-    # foreach file specified on the commandline ...
+    # foreach file specified on the command line ...

     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);
     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);


@@ -1291,7 +1291,7 @@ sub req_diff
     # if no files were specified, we need to work out what files we should be providing status on ...
     argsfromdir($updater);
 
     # if no files were specified, we need to work out what files we should be providing status on ...
     argsfromdir($updater);
 

-    # foreach file specified on the commandline ...
+    # foreach file specified on the command line ...

     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);
     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);


@@ -1433,7 +1433,7 @@ sub req_log
     # if no files were specified, we need to work out what files we should be providing status on ...
     argsfromdir($updater);
 
     # if no files were specified, we need to work out what files we should be providing status on ...
     argsfromdir($updater);
 

-    # foreach file specified on the commandline ...
+    # foreach file specified on the command line ...

     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);
     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);


@@ -1519,7 +1519,7 @@ sub req_annotate
 
     chdir $tmpdir;
 
 
     chdir $tmpdir;
 

-    # foreach file specified on the commandline ...
+    # foreach file specified on the command line ...

     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);
     foreach my $filename ( @{$state->{args}} )
     {
         $filename = filecleanup($filename);

diff --git a/server-info.c b/server-info.c
index 0eb5132cc1cf09ea7dacdf659d3c03adae761acf..fdfe05a2daeeb9253b6fb6a15518aba967821cb2 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -94,7 +94,7 @@ static int read_pack_info_file(const char *infofile)
 
        fp = fopen(infofile, "r");
        if (!fp)
 
        fp = fopen(infofile, "r");
        if (!fp)

-               return 1; /* nonexisting is not an error. */
+               return 1; /* nonexistent is not an error. */

 
        while (fgets(line, sizeof(line), fp)) {
                int len = strlen(line);
 
        while (fgets(line, sizeof(line), fp)) {
                int len = strlen(line);