{"thread":{"id":"4815","subject":"[PATCH] Assorted typo fixes","startedAt":"2006-07-09T07:36:03Z","lastAt":"2006-07-09T07:45:22Z","messageCount":2,"participants":["Pavel Roskin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"23457","messageId":"1152430563.6603.5.camel@dv","threadId":"4815","inReplyTo":null,"subject":"[PATCH] Assorted typo fixes","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-07-09T07:36:03Z","receivedAt":"2006-07-09T07:36:03Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Assorted typo fixes\n\nSigned-off-by: Pavel Roskin <proski@gnu.org>\n\n---\nThis is for \"next\".  \"interopability\" didn't make it to \"master\" yet.\n\n\n Documentation/SubmittingPatches                    |    2 +-\n Documentation/cvs-migration.txt                    |    2 +-\n Documentation/git-diff-files.txt                   |    2 +-\n Documentation/git-init-db.txt                      |    2 +-\n Documentation/git-mailsplit.txt                    |    2 +-\n Documentation/git-merge.txt                        |    2 +-\n Documentation/git-p4import.txt                     |    4 ++--\n Documentation/git-pack-redundant.txt               |    2 +-\n Documentation/git-push.txt                         |    2 +-\n Documentation/git-repo-config.txt                  |    4 ++--\n Documentation/git-rev-list.txt                     |    2 +-\n Documentation/git-tools.txt                        |    2 +-\n Documentation/git-upload-tar.txt                   |    2 +-\n Documentation/git.txt                              |    2 +-\n Documentation/howto/isolate-bugs-with-bisect.txt   |    2 +-\n .../howto/rebase-from-internal-branch.txt          |    2 +-\n Documentation/technical/pack-heuristics.txt        |    8 ++++----\n INSTALL                                            |    4 ++--\n Makefile                                           |    6 +++---\n git-cvsserver.perl                                 |   14\n+++++++-------\n server-info.c                                      |    2 +-\n 21 files changed, 35 insertions(+), 35 deletions(-)\n\ndiff --git a/Documentation/SubmittingPatches\nb/Documentation/SubmittingPatches\nindex 8601949..90722c2 100644\n--- a/Documentation/SubmittingPatches\n+++ b/Documentation/SubmittingPatches\n@@ -49,7 +49,7 @@ People on the git mailing list need to b\n comment on the changes you are submitting.  It is important for\n a developer to be able to \"quote\" your changes, using standard\n e-mail tools, so that they may comment on specific portions of\n-your code.  For this reason, all patches should be submited\n+your code.  For this reason, all patches should be submitted\n \"inline\".  WARNING: Be wary of your MUAs word-wrap\n corrupting your patch.  Do not cut-n-paste your patch; you can\n lose tabs that way if you are not careful.\ndiff --git a/Documentation/cvs-migration.txt\nb/Documentation/cvs-migration.txt\nindex 1fbca83..d2b0bd3 100644\n--- a/Documentation/cvs-migration.txt\n+++ b/Documentation/cvs-migration.txt\n@@ -93,7 +93,7 @@ machine where the repository is hosted. \n full shell on the machine, there is a restricted shell which only\nallows\n users to do git pushes and pulls; see gitlink:git-shell[1].\n \n-Put all the committers should in the same group, and make the\nrepository\n+Put all the committers in the same group, and make the repository\n writable by that group:\n \n ------------------------------------------------\ndiff --git a/Documentation/git-diff-files.txt\nb/Documentation/git-diff-files.txt\nindex 481b8b3..7248b35 100644\n--- a/Documentation/git-diff-files.txt\n+++ b/Documentation/git-diff-files.txt\n@@ -37,7 +37,7 @@ omit diff output for unmerged entries an\n \tcommit with these flags.\n \n -q::\n-\tRemain silent even on nonexisting files\n+\tRemain silent even on nonexistent files\n \n Output format\n -------------\ndiff --git a/Documentation/git-init-db.txt\nb/Documentation/git-init-db.txt\nindex 8a150d8..0a4fc14 100644\n--- a/Documentation/git-init-db.txt\n+++ b/Documentation/git-init-db.txt\n@@ -25,7 +25,7 @@ DESCRIPTION\n -----------\n This command creates an empty git repository - basically a `.git`\ndirectory\n with subdirectories for `objects`, `refs/heads`, `refs/tags`, and\n-templated files.\n+template files.\n An initial `HEAD` file that references the HEAD of the master branch\n is also created.\n \ndiff --git a/Documentation/git-mailsplit.txt\nb/Documentation/git-mailsplit.txt\nindex 209e36b..5a17801 100644\n--- a/Documentation/git-mailsplit.txt\n+++ b/Documentation/git-mailsplit.txt\n@@ -25,7 +25,7 @@ OPTIONS\n \n -b::\n \tIf any file doesn't begin with a From line, assume it is a\n-\tsingle mail message instead of signalling error.\n+\tsingle mail message instead of signaling error.\n \n -d<prec>::\n \tInstead of the default 4 digits with leading zeros,\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 4ce799b..bebf30a 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -83,7 +83,7 @@ your local modifications interfere with \n stops before touching anything.\n \n So in the above two \"failed merge\" case, you do not have to\n-worry about lossage of data --- you simply were not ready to do\n+worry about loss of data --- you simply were not ready to do\n a merge, so no merge happened at all.  You may want to finish\n whatever you were in the middle of doing, and retry the same\n pull after you are done and ready.\ndiff --git a/Documentation/git-p4import.txt\nb/Documentation/git-p4import.txt\nindex 0858e5e..ee9e8fa 100644\n--- a/Documentation/git-p4import.txt\n+++ b/Documentation/git-p4import.txt\n@@ -128,7 +128,7 @@ Tags\n A git tag of the form p4/xx is created for every change imported from\n the Perforce repository where xx is the Perforce changeset number.\n Therefore after the import you can use git to access any commit by its\n-Perforce number, eg. git show p4/327.\n+Perforce number, e.g. git show p4/327.\n \n The tag associated with the HEAD commit is also how `git-p4import`\n determines if there are new changes to incrementally import from the\n@@ -143,7 +143,7 @@ may delete the tags.\n \n Notes\n -----\n-You can interrupt the import (eg. ctrl-c) at any time and restart it\n+You can interrupt the import (e.g. ctrl-c) at any time and restart it\n without worry.\n \n Author information is automatically determined by querying the\ndiff --git a/Documentation/git-pack-redundant.txt\nb/Documentation/git-pack-redundant.txt\nindex 8fb0659..7d54b17 100644\n--- a/Documentation/git-pack-redundant.txt\n+++ b/Documentation/git-pack-redundant.txt\n@@ -29,7 +29,7 @@ OPTIONS\n \n \n --all::\n-\tProcesses all packs. Any filenames on the commandline are ignored.\n+\tProcesses all packs. Any filenames on the command line are ignored.\n \n --alt-odb::\n \tDon't require objects present in packs from alternate object\ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex d5b5ca1..56afd64 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -67,7 +67,7 @@ Some short-cut notations are also suppor\n \n -f, \\--force::\n \tUsually, the command refuses to update a remote ref that is\n-\tnot a descendent of the local ref used to overwrite it.\n+\tnot a descendant of the local ref used to overwrite it.\n \tThis flag disables the check.  This can cause the\n \tremote repository to lose commits; use it with care.\n \ndiff --git a/Documentation/git-repo-config.txt\nb/Documentation/git-repo-config.txt\nindex cc72fa9..8a1ab61 100644\n--- a/Documentation/git-repo-config.txt\n+++ b/Documentation/git-repo-config.txt\n@@ -120,8 +120,8 @@ you can set the filemode to true with\n % git repo-config core.filemode true\n ------------\n \n-The hypothetic proxy command entries actually have a postfix to discern\n-to what URL they apply. Here is how to change the entry for kernel.org\n+The hypothetical proxy command entries actually have a postfix to\ndiscern\n+what URL they apply to. Here is how to change the entry for kernel.org\n to \"ssh\".\n \n ------------\ndiff --git a/Documentation/git-rev-list.txt\nb/Documentation/git-rev-list.txt\nindex 6c370e1..e220842 100644\n--- a/Documentation/git-rev-list.txt\n+++ b/Documentation/git-rev-list.txt\n@@ -64,7 +64,7 @@ OPTIONS\n \n --objects-edge::\n \tSimilar to `--objects`, but also print the IDs of\n-\texcluded commits refixed with a `-` character.  This is\n+\texcluded commits prefixed with a `-` character.  This is\n \tused by `git-pack-objects` to build 'thin' pack, which\n \trecords objects in deltified form based on objects\n \tcontained in these excluded commits to reduce network\ndiff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt\nindex d79523f..0914cbb 100644\n--- a/Documentation/git-tools.txt\n+++ b/Documentation/git-tools.txt\n@@ -42,7 +42,7 @@ History Viewers\n \n    - *gitk* (shipped with git-core)\n \n-   gitk is a simple TK GUI for browsing history of GIT repositories\neasily.\n+   gitk is a simple Tk GUI for browsing history of GIT repositories\neasily.\n \n \n    - *gitview*  (contrib/)\ndiff --git a/Documentation/git-upload-tar.txt\nb/Documentation/git-upload-tar.txt\nindex a1019a0..394af62 100644\n--- a/Documentation/git-upload-tar.txt\n+++ b/Documentation/git-upload-tar.txt\n@@ -17,7 +17,7 @@ to the other end over the git protocol.\n \n This command is usually not invoked directly by the end user.\n The UI for the protocol is on the 'git-tar-tree' side, and the\n-program pair is meant to be used to get a tar achive from a\n+program pair is meant to be used to get a tar archive from a\n remote repository.\n \n \ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 51f20c6..d00cc3e 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -478,7 +478,7 @@ Configuration Mechanism\n \n Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file\n is used to hold per-repository configuration options.  It is a\n-simple text file modelled after `.ini` format familiar to some\n+simple text file modeled after `.ini` format familiar to some\n people.  Here is an example:\n \n ------------\ndiff --git a/Documentation/howto/isolate-bugs-with-bisect.txt\nb/Documentation/howto/isolate-bugs-with-bisect.txt\nindex edbcd4c..926bbdc 100644\n--- a/Documentation/howto/isolate-bugs-with-bisect.txt\n+++ b/Documentation/howto/isolate-bugs-with-bisect.txt\n@@ -28,7 +28,7 @@ Then do\n \n and at this point \"git bisect\" will churn for a while, and tell you\nwhat \n the mid-point between those two commits are, and check that state out\nas \n-the head of the bew \"bisect\" branch.\n+the head of the new \"bisect\" branch.\n \n Compile and reboot.\n \ndiff --git a/Documentation/howto/rebase-from-internal-branch.txt\nb/Documentation/howto/rebase-from-internal-branch.txt\nindex c2d4a91..fcd64e9 100644\n--- a/Documentation/howto/rebase-from-internal-branch.txt\n+++ b/Documentation/howto/rebase-from-internal-branch.txt\n@@ -124,7 +124,7 @@ up your changes, along with other change\n \n The two commits #2' and #3' in the above picture record the same\n changes your e-mail submission for #2 and #3 contained, but\n-probably with the new sign-off line added by the upsteam\n+probably with the new sign-off line added by the upstream\n maintainer and definitely with different committer and ancestry\n information, they are different objects from #2 and #3 commits.\n \ndiff --git a/Documentation/technical/pack-heuristics.txt\nb/Documentation/technical/pack-heuristics.txt\nindex 9aadd5c..103eb5d 100644\n--- a/Documentation/technical/pack-heuristics.txt\n+++ b/Documentation/technical/pack-heuristics.txt\n@@ -73,7 +73,7 @@ The traditional insight:\n \n     <pasky> yes\n \n-And Bable-like confusion flowed.\n+And Babel-like confusion flowed.\n \n     <njs`> oh, hmm, and I'm not sure what this sliding window means\neither\n \n@@ -257,7 +257,7 @@ proclaim it a non-issue.  Good style too\n         (type, basename, size)).\n \n         Then we walk through this list, and calculate a delta of\n-        each object against the last n (tunable paramater) objects,\n+        each object against the last n (tunable parameter) objects,\n         and pick the smallest of these deltas.\n \n Vastly simplified, but the essence is there!\n@@ -395,7 +395,7 @@ used as setup for a later optimization, \n         do \"object name->location in packfile\" translation.\n \n     <njs`> I'm assuming the real win for delta-ing large->small is\n-        more homogenous statistics for gzip to run over?\n+        more homogeneous statistics for gzip to run over?\n \n         (You have to put the bytes in one place or another, but\n         putting them in a larger blob wins on compression)\n@@ -448,7 +448,7 @@ design options, etc.\n \n         Bugs happen, but they are \"simple\" bugs. And bugs that\n         actually get some object store detail wrong are almost always\n-        so obious that they never go anywhere.\n+        so obvious that they never go anywhere.\n \n     <njs`> Yeah.\n \ndiff --git a/INSTALL b/INSTALL\nindex 4e8f883..4cf7e67 100644\n--- a/INSTALL\n+++ b/INSTALL\n@@ -57,7 +57,7 @@ Issues of note:\n \n \t- \"libcurl\" and \"curl\" executable.  git-http-fetch and\n \t  git-fetch use them.  If you do not use http\n-\t  transfer, you are probabaly OK if you do not have\n+\t  transfer, you are probably OK if you do not have\n \t  them.\n \n \t- expat library; git-http-push uses it for remote lock\n@@ -82,7 +82,7 @@ Issues of note:\n \t  git, and if you only use git to track other peoples work you'll\n \t  never notice the lack of it. \n \n-        - \"wish\", the TCL/Tk windowing shell is used in gitk to show\nthe\n+        - \"wish\", the Tcl/Tk windowing shell is used in gitk to show\nthe\n           history graphically\n \n \t- \"ssh\" is used to push and pull over the net\ndiff --git a/Makefile b/Makefile\nindex 8d429a0..fd35dbe 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -28,7 +28,7 @@ #\n # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic\nlink.\n # Enable it on Windows.  By default, symrefs are still used.\n #\n-# Define NO_SVN_TESTS if you want to skip time-consuming SVN\ninteropability\n+# Define NO_SVN_TESTS if you want to skip time-consuming SVN\ninteroperability\n # tests.  These tests take up a significant amount of the total test\ntime\n # but are not needed unless you plan to talk to SVN repos.\n #\n@@ -67,7 +67,7 @@ #\n # Define NO_ACCURATE_DIFF if your diff program at least sometimes\nmisses\n # a missing newline at the end of the file.\n #\n-# Define NO_PYTHON if you want to loose all benefits of the recursive\nmerge.\n+# Define NO_PYTHON if you want to lose all benefits of the recursive\nmerge.\n #\n # Define COLLISION_CHECK below if you believe that SHA1's\n # 1461501637330902918203684832716283019655932542976 hashes do not give\nyou\n@@ -492,7 +492,7 @@ ifdef NO_ACCURATE_DIFF\n \tBASIC_CFLAGS += -DNO_ACCURATE_DIFF\n endif\n \n-# Shell quote (do not use $(call) to accomodate ancient setups);\n+# Shell quote (do not use $(call) to accommodate ancient setups);\n \n SHA1_HEADER_SQ = $(subst ','\\'',$(SHA1_HEADER))\n \ndiff --git a/git-cvsserver.perl b/git-cvsserver.perl\nindex 5ccca4f..c30ef70 100755\n--- a/git-cvsserver.perl\n+++ b/git-cvsserver.perl\n@@ -779,7 +779,7 @@ sub req_update\n \n     #$log->debug(\"update state : \" . Dumper($state));\n \n-    # foreach file specified on the commandline ...\n+    # foreach file specified on the command line ...\n     foreach my $filename ( @{$state->{args}} )\n     {\n         $filename = filecleanup($filename);\n@@ -1031,7 +1031,7 @@ sub req_ci\n \n     my @committedfiles = ();\n \n-    # foreach file specified on the commandline ...\n+    # foreach file specified on the command line ...\n     foreach my $filename ( @{$state->{args}} )\n     {\n         my $committedfile = $filename;\n@@ -1145,7 +1145,7 @@ sub req_ci\n \n     $updater->update();\n \n-    # foreach file specified on the commandline ...\n+    # foreach file specified on the command line ...\n     foreach my $filename ( @committedfiles )\n     {\n         $filename = filecleanup($filename);\n@@ -1190,7 +1190,7 @@ sub req_status\n     # if no files were specified, we need to work out what files we\nshould be providing status on ...\n     argsfromdir($updater);\n \n-    # foreach file specified on the commandline ...\n+    # foreach file specified on the command line ...\n     foreach my $filename ( @{$state->{args}} )\n     {\n         $filename = filecleanup($filename);\n@@ -1291,7 +1291,7 @@ sub req_diff\n     # if no files were specified, we need to work out what files we\nshould be providing status on ...\n     argsfromdir($updater);\n \n-    # foreach file specified on the commandline ...\n+    # foreach file specified on the command line ...\n     foreach my $filename ( @{$state->{args}} )\n     {\n         $filename = filecleanup($filename);\n@@ -1433,7 +1433,7 @@ sub req_log\n     # if no files were specified, we need to work out what files we\nshould be providing status on ...\n     argsfromdir($updater);\n \n-    # foreach file specified on the commandline ...\n+    # foreach file specified on the command line ...\n     foreach my $filename ( @{$state->{args}} )\n     {\n         $filename = filecleanup($filename);\n@@ -1519,7 +1519,7 @@ sub req_annotate\n \n     chdir $tmpdir;\n \n-    # foreach file specified on the commandline ...\n+    # foreach file specified on the command line ...\n     foreach my $filename ( @{$state->{args}} )\n     {\n         $filename = filecleanup($filename);\ndiff --git a/server-info.c b/server-info.c\nindex 0eb5132..fdfe05a 100644\n--- a/server-info.c\n+++ b/server-info.c\n@@ -94,7 +94,7 @@ static int read_pack_info_file(const cha\n \n \tfp = fopen(infofile, \"r\");\n \tif (!fp)\n-\t\treturn 1; /* nonexisting is not an error. */\n+\t\treturn 1; /* nonexistent is not an error. */\n \n \twhile (fgets(line, sizeof(line), fp)) {\n \t\tint len = strlen(line);\n\n-- \nRegards,\nPavel Roskin\n"},{"id":"23459","messageId":"1152431122.7165.2.camel@dv","threadId":"4815","inReplyTo":"1152430563.6603.5.camel@dv","subject":"Re: [PATCH] Assorted typo fixes","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-07-09T07:45:22Z","receivedAt":"2006-07-09T07:45:22Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"On Sun, 2006-07-09 at 03:36 -0400, Pavel Roskin wrote:\n> Assorted typo fixes\n> \n> Signed-off-by: Pavel Roskin <proski@gnu.org>\n> \n> ---\n> This is for \"next\".  \"interopability\" didn't make it to \"master\" yet.\n\nSorry, it got \"wrapped\".  Resending with StGIT now.\n\n-- \nRegards,\nPavel Roskin\n"}]}