{"thread":{"id":"9630","subject":"[PATCH] Documentation: Correct various misspellings and typos.","startedAt":"2007-08-24T00:44:13Z","lastAt":"2007-08-24T00:44:13Z","messageCount":1,"participants":["Brian Hetro"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"51415","messageId":"20070824004413.GB21778@ruiner","threadId":"9630","inReplyTo":null,"subject":"[PATCH] Documentation: Correct various misspellings and typos.","fromName":"Brian Hetro","fromEmail":"whee@smaertness.net","sentAt":"2007-08-24T00:44:13Z","receivedAt":"2007-08-24T00:44:13Z","isPatch":true,"sender":{"key":"whee@smaertness.net","avatar":"https://gravatar.com/avatar/1d20c40734a674e76a0a58c6d122ef493291db306d613a40653a035084d557b9?d=mp&s=160"},"body":"Fix minor typos throughout the documentation.\n\nSigned-off-by: Brian Hetro <whee@smaertness.net>\n---\nThis patch is rather large...but full of trivial, typo related, fixes.\nI am not sure if it should be split up.\n\n Documentation/config.txt            |   12 ++++++------\n Documentation/git-commit-tree.txt   |    2 +-\n Documentation/git-config.txt        |    2 +-\n Documentation/git-fast-import.txt   |   18 +++++++++---------\n Documentation/git-fmt-merge-msg.txt |    2 +-\n Documentation/git-format-patch.txt  |    2 +-\n Documentation/git-gui.txt           |    2 +-\n Documentation/git-http-fetch.txt    |    2 +-\n Documentation/git-local-fetch.txt   |    2 +-\n Documentation/git-name-rev.txt      |    2 +-\n Documentation/git-receive-pack.txt  |    2 +-\n Documentation/git-reflog.txt        |    2 +-\n Documentation/git-repack.txt        |    2 +-\n Documentation/git-rev-list.txt      |    2 +-\n Documentation/git-svn.txt           |    4 ++--\n Documentation/gitattributes.txt     |    6 +++---\n Documentation/hooks.txt             |    2 +-\n Documentation/tutorial.txt          |    2 +-\n Documentation/user-manual.txt       |   12 ++++++------\n 19 files changed, 40 insertions(+), 40 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex a9fb221..903610f 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -283,7 +283,7 @@ core.excludesfile::\n \n core.editor::\n \tCommands such as `commit` and `tag` that lets you edit\n-\tmessages by lauching an editor uses the value of this\n+\tmessages by launching an editor uses the value of this\n \tvariable when it is set, and the environment variable\n \t`GIT_EDITOR` is not set.  The order of preference is\n \t`GIT_EDITOR` environment, `core.editor`, `VISUAL` and\n@@ -500,10 +500,10 @@ gitcvs.dbuser, gitcvs.dbpass::\n \t'gitcvs.dbuser' supports variable substitution (see\n \tgitlink:git-cvsserver[1] for details).\n \n-All gitcvs variables except for 'gitcvs.allbinary' can also specifed\n-as 'gitcvs.<access_method>.<varname>' (where 'access_method' is one\n-of \"ext\" and \"pserver\") to make them apply only for the given access\n-method.\n+All gitcvs variables except for 'gitcvs.allbinary' can also be\n+specified as 'gitcvs.<access_method>.<varname>' (where 'access_method'\n+is one of \"ext\" and \"pserver\") to make them apply only for the given\n+access method.\n \n http.sslVerify::\n \tWhether to verify the SSL certificate when fetching or pushing\n@@ -615,7 +615,7 @@ pack.compression::\n \tnot set,  defaults to -1.\n \n pack.deltaCacheSize::\n-\tThe maxium memory in bytes used for caching deltas in\n+\tThe maximum memory in bytes used for caching deltas in\n \tgitlink:git-pack-objects[1].\n \tA value of 0 means no limit. Defaults to 0.\n \ndiff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\nindex 6a328f4..a2537e1 100644\n--- a/Documentation/git-commit-tree.txt\n+++ b/Documentation/git-commit-tree.txt\n@@ -52,7 +52,7 @@ A commit encapsulates:\n - committer name and email and the commit time.\n \n While parent object ids are provided on the command line, author and\n-commiter information is taken from the following environment variables,\n+committer information is taken from the following environment variables,\n if set:\n \n \tGIT_AUTHOR_NAME\ndiff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\nindex c3dffff..5b794f4 100644\n--- a/Documentation/git-config.txt\n+++ b/Documentation/git-config.txt\n@@ -139,7 +139,7 @@ See also <<FILES>>.\n FILES\n -----\n \n-If not set explicitely with '--file', there are three files where\n+If not set explicitly with '--file', there are three files where\n git-config will search for configuration options:\n \n .git/config::\ndiff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt\nindex 0a019dd..d511967 100644\n--- a/Documentation/git-fast-import.txt\n+++ b/Documentation/git-fast-import.txt\n@@ -241,7 +241,7 @@ been well tested in the wild.\n +\n Frontends should prefer the `raw` format if the source material\n already uses UNIX-epoch format, can be coaxed to give dates in that\n-format, or its format is easiliy convertible to it, as there is no\n+format, or its format is easily convertible to it, as there is no\n ambiguity in parsing.\n \n `now`::\n@@ -343,7 +343,7 @@ Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`\n and `filedeleteall` commands\n may be included to update the contents of the branch prior to\n creating the commit.  These commands may be supplied in any order.\n-However it is recommended that a `filedeleteall` command preceed\n+However it is recommended that a `filedeleteall` command precede\n all `filemodify`, `filecopy` and `filerename` commands in the same\n commit, as `filedeleteall`\n wipes the branch clean (see below).\n@@ -402,7 +402,7 @@ Here `<committish>` is any of the following:\n +\n The reason fast-import uses `:` to denote a mark reference is this character\n is not legal in a Git branch name.  The leading `:` makes it easy\n-to distingush between the mark 42 (`:42`) and the branch 42 (`42`\n+to distinguish between the mark 42 (`:42`) and the branch 42 (`42`\n or `refs/heads/42`), or an abbreviated SHA-1 which happened to\n consist only of base-10 digits.\n +\n@@ -487,7 +487,7 @@ start with double quote (`\"`).\n If an `LF` or double quote must be encoded into `<path>` shell-style\n quoting should be used, e.g. `\"path/with\\n and \\\" in it\"`.\n \n-The value of `<path>` must be in canoncial form. That is it must not:\n+The value of `<path>` must be in canonical form. That is it must not:\n \n * contain an empty directory component (e.g. `foo//bar` is invalid),\n * end with a directory separator (e.g. `foo/` is invalid),\n@@ -733,7 +733,7 @@ of the next line, even if `<raw>` did not end with an `LF`.\n Delimited format::\n \tA delimiter string is used to mark the end of the data.\n \tfast-import will compute the length by searching for the delimiter.\n-\tThis format is primarly useful for testing and is not\n+\tThis format is primarily useful for testing and is not\n \trecommended for real data.\n +\n ....\n@@ -873,7 +873,7 @@ to remove the dummy branch.\n Import Now, Repack Later\n ~~~~~~~~~~~~~~~~~~~~~~~~\n As soon as fast-import completes the Git repository is completely valid\n-and ready for use.  Typicallly this takes only a very short time,\n+and ready for use.  Typically this takes only a very short time,\n even for considerably large projects (100,000+ commits).\n \n However repacking the repository is necessary to improve data\n@@ -942,8 +942,8 @@ Memory Utilization\n ------------------\n There are a number of factors which affect how much memory fast-import\n requires to perform an import.  Like critical sections of core\n-Git, fast-import uses its own memory allocators to ammortize any overheads\n-associated with malloc.  In practice fast-import tends to ammoritize any\n+Git, fast-import uses its own memory allocators to amortize any overheads\n+associated with malloc.  In practice fast-import tends to amortize any\n malloc overheads to 0, due to its use of large block allocations.\n \n per object\n@@ -1000,7 +1000,7 @@ per active tree\n ~~~~~~~~~~~~~~~\n Trees (aka directories) use just 12 bytes of memory on top of the\n memory required for their entries (see ``per active file'' below).\n-The cost of a tree is virtually 0, as its overhead ammortizes out\n+The cost of a tree is virtually 0, as its overhead amortizes out\n over the individual file entries.\n \n per active file entry\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nindex 6affc5b..7088ed4 100644\n--- a/Documentation/git-fmt-merge-msg.txt\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -10,7 +10,7 @@ SYNOPSIS\n --------\n [verse]\n git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD\n-git-fmt-merge-msg [--summary | --no-summray] -F <file>\n+git-fmt-merge-msg [--summary | --no-summary] -F <file>\n \n DESCRIPTION\n -----------\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 6cbcf93..c514fdd 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -118,7 +118,7 @@ include::diff-options.txt[]\n \n --suffix=.<sfx>::\n \tInstead of using `.patch` as the suffix for generated\n-\tfilenames, use specifed suffix.  A common alternative is\n+\tfilenames, use specified suffix.  A common alternative is\n \t`--suffix=.txt`.\n +\n Note that you would need to include the leading dot `.` if you\ndiff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt\nindex bd613b2..13252a1 100644\n--- a/Documentation/git-gui.txt\n+++ b/Documentation/git-gui.txt\n@@ -89,7 +89,7 @@ See Also\n Other\n -----\n git-gui is actually maintained as an independent project, but stable\n-versions are distributed as part of the Git suite for the convience\n+versions are distributed as part of the Git suite for the convenience\n of end users.\n \n A git-gui development repository can be obtained from:\ndiff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt\nindex 45e4845..389c6ed 100644\n--- a/Documentation/git-http-fetch.txt\n+++ b/Documentation/git-http-fetch.txt\n@@ -34,7 +34,7 @@ commit-id::\n         the local end after the transfer is complete.\n \n --stdin::\n-\tInstead of a commit id on the commandline (which is not expected in this\n+\tInstead of a commit id on the command line (which is not expected in this\n \tcase), 'git-http-fetch' expects lines on stdin in the format\n \n \t\t<commit-id>['\\t'<filename-as-in--w>]\ndiff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt\nindex 141b767..e830dee 100644\n--- a/Documentation/git-local-fetch.txt\n+++ b/Documentation/git-local-fetch.txt\n@@ -44,7 +44,7 @@ OPTIONS\n         the local end after the transfer is complete.\n \n --stdin::\n-\tInstead of a commit id on the commandline (which is not expected in this\n+\tInstead of a commit id on the command line (which is not expected in this\n \tcase), 'git-local-fetch' expects lines on stdin in the format\n \n \t\t<commit-id>['\\t'<filename-as-in--w>]\ndiff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt\nindex 91eede1..306e1a4 100644\n--- a/Documentation/git-name-rev.txt\n+++ b/Documentation/git-name-rev.txt\n@@ -37,7 +37,7 @@ OPTIONS\n --name-only::\n \tInstead of printing both the SHA-1 and the name, print only\n \tthe name.  If given with --tags the usual tag prefix of\n-\t\"tags/\" is also ommitted from the name, matching the output\n+\t\"tags/\" is also omitted from the name, matching the output\n \tof gitlink::git-describe[1] more closely.  This option\n \tcannot be combined with --stdin.\n \ndiff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt\nindex 4ef1840..2633d94 100644\n--- a/Documentation/git-receive-pack.txt\n+++ b/Documentation/git-receive-pack.txt\n@@ -78,7 +78,7 @@ The hook should exit with non-zero status if it wants to disallow\n updating the named ref.  Otherwise it should exit with zero.\n \n Successful execution (a zero exit status) of this hook does not\n-ensure the ref will actully be updated, it is only a prerequisite.\n+ensure the ref will actually be updated, it is only a prerequisite.\n As such it is not a good idea to send notices (e.g. email) from\n this hook.  Consider using the post-receive hook instead.\n \ndiff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt\nindex 29b7d9f..5180f68 100644\n--- a/Documentation/git-reflog.txt\n+++ b/Documentation/git-reflog.txt\n@@ -30,7 +30,7 @@ Entries older than `expire` time, or entries older than\n tip, are removed from the reflog.  This is typically not used\n directly by the end users -- instead, see gitlink:git-gc[1].\n \n-The subcommand \"show\" (which is also the default, in the absense of any\n+The subcommand \"show\" (which is also the default, in the absence of any\n subcommands) will take all the normal log options, and show the log of\n `HEAD`, which will cover all recent actions, including branch switches.\n It is basically an alias for 'git log -g --abbrev-commit\ndiff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt\nindex 5283ef8..12e2079 100644\n--- a/Documentation/git-repack.txt\n+++ b/Documentation/git-repack.txt\n@@ -14,7 +14,7 @@ DESCRIPTION\n -----------\n \n This script is used to combine all objects that do not currently\n-reside in a \"pack\", into a pack.  It can also be used to re-organise\n+reside in a \"pack\", into a pack.  It can also be used to re-organize\n existing packs into a single, more efficient pack.\n \n A pack is a collection of objects, individually compressed, with\ndiff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt\nindex a0c611e..7cd0e89 100644\n--- a/Documentation/git-rev-list.txt\n+++ b/Documentation/git-rev-list.txt\n@@ -113,7 +113,7 @@ e.g. \"2 hours ago\".\n `--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822\n format, often found in E-mail messages.\n +\n-`--date=short` shows only date but not time, in `YYYY-MM-DD` fomat.\n+`--date=short` shows only date but not time, in `YYYY-MM-DD` format.\n +\n `--date=default` shows timestamps in the original timezone\n (either committer's or author's).\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex 3e2a63b..3420c5c 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -99,7 +99,7 @@ COMMANDS\n \n This works similarly to 'svn update' or 'git-pull' except that\n it preserves linear history with 'git-rebase' instead of\n-'git-merge' for ease of dcommit-ing with git-svn.\n+'git-merge' for ease of dcommiting with git-svn.\n \n This accepts all options that 'git-svn fetch' and 'git-rebase'\n accepts.  However '--fetch-all' only fetches from the current\n@@ -551,7 +551,7 @@ listed below are allowed:\n Keep in mind that the '*' (asterisk) wildcard of the local ref\n (left of the ':') *must* be the farthest right path component;\n however the remote wildcard may be anywhere as long as it's own\n-independent path componet (surrounded by '/' or EOL).   This\n+independent path component (surrounded by '/' or EOL).   This\n type of configuration is not automatically created by 'init' and\n should be manually entered with a text-editor or using\n gitlink:git-config[1]\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 8b90a5b..46f9d59 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -285,7 +285,7 @@ want to appear as the hunk header, like this:\n Note.  A single level of backslashes are eaten by the\n configuration file parser, so you would need to double the\n backslashes; the pattern above picks a line that begins with a\n-backslash, and zero or more occurences of `sub` followed by\n+backslash, and zero or more occurrences of `sub` followed by\n `section` followed by open brace, to the end of line.\n \n There are a few built-in patterns to make this easier, and `tex`\n@@ -394,7 +394,7 @@ abc\t-foo -bar\n the attributes given to path `t/abc` are computed as follows:\n \n 1. By examining `t/.gitattributes` (which is in the same\n-   diretory as the path in question), git finds that the first\n+   directory as the path in question), git finds that the first\n    line matches.  `merge` attribute is set.  It also finds that\n    the second line matches, and attributes `foo` and `bar`\n    are unset.\n@@ -410,7 +410,7 @@ the attributes given to path `t/abc` are computed as follows:\n    a match, and `foo` is set, `bar` is reverted to unspecified\n    state, and `baz` is unset.\n \n-As the result, the attributes assignement to `t/abc` becomes:\n+As the result, the attributes assignment to `t/abc` becomes:\n \n ----------------------------------------------------------------\n foo\tset to true\ndiff --git a/Documentation/hooks.txt b/Documentation/hooks.txt\nindex 6836477..c39edc5 100644\n--- a/Documentation/hooks.txt\n+++ b/Documentation/hooks.txt\n@@ -176,7 +176,7 @@ hook does on its standard input.\n This hook does not affect the outcome of `git-receive-pack`, as it\n is called after the real work is done.\n \n-This supersedes the <<post-update,'post-update'>> hook in that it get's\n+This supersedes the <<post-update,'post-update'>> hook in that it gets\n both old and new values of all the refs in addition to their\n names.\n \ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex bd9fbee..fff1068 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -339,7 +339,7 @@ $ git pull . remotes/bob/master\n -------------------------------------\n \n Note that git pull always merges into the current branch,\n-regardless of what else is given on the commandline.\n+regardless of what else is given on the command line.\n \n Later, Bob can update his repo with Alice's latest changes using\n \ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex f89952a..3d02198 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -4,7 +4,7 @@ ______________________________________________\n \n Git is a fast distributed revision control system.\n \n-This manual is designed to be readable by someone with basic unix\n+This manual is designed to be readable by someone with basic UNIX\n command-line skills, but no previous knowledge of git.\n \n <<repositories-and-branches>> and <<exploring-git-history>> explain how\n@@ -217,7 +217,7 @@ commits will help understand how the git organizes history.\n \n In the following, we say that commit X is \"reachable\" from commit Y\n if commit X is an ancestor of commit Y.  Equivalently, you could say\n-that Y is a descendent of X, or that there is a chain of parents\n+that Y is a descendant of X, or that there is a chain of parents\n leading from commit Y to commit X.\n \n [[history-diagrams]]\n@@ -1911,7 +1911,7 @@ gitlink:git-update-server-info[1], and the documentation\n link:hooks.html[Hooks used by git].)\n \n Advertise the url of proj.git.  Anybody else should then be able to\n-clone or pull from that url, for example with a commandline like:\n+clone or pull from that url, for example with a command line like:\n \n -------------------------------------------------\n $ git clone http://yourserver.com/~you/proj.git\n@@ -2531,7 +2531,7 @@ them again with gitlink:git-am[1].\n Other tools\n -----------\n \n-There are numerous other tools, such as stgit, which exist for the\n+There are numerous other tools, such as StGIT, which exist for the\n purpose of maintaining a patch series.  These are outside of the scope of\n this manual.\n \n@@ -3961,8 +3961,8 @@ This is a work in progress.\n \n The basic requirements:\n \t- It must be readable in order, from beginning to end, by\n-\t  someone intelligent with a basic grasp of the unix\n-\t  commandline, but without any special knowledge of git.  If\n+\t  someone intelligent with a basic grasp of the UNIX\n+\t  command line, but without any special knowledge of git.  If\n \t  necessary, any other prerequisites should be specifically\n \t  mentioned as they arise.\n \t- Whenever possible, section headings should clearly describe\n-- \n1.5.3.rc6.17.g1911\n"}]}