{"thread":{"id":"14842","subject":"[PATCH] Documentation: typos / spelling fixes","startedAt":"2008-08-05T16:12:05Z","lastAt":"2008-08-05T16:12:05Z","messageCount":1,"participants":["Mike Ralphson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"86279","messageId":"1217952726-4149-1-git-send-email-mike@abacus.co.uk","threadId":"14842","inReplyTo":null,"subject":"[PATCH] Documentation: typos / spelling fixes","fromName":"Mike Ralphson","fromEmail":"mike@abacus.co.uk","sentAt":"2008-08-05T16:12:05Z","receivedAt":"2008-08-05T16:12:05Z","isPatch":true,"sender":{"key":"mike@abacus.co.uk","avatar":"https://gravatar.com/avatar/717865f1e9a9197ec082b9f6a12e048210a9da06878e47f165b470c43a9e9175?d=mp&s=160"},"body":"\nSigned-off-by: Mike Ralphson <mike@abacus.co.uk>\n---\n Documentation/RelNotes-1.6.0.txt   |    2 +-\n Documentation/config.txt           |    2 +-\n Documentation/git-cat-file.txt     |    2 +-\n Documentation/git-for-each-ref.txt |    2 +-\n Documentation/git-mergetool.txt    |    2 +-\n Documentation/git-svn.txt          |    4 ++--\n Documentation/merge-config.txt     |    4 ++--\n 7 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/RelNotes-1.6.0.txt b/Documentation/RelNotes-1.6.0.txt\nindex 2542cf5..614a3be 100644\n--- a/Documentation/RelNotes-1.6.0.txt\n+++ b/Documentation/RelNotes-1.6.0.txt\n@@ -187,7 +187,7 @@ Updates since v1.5.6\n   command internally uses rev-parse to interpret its arguments.\n \n * git-rev-list learned --children option to show child commits it\n-  encountered during the traversal, instead of shoing parent commits.\n+  encountered during the traversal, instead of showing parent commits.\n \n * git-send-mail can talk not just over SSL but over TLS now.\n \ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 61c3760..b8ec01c 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -693,7 +693,7 @@ gitcvs.usecrlfattr\n \tfiles to determine the '-k' modes to use. If `crlf` is set,\n \tthe '-k' mode will be left blank, so cvs clients will\n \ttreat it as text. If `crlf` is explicitly unset, the file\n-\twill be set with '-kb' mode, which supresses any newline munging\n+\twill be set with '-kb' mode, which suppresses any newline munging\n \tthe client might otherwise do. If `crlf` is not specified,\n \tthen 'gitcvs.allbinary' is used. See linkgit:gitattributes[5].\n \ndiff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt\nindex d35e8a0..668f697 100644\n--- a/Documentation/git-cat-file.txt\n+++ b/Documentation/git-cat-file.txt\n@@ -81,7 +81,7 @@ object specified on stdin:\n ------------\n \n If '--batch-check' is specified, output of the following form is printed for\n-each object specified fon stdin:\n+each object specified on stdin:\n \n ------------\n <sha1> SP <type> SP <size> LF\ndiff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt\nindex 609f949..eae6c0e 100644\n--- a/Documentation/git-for-each-ref.txt\n+++ b/Documentation/git-for-each-ref.txt\n@@ -49,7 +49,7 @@ OPTIONS\n \n <pattern>...::\n \tIf one or more patterns are given, only refs are shown that\n-\tmatch againt at least one pattern, either using fnmatch(3) or\n+\tmatch against at least one pattern, either using fnmatch(3) or\n \tliterally, in the latter case matching completely or from the\n \tbeginning up to a slash.\n \ndiff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt\nindex 31570b1..e0b2703 100644\n--- a/Documentation/git-mergetool.txt\n+++ b/Documentation/git-mergetool.txt\n@@ -40,7 +40,7 @@ tool is available in PATH.\n +\n Instead of running one of the known merge tool programs\n 'git-mergetool' can be customized to run an alternative program\n-by specifying the command line to invoke in a configration\n+by specifying the command line to invoke in a configuration\n variable `mergetool.<tool>.cmd`.\n +\n When 'git-mergetool' is invoked with this tool (either through the\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex f230125..773ae96 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -13,7 +13,7 @@ DESCRIPTION\n -----------\n 'git-svn' is a simple conduit for changesets between Subversion and git.\n It provides a bidirectional flow of changes between a Subversion and a git\n-respository.\n+repository.\n \n 'git-svn' can track a single Subversion branch simply by using a\n URL to the branch, follow branches laid out in the Subversion recommended\n@@ -209,7 +209,7 @@ Any other arguments are passed directly to 'git-log'\n \tRecursively finds the svn:ignore property on directories and\n \tcreates matching .gitignore files. The resulting files are staged to\n \tbe committed, but are not committed. Use -r/--revision to refer to a\n-\tspecfic revision.\n+\tspecific revision.\n \n 'show-ignore'::\n \tRecursively finds and lists the svn:ignore property on\ndiff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt\nindex 48ce747..00277e0 100644\n--- a/Documentation/merge-config.txt\n+++ b/Documentation/merge-config.txt\n@@ -1,5 +1,5 @@\n merge.stat::\n-\tWhether to print the diffstat berween ORIG_HEAD and merge result\n+\tWhether to print the diffstat between ORIG_HEAD and merge result\n \tat the end of the merge.  True by default.\n \n merge.log::\n@@ -16,7 +16,7 @@ merge.tool::\n \tlinkgit:git-mergetool[1].  Valid built-in values are: \"kdiff3\",\n \t\"tkdiff\", \"meld\", \"xxdiff\", \"emerge\", \"vimdiff\", \"gvimdiff\", and\n \t\"opendiff\".  Any other value is treated is custom merge tool\n-\tand there must be a corresponing mergetool.<tool>.cmd option.\n+\tand there must be a corresponding mergetool.<tool>.cmd option.\n \n merge.verbosity::\n \tControls the amount of output shown by the recursive merge\n-- \n1.6.0.rc0.dirty\n"}]}