{"thread":{"id":"2026","subject":"[PATCH] Some typos and light editing of various manpages","startedAt":"2005-10-05T21:48:10Z","lastAt":"2005-10-05T22:09:43Z","messageCount":2,"participants":["Christian Meder","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"9729","messageId":"1128548890.11363.11.camel@localhost","threadId":"2026","inReplyTo":null,"subject":"[PATCH] Some typos and light editing of various manpages","fromName":"Christian Meder","fromEmail":"chris@absolutegiganten.org","sentAt":"2005-10-05T21:48:10Z","receivedAt":"2005-10-05T21:48:10Z","isPatch":true,"sender":{"key":"chris@absolutegiganten.org","avatar":null},"body":"Typos, light editing and clarifications.\n\nSigned-off-by: Christian Meder <chris@absolutegiganten.org>\n\n--- \nChristian Meder, email: chris@absolutegiganten.org\n\nThe Way-Seeking Mind of a tenzo is actualized \nby rolling up your sleeves.\n\n                (Eihei Dogen Zenji)\n\n\ndiff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt\n--- a/Documentation/cvs-migration.txt\n+++ b/Documentation/cvs-migration.txt\n@@ -24,7 +24,7 @@ The good news is that most people don't \n people think it's a bug in CVS that makes it tag (and check in changes)\n one file at a time.  So most projects you'll ever see will use CVS\n 'as if' it was sane.  In which case you'll find it very easy indeed to\n-move over to Git. \n+move over to git. \n \n First off: this is not a git tutorial. See\n link:tutorial.html[Documentation/tutorial.txt] for how git\n@@ -229,7 +229,7 @@ does rename or copy would not show in th\n \"o-file.c\", it would find the commit that changed the statement\n when it was in \"o-file.c\".\n \n-NOTE: The current versions of \"git-diff-tree -C\" is not eager\n+NOTE: The current version of \"git-diff-tree -C\" is not eager\n   enough to find copies, and it will miss the fact that a-file.c\n   was created by copying o-file.c unless o-file.c was somehow\n   changed in the same commit.\ndiff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt\n--- a/Documentation/diff-format.txt\n+++ b/Documentation/diff-format.txt\n@@ -1,8 +1,8 @@\n The output format from \"git-diff-index\", \"git-diff-tree\" and\n \"git-diff-files\" are very similar.\n \n-These commands all compare two sets of things; what are\n-compared are different:\n+These commands all compare two sets of things; what is \n+compared differs:\n \n git-diff-index <tree-ish>::\n         compares the <tree-ish> and the files on the filesystem.\n@@ -46,7 +46,7 @@ That is, from the left to the right:\n . path for \"dst\"; only exists for C or R.\n . an LF or a NUL when '-z' option is used, to terminate the record.\n \n-<sha1> is shown as all 0's if new is a file on the filesystem\n+<sha1> is shown as all 0's if a file is new on the filesystem\n and it is out of sync with the cache.\n \n Example:\n@@ -91,7 +91,7 @@ For a path that is added, removed, or mo\n where:\n \n      <old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the\n-\t\t      contents of <old|ne>,\n+\t\t      contents of <old|new>,\n      <old|new>-hex:: are the 40-hexdigit SHA1 hashes,\n      <old|new>-mode:: are the octal representation of the file modes.\n \n@@ -121,12 +121,11 @@ The `a/` and `b/` filenames are the same\n involved.  Especially, even for a creation or a deletion,\n `/dev/null` is _not_ used in place of `a/` or `b/` filenames.\n +\n-When rename/copy is involved, `file1` and `file2` shows the\n+When rename/copy is involved, `file1` and `file2` show the\n name of the source file of the rename/copy and the name of\n the file that rename/copy produces, respectively.\n \n-2.   It is followed by extended header lines that are one or\n-     more of:\n+2.   It is followed by one or more extended header lines:\n \n        old mode <mode>\n        new mode <mode>\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -5,9 +5,8 @@\n \tSynonym for \"-p\".\n \n -r::\n-\tLook recursively in subdirectories; this flag does not\n-\tmean anything to commands other than \"git-diff-tree\";\n-\tother diff commands always look at all the subdirectories.\n+\tLook recursively in subdirectories; only used by \"git-diff-tree\";\n+\tother diff commands always work recursively.\n \n -z::\n \t\\0 line termination on output\n@@ -28,26 +27,26 @@\n \tDetect copies as well as renames.\n \n --find-copies-harder::\n-\tBy default, -C option finds copies only if the original\n-\tfile of the copy was modified in the same changeset for\n-\tperformance reasons.  This flag makes the command\n+\tFor performance reasons, by default, -C option finds copies only \n+\tif the original file of the copy was modified in the same \n+\tchangeset.  This flag makes the command\n \tinspect unmodified files as candidates for the source of\n \tcopy.  This is a very expensive operation for large\n \tprojects, so use it with caution.\n \n -l<num>::\n \t-M and -C options require O(n^2) processing time where n\n-\tin the number of potential rename/copy targets.  This\n+\tis the number of potential rename/copy targets.  This\n \toption prevents rename/copy detection from running if\n-\tthe number of rename/copy targets exceed the specified\n+\tthe number of rename/copy targets exceeds the specified\n \tnumber.\n \n -S<string>::\n-\tLook for differences that contains the change in <string>.\n+\tLook for differences that contain the change in <string>.\n \n --pickaxe-all::\n \tWhen -S finds a change, show all the changes in that\n-\tchangeset, not just the files that contains the change\n+\tchangeset, not just the files that contain the change\n \tin <string>.\n \n -O<orderfile>::\ndiff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt\n--- a/Documentation/diffcore.txt\n+++ b/Documentation/diffcore.txt\n@@ -177,7 +177,7 @@ diffcore-merge-broken\n ---------------------\n \n This transformation is used to merge filepairs broken by\n-diffcore-break, and were not transformed into rename/copy by\n+diffcore-break, and not transformed into rename/copy by\n diffcore-rename, back into a single modification.  This always\n runs when diffcore-break is used.\n \n@@ -206,10 +206,10 @@ like these:\n * -B/60 (the same as above, since diffcore-break defaults to 50%).\n \n Note that earlier implementation left a broken pair as a separate\n-creation and deletion patches.  This was unnecessary hack and\n+creation and deletion patches.  This was an unnecessary hack and\n the latest implementation always merges all the broken pairs\n back into modifications, but the resulting patch output is\n-formatted differently to still let the reviewing easier for such\n+formatted differently for easier review in case of such\n a complete rewrite by showing the entire contents of old version\n prefixed with '-', followed by the entire contents of new\n version prefixed with '+'.\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -11,7 +11,7 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-A simple wrapper to git-update-index to add files to the cache for people used\n+A simple wrapper for git-update-index to add files to the cache for people used\n to do \"cvs add\".\n \n OPTIONS\ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -13,7 +13,7 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Reads supplied diff output and applies it on a GIT index file\n+Reads supplied diff output and applies it on a git index file\n and a work tree.\n \n OPTIONS\ndiff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt\n--- a/Documentation/git-applymbox.txt\n+++ b/Documentation/git-applymbox.txt\n@@ -22,7 +22,7 @@ OPTIONS\n -q::\n \tApply patches interactively.  The user will be given\n \topportunity to edit the log message and the patch before\n-\tattempting to apply patch in each e-mail message.\n+\tattempting to apply it.\n \n -k::\n \tUsually the program 'cleans up' the Subject: header line\ndiff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt\n--- a/Documentation/git-archimport.txt\n+++ b/Documentation/git-archimport.txt\n@@ -20,20 +20,23 @@ it will just import it as a regular comm\n as a merge whenever possible (see discussion below). \n \n The script expects you to provide the key roots where it can start the import \n-from an 'initial import' or 'tag' type of Arch commit. It will follow and import \n-new branches within the provided roots. \n+from an 'initial import' or 'tag' type of Arch commit. It will follow and \n+import new branches within the provided roots. \n \n It expects to be dealing with one project only. If it sees \n-branches that have different roots, it will refuse to run. In that case, edit your\n-<archive/branch> parameters to define clearly the scope of the import. \n+branches that have different roots, it will refuse to run. In that case, \n+edit your <archive/branch> parameters to define clearly the scope of the \n+import. \n \n-`git-archimport` uses `tla` extensively in the background to access the Arch repository.\n+`git-archimport` uses `tla` extensively in the background to access the \n+Arch repository.\n Make sure you have a recent version of `tla` available in the path. `tla` must\n know about the repositories you pass to `git-archimport`. \n \n For the initial import `git-archimport` expects to find itself in an empty \n directory. To follow the development of a project that uses Arch, rerun \n-`git-archimport` with the same parameters as the initial import to perform incremental imports.\n+`git-archimport` with the same parameters as the initial import to perform \n+incremental imports.\n \n MERGES\n ------\ndiff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt\n--- a/Documentation/git-bisect.txt\n+++ b/Documentation/git-bisect.txt\n@@ -76,7 +76,7 @@ During the bisection process, you can sa\n \n to see the currently remaining suspects in `gitk`.\n \n-The good/bad you told the command is logged, and `git bisect\n+The good/bad input is logged, and `git bisect\n log` shows what you have done so far.  You can truncate its\n output somewhere and save it in a file, and run\n \ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -23,7 +23,7 @@ OPTIONS\n \tThe name of the branch to create.\n \n start-point::\n-\tWhere to make the branch; defaults to HEAD.\n+\tWhere to create the branch; defaults to HEAD.\n \n Author\n ------\ndiff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt\n--- a/Documentation/git-cat-file.txt\n+++ b/Documentation/git-cat-file.txt\n@@ -32,7 +32,7 @@ OPTIONS\n \n <type>::\n \tTypically this matches the real type of <object> but asking\n-\tfor a type that can trivially dereferenced from the given\n+\tfor a type that can trivially be dereferenced from the given\n \t<object> is also permitted.  An example is to ask for a\n \t\"tree\" with <object> being a commit object that contains it,\n \tor to ask for a \"blob\" with <object> being a tag object that\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -22,7 +22,7 @@ OPTIONS\n \tCommit to cherry-pick.\n \n -r::\n-\tUsuall the command appends which commit was\n+\tUsually the command appends which commit was\n \tcherry-picked after the original commit message when\n \tmaking a commit.  This option, '--replay', causes it to\n \tuse the original commit message intact.  This is useful\ndiff --git a/Documentation/git-clone-pack.txt b/Documentation/git-clone-pack.txt\n--- a/Documentation/git-clone-pack.txt\n+++ b/Documentation/git-clone-pack.txt\n@@ -26,8 +26,8 @@ OPTIONS\n \n --exec=<git-upload-pack>::\n \tUse this to specify the path to 'git-upload-pack' on the\n-\tremote side, if is not found on your $PATH.\n-\tInstallations of sshd ignores the user's environment\n+\tremote side, if it is not found on your $PATH.\n+\tInstallations of sshd ignore the user's environment\n \tsetup scripts for login shells (e.g. .bash_profile) and\n \tyour privately installed GIT may not be found on the system\n \tdefault $PATH.  Another workaround suggested is to set\ndiff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\n--- a/Documentation/git-commit-tree.txt\n+++ b/Documentation/git-commit-tree.txt\n@@ -36,7 +36,7 @@ OPTIONS\n \tAn existing tree object\n \n -p <parent commit>::\n-\tEach '-p' indicates a the id of a parent commit object.\n+\tEach '-p' indicates the id of a parent commit object.\n \t\n \n Commit Information\n"},{"id":"9733","messageId":"7vbr23ipjs.fsf@assigned-by-dhcp.cox.net","threadId":"2026","inReplyTo":"1128548890.11363.11.camel@localhost","subject":"Re: [PATCH] Some typos and light editing of various manpages","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-10-05T22:09:43Z","receivedAt":"2005-10-05T22:09:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.  I appreciate these fixes very much.  Will apply.\n"}]}