{"thread":{"id":"37875","subject":"[PATCH] Fix some misspellings","startedAt":"2014-11-03T20:37:07Z","lastAt":"2014-11-04T21:14:34Z","messageCount":2,"participants":["Thomas Ackermann","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"251355","messageId":"539820010.119837.1415047027651.JavaMail.ngmail@webmail15.arcor-online.net","threadId":"37875","inReplyTo":null,"subject":"[PATCH] Fix some misspellings","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2014-11-03T20:37:07Z","receivedAt":"2014-11-03T20:37:07Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"\nSigned-off-by: Thomas Ackermann <th.acker@arcor.de>\n---\n Documentation/RelNotes/2.2.0.txt                        |  6 +++---\n Documentation/config.txt                                | 10 +++++-----\n Documentation/git-bisect-lk2009.txt                     |  4 ++--\n Documentation/git-clean.txt                             |  2 +-\n Documentation/git-cvsimport.txt                         |  2 +-\n Documentation/git-cvsserver.txt                         |  2 +-\n Documentation/git-filter-branch.txt                     |  4 ++--\n Documentation/git-interpret-trailers.txt                |  6 +++---\n Documentation/git-rev-parse.txt                         |  2 +-\n Documentation/git-svn.txt                               |  4 ++--\n Documentation/git-update-index.txt                      |  2 +-\n Documentation/gitattributes.txt                         |  4 ++--\n Documentation/githooks.txt                              |  2 +-\n Documentation/glossary-content.txt                      |  2 +-\n Documentation/howto/recover-corrupted-object-harder.txt |  4 ++--\n Documentation/rev-list-options.txt                      |  2 +-\n Documentation/technical/index-format.txt                |  2 +-\n Documentation/technical/protocol-capabilities.txt       |  2 +-\n contrib/subtree/git-subtree.txt                         |  2 +-\n 19 files changed, 32 insertions(+), 32 deletions(-)\n\ndiff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt\nindex 741e14e..4ce76cc 100644\n--- a/Documentation/RelNotes/2.2.0.txt\n+++ b/Documentation/RelNotes/2.2.0.txt\n@@ -62,7 +62,7 @@ UI, Workflows & Features\n    e.g. \"hello_BASE_4321.c\").\n \n  * The temporary files \"git mergetools\" uses can be placed in a newly\n-   creted temporary directory, instead of the current directory, by\n+   created temporary directory, instead of the current directory, by\n    setting the mergetool.writeToTemp configuration variable.\n \n  * \"git mergetool\" understands \"--tool bc\" now, as version 4 of\n@@ -85,7 +85,7 @@ UI, Workflows & Features\n    public repository really point the commits the pusher wanted to,\n    without having to \"trust\" the server.\n \n- * \"git interpret-trailers\" is a new filter to programatically edit\n+ * \"git interpret-trailers\" is a new filter to programmatically edit\n     the tail end of the commit log messages.\n \n  * \"git help everyday\" shows the \"Everyday Git in 20 commands or so\"\n@@ -292,6 +292,6 @@ notes for details).\n    (merge b12d045 da/mergetool-meld later to maint).\n \n  * \"git pack-objects\" forgot to disable the codepath to generate\n-   object recheability bitmap when it needs to split the resulting\n+   object reachability bitmap when it needs to split the resulting\n    pack.\n    (merge 2113471 jk/pack-objects-no-bitmap-when-splitting later to maint).\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 7a3294d..e8dd76d 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1210,7 +1210,7 @@ gc.autopacklimit::\n \tdefault\tvalue is 50.  Setting this to 0 disables it.\n \n gc.autodetach::\n-\tMake `git gc --auto` return immediately andrun in background\n+\tMake `git gc --auto` return immediately and run in background\n \tif the system supports it. Default is true.\n \n gc.packrefs::\n@@ -1357,7 +1357,7 @@ gpg.program::\n \tsame command-line interface as GPG, namely, to verify a detached\n \tsignature, \"gpg --verify $file - <$signature\" is run, and the\n \tprogram is expected to signal a good signature by exiting with\n-\tcode 0, and to generate an ascii-armored detached signature, the\n+\tcode 0, and to generate an ASCII-armored detached signature, the\n \tstandard input of \"gpg -bsau $key\" is fed with the contents to be\n \tsigned, and the program is expected to send the result to its\n \tstandard output.\n@@ -1592,7 +1592,7 @@ http.useragent::\n \tCan be overridden by the 'GIT_HTTP_USER_AGENT' environment variable.\n \n http.<url>.*::\n-\tAny of the http.* options above can be applied selectively to some urls.\n+\tAny of the http.* options above can be applied selectively to some URLs.\n \tFor a config key to match a URL, each element of the config key is\n \tcompared to that of the URL, in the following order:\n +\n@@ -1631,8 +1631,8 @@ if the URL is `https://user@example.com/foo/bar` a config key match of\n +\n All URLs are normalized before attempting any matching (the password part,\n if embedded in the URL, is always ignored for matching purposes) so that\n-equivalent urls that are simply spelled differently will match properly.\n-Environment variable settings always override any matches.  The urls that are\n+equivalent URLs that are simply spelled differently will match properly.\n+Environment variable settings always override any matches.  The URLs that are\n matched against are those given directly to Git commands.  This means any URLs\n visited as a result of a redirection do not participate in matching.\n \ndiff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt\nindex afeb86c..0f0c6ff 100644\n--- a/Documentation/git-bisect-lk2009.txt\n+++ b/Documentation/git-bisect-lk2009.txt\n@@ -119,7 +119,7 @@ developed and maintained during years or even tens of years by a lot\n of people. And as there are often many people who depend (sometimes\n critically) on such software, regressions are a really big problem.\n \n-One such software is the linux kernel. And if we look at the linux\n+One such software is the Linux kernel. And if we look at the Linux\n kernel, we can see that a lot of time and effort is spent to fight\n regressions. The release cycle start with a 2 weeks long merge\n window. Then the first release candidate (rc) version is tagged. And\n@@ -132,7 +132,7 @@ regressions. And this time is more than 80% of the release cycle\n time. But this is not the end of the fight yet, as of course it\n continues after the release.\n \n-And then this is what Ingo Molnar (a well known linux kernel\n+And then this is what Ingo Molnar (a well known Linux kernel\n developer) says about his use of git bisect:\n \n _____________\ndiff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt\nindex 8997922..94b6d19 100644\n--- a/Documentation/git-clean.txt\n+++ b/Documentation/git-clean.txt\n@@ -98,7 +98,7 @@ clean::\n filter by pattern::\n \n    This shows the files and directories to be deleted and issues an\n-   \"Input ignore patterns>>\" prompt. You can input space-seperated\n+   \"Input ignore patterns>>\" prompt. You can input space-separated\n    patterns to exclude files and directories from deletion.\n    E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from\n    deletion. When you are satisfied with the filtered result, press\ndiff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt\nindex 260f39f..00a0679 100644\n--- a/Documentation/git-cvsimport.txt\n+++ b/Documentation/git-cvsimport.txt\n@@ -219,7 +219,7 @@ Problems related to tags:\n * Multiple tags on the same revision are not imported.\n \n If you suspect that any of these issues may apply to the repository you\n-want to imort, consider using cvs2git:\n+want to import, consider using cvs2git:\n \n * cvs2git (part of cvs2svn), `http://subversion.apache.org/`\n \ndiff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt\nindex 472f5cb..4961f1a 100644\n--- a/Documentation/git-cvsserver.txt\n+++ b/Documentation/git-cvsserver.txt\n@@ -110,7 +110,7 @@ to allow writes to, for example:\n \tauthdb = /etc/cvsserver/passwd\n \n ------\n-The format of these files is username followed by the crypted password,\n+The format of these files is username followed by the encrypted password,\n for example:\n \n ------\ndiff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt\nindex 09535f2..73fd9e8 100644\n--- a/Documentation/git-filter-branch.txt\n+++ b/Documentation/git-filter-branch.txt\n@@ -451,8 +451,8 @@ characteristics:\n \n * By default The BFG takes full advantage of multi-core machines,\n   cleansing commit file-trees in parallel. git-filter-branch cleans\n-  commits sequentially (ie in a single-threaded manner), though it\n-  _is_ possible to write filters that include their own parallellism,\n+  commits sequentially (i.e. in a single-threaded manner), though it\n+  _is_ possible to write filters that include their own parallelism,\n   in the scripts executed against each commit.\n \n * The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options]\ndiff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt\nindex 81fac3d..d6d9231 100644\n--- a/Documentation/git-interpret-trailers.txt\n+++ b/Documentation/git-interpret-trailers.txt\n@@ -3,7 +3,7 @@ git-interpret-trailers(1)\n \n NAME\n ----\n-git-interpret-trailers - help add stuctured information into commit messages\n+git-interpret-trailers - help add structured information into commit messages\n \n SYNOPSIS\n --------\n@@ -43,7 +43,7 @@ This means that the trimmed <token> and <value> will be separated by\n \n By default the new trailer will appear at the end of all the existing\n trailers. If there is no existing trailer, the new trailer will appear\n-after the commit message part of the ouput, and, if there is no line\n+after the commit message part of the output, and, if there is no line\n with only spaces at the end of the commit message part, one blank line\n will be added before the new trailer.\n \n@@ -56,7 +56,7 @@ minus signs start the patch part of the message.\n \n When reading trailers, there can be whitespaces before and after the\n token, the separator and the value. There can also be whitespaces\n-indide the token and the value.\n+inside the token and the value.\n \n Note that 'trailers' do not follow and are not intended to follow many\n rules for RFC 822 headers. For example they do not follow the line\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex fa4a8c3..d6de42f 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -184,7 +184,7 @@ shown.  If the pattern does not contain a globbing character (`?`,\n \tconsider. Repetitions of this option accumulate exclusion patterns\n \tup to the next `--all`, `--branches`, `--tags`, `--remotes`, or\n \t`--glob` option (other options or arguments do not clear\n-\taccumlated patterns).\n+\taccumulated patterns).\n +\n The patterns given should not begin with `refs/heads`, `refs/tags`, or\n `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex af660f9..39e9a18 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -70,8 +70,8 @@ COMMANDS\n --username=<user>;;\n \tFor transports that SVN handles authentication for (http,\n \thttps, and plain svn), specify the username.  For other\n-\ttransports (eg svn+ssh://), you must include the username in\n-\tthe URL, eg svn+ssh://foo@svn.bar.com/project\n+\ttransports (e.g. svn+ssh://), you must include the username in\n+\tthe URL, e.g. svn+ssh://foo@svn.bar.com/project\n --prefix=<prefix>;;\n \tThis allows one to specify a prefix which is prepended\n \tto the names of remotes if trunk/branches/tags are\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex 82eca6f..929869b 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -170,7 +170,7 @@ may not support it yet.\n \tsplit-index mode is already enabled and `--split-index` is\n \tgiven again, all changes in $GIT_DIR/index are pushed back to\n \tthe shared index file. This mode is designed for very large\n-\tindexes that take a signficant amount of time to read or write.\n+\tindexes that take a significant amount of time to read or write.\n \n \\--::\n \tDo not interpret any more arguments as options.\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 9b45bda..c892ffa 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -665,7 +665,7 @@ data by examining the beginning of the contents. However, sometimes you\n may want to override its decision, either because a blob contains binary\n data later in the file, or because the content, while technically\n composed of text characters, is opaque to a human reader. For example,\n-many postscript files contain only ascii characters, but produce noisy\n+many postscript files contain only ASCII characters, but produce noisy\n and meaningless diffs.\n \n The simplest way to mark a file as binary is to unset the diff\n@@ -680,7 +680,7 @@ patch, if binary patches are enabled) instead of a regular diff.\n \n However, one may also want to specify other diff driver attributes. For\n example, you might want to use `textconv` to convert postscript files to\n-an ascii representation for human viewing, but otherwise treat them as\n+an ASCII representation for human viewing, but otherwise treat them as\n binary files. You cannot specify both `-diff` and `diff=ps` attributes.\n The solution is to use the `diff.*.binary` config option:\n \ndiff --git a/Documentation/githooks.txt b/Documentation/githooks.txt\nindex d954bf6..9ef2469 100644\n--- a/Documentation/githooks.txt\n+++ b/Documentation/githooks.txt\n@@ -175,7 +175,7 @@ if the merge failed due to conflicts.\n \n This hook can be used in conjunction with a corresponding pre-commit hook to\n save and restore any form of metadata associated with the working tree\n-(eg: permissions/ownership, ACLS, etc).  See contrib/hooks/setgitperms.perl\n+(e.g.: permissions/ownership, ACLS, etc).  See contrib/hooks/setgitperms.perl\n for an example of how to do this.\n \n pre-push\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 4e0b971..bf383c2 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -329,7 +329,7 @@ short form, the leading colon `:` is followed by zero or more \"magic\n signature\" letters (which optionally is terminated by another colon `:`),\n and the remainder is the pattern to match against the path.\n The \"magic signature\" consists of ASCII symbols that are neither\n-alphanumeric, glob, regex special charaters nor colon.\n+alphanumeric, glob, regex special characters nor colon.\n The optional colon that terminates the \"magic signature\" can be\n omitted if the pattern begins with a character that does not belong to\n \"magic signature\" symbol set and is not a colon.\ndiff --git a/Documentation/howto/recover-corrupted-object-harder.txt b/Documentation/howto/recover-corrupted-object-harder.txt\nindex 6f33dac..23e685d 100644\n--- a/Documentation/howto/recover-corrupted-object-harder.txt\n+++ b/Documentation/howto/recover-corrupted-object-harder.txt\n@@ -38,7 +38,7 @@ zlib were failing).\n Reading the zlib source code, I found that \"incorrect data check\" means\n that the adler-32 checksum at the end of the zlib data did not match the\n inflated data. So stepping the data through zlib would not help, as it\n-did not fail until the very end, when we realize the crc does not match.\n+did not fail until the very end, when we realize the CRC does not match.\n The problematic bytes could be anywhere in the object data.\n \n The first thing I did was pull the broken data out of the packfile. I\n@@ -195,7 +195,7 @@ halfway through:\n -------\n \n I let it run to completion, and got a few more hits at the end (where it\n-was munging the crc to match our broken data). So there was a good\n+was munging the CRC to match our broken data). So there was a good\n chance this middle hit was the source of the problem.\n \n I confirmed by tweaking the byte in a hex editor, zlib inflating the\ndiff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\nindex 3301fde..afccfdc 100644\n--- a/Documentation/rev-list-options.txt\n+++ b/Documentation/rev-list-options.txt\n@@ -160,7 +160,7 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).\n \tconsider. Repetitions of this option accumulate exclusion patterns\n \tup to the next `--all`, `--branches`, `--tags`, `--remotes`, or\n \t`--glob` option (other options or arguments do not clear\n-\taccumlated patterns).\n+\taccumulated patterns).\n +\n The patterns given should not begin with `refs/heads`, `refs/tags`, or\n `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,\ndiff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt\nindex fe6f316..1250b5c 100644\n--- a/Documentation/technical/index-format.txt\n+++ b/Documentation/technical/index-format.txt\n@@ -231,5 +231,5 @@ Git index format\n     on. Replaced entries may have empty path names to save space.\n \n   The remaining index entries after replaced ones will be added to the\n-  final index. These added entries are also sorted by entry namme then\n+  final index. These added entries are also sorted by entry name then\n   stage.\ndiff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt\nindex 0c92dee..6d5424c 100644\n--- a/Documentation/technical/protocol-capabilities.txt\n+++ b/Documentation/technical/protocol-capabilities.txt\n@@ -168,7 +168,7 @@ agent capability). The `X` and `Y` strings may contain any printable\n ASCII characters except space (i.e., the byte range 32 < x < 127), and\n are typically of the form \"package/version\" (e.g., \"git/1.8.3.1\"). The\n agent strings are purely informative for statistics and debugging\n-purposes, and MUST NOT be used to programatically assume the presence\n+purposes, and MUST NOT be used to programmatically assume the presence\n or absence of particular features.\n \n shallow\ndiff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt\nindex 02669b1..8272100 100644\n--- a/contrib/subtree/git-subtree.txt\n+++ b/contrib/subtree/git-subtree.txt\n@@ -114,7 +114,7 @@ split::\n \twant.\n \t\n \tRepeated splits of exactly the same history are\n-\tguaranteed to be identical (ie. to produce the same\n+\tguaranteed to be identical (i.e. to produce the same\n \tcommit ids).  Because of this, if you add new commits\n \tand then re-split, the new commits will be attached as\n \tcommits on top of the history you generated last time,\n-- \n1.9.4.msysgit.0\n"},{"id":"251386","messageId":"xmqqfvdypt1h.fsf@gitster.dls.corp.google.com","threadId":"37875","inReplyTo":"539820010.119837.1415047027651.JavaMail.ngmail@webmail15.arcor-online.net","subject":"Re: [PATCH] Fix some misspellings","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-11-04T21:14:34Z","receivedAt":"2014-11-04T21:14:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}