{"thread":{"id":"26174","subject":"[PATCH] Fix typos in the documentation","startedAt":"2011-01-02T05:56:54Z","lastAt":"2011-01-04T19:18:20Z","messageCount":4,"participants":["Ralf Wildenhues","Drew Northup","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"158808","messageId":"20110102055653.GI19818@gmx.de","threadId":"26174","inReplyTo":null,"subject":"[PATCH] Fix typos in the documentation","fromName":"Ralf Wildenhues","fromEmail":"ralf.wildenhues@gmx.de","sentAt":"2011-01-02T05:56:54Z","receivedAt":"2011-01-02T05:56:54Z","isPatch":true,"sender":{"key":"ralf.wildenhues@gmx.de","avatar":null},"body":"Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>\n---\n\nBased on master not maint as the former has more typos.\n\nThanks for git,\nRalf\n\n Documentation/CodingGuidelines           |    2 +-\n Documentation/RelNotes/1.7.4.txt         |    9 ++++-----\n Documentation/config.txt                 |    4 ++--\n Documentation/git-add.txt                |    2 +-\n Documentation/git-bundle.txt             |    2 +-\n Documentation/git-fmt-merge-msg.txt      |    2 +-\n Documentation/git-remote-ext.txt         |   16 ++++++++--------\n Documentation/git-remote-fd.txt          |    8 ++++----\n Documentation/git-svn.txt                |    2 +-\n Documentation/gitmodules.txt             |    2 +-\n Documentation/merge-config.txt           |    2 +-\n Documentation/technical/api-sigchain.txt |    2 +-\n 12 files changed, 26 insertions(+), 27 deletions(-)\n\ndiff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines\nindex 1b1c45d..ba2006d 100644\n--- a/Documentation/CodingGuidelines\n+++ b/Documentation/CodingGuidelines\n@@ -157,7 +157,7 @@ Writing Documentation:\n    --sort=<key>\n    --abbrev[=<n>]\n \n- Possibility of multiple occurences is indicated by three dots:\n+ Possibility of multiple occurrences is indicated by three dots:\n    <file>...\n    (One or more of <file>.)\n \ndiff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt\nindex b736d39..5619641 100644\n--- a/Documentation/RelNotes/1.7.4.txt\n+++ b/Documentation/RelNotes/1.7.4.txt\n@@ -8,12 +8,11 @@ Updates since v1.7.3\n    docbook-xsl >= 1.73. If you have older versions, you can set\n    ASCIIDOC7 and ASCIIDOC_ROFF, respectively.\n \n- * The option parsers of various commands that create new branch (or\n+ * The option parsers of various commands that create new branches (or\n    rename existing ones to a new name) were too loose and users were\n-   allowed to call a branch with a name that begins with a dash by\n-   creative abuse of their command line options, which only lead to\n-   burn themselves.  The name of a branch cannot begin with a dash\n-   now.\n+   allowed to give a branch a name that begins with a dash by creative\n+   abuse of their command line options, which only led to burn themselves.\n+   The name of a branch cannot begin with a dash now.\n \n  * System-wide fallback default attributes can be stored in\n    /etc/gitattributes; core.attributesfile configuration variable can\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex a8759cf..ff7c225 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -892,7 +892,7 @@ diff.wordRegex::\n \n fetch.recurseSubmodules::\n \tA boolean value which changes the behavior for fetch and pull, the\n-\tdefault is to not recursively fetch populated sumodules unless\n+\tdefault is to not recursively fetch populated submodules unless\n \tconfigured otherwise.\n \n fetch.unpackLimit::\n@@ -1811,7 +1811,7 @@ submodule.<name>.update::\n \n submodule.<name>.fetchRecurseSubmodules::\n \tThis option can be used to enable/disable recursive fetching of this\n-\tsubmodule. It can be overriden by using the --[no-]recurse-submodules\n+\tsubmodule. It can be overridden by using the --[no-]recurse-submodules\n \tcommand line option to \"git fetch\" and \"git pull\".\n \tThis setting will override that from in the linkgit:gitmodules[5]\n \tfile.\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex 54aaaeb..a03448f 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -333,7 +333,7 @@ likely to introduce confusing changes to the index.\n There are also more complex operations that can be performed. But beware\n that because the patch is applied only to the index and not the working\n tree, the working tree will appear to \"undo\" the change in the index.\n-For example, introducing a a new line into the index that is in neither\n+For example, introducing a new line into the index that is in neither\n the HEAD nor the working tree will stage the new line for commit, but\n the line will appear to be reverted in the working tree.\n \ndiff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt\nindex 6266a3a..299007b 100644\n--- a/Documentation/git-bundle.txt\n+++ b/Documentation/git-bundle.txt\n@@ -59,7 +59,7 @@ unbundle <file>::\n \n <git-rev-list-args>::\n \tA list of arguments, acceptable to 'git rev-parse' and\n-\t'git rev-list' (and containg a named ref, see SPECIFYING REFERENCES\n+\t'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES\n \tbelow), that specifies the specific objects and references\n \tto transport.  For example, `master{tilde}10..master` causes the\n \tcurrent master reference to be packaged along with all objects\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nindex 40dba8c..75adf7a 100644\n--- a/Documentation/git-fmt-merge-msg.txt\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -57,7 +57,7 @@ merge.log::\n \tIn addition to branch names, populate the log message with at\n \tmost the specified number of one-line descriptions from the\n \tactual commits that are being merged.  Defaults to false, and\n-\ttrue is a synoym for 20.\n+\ttrue is a synonym for 20.\n \n merge.summary::\n \tSynonym to `merge.log`; this is deprecated and will be removed in\ndiff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt\nindex f4fbf67..2d65cfe 100644\n--- a/Documentation/git-remote-ext.txt\n+++ b/Documentation/git-remote-ext.txt\n@@ -15,12 +15,12 @@ This remote helper uses the specified 'program' to connect\n to a remote git server.\n \n Data written to stdin of this specified 'program' is assumed\n-to be sent to git:// server, git-upload-pack, git-receive-pack\n+to be sent to a git:// server, git-upload-pack, git-receive-pack\n or git-upload-archive (depending on situation), and data read\n from stdout of this program is assumed to be received from\n the same service.\n \n-Command and arguments are separated by unescaped space.\n+Command and arguments are separated by an unescaped space.\n \n The following sequences have a special meaning:\n \n@@ -39,19 +39,19 @@ The following sequences have a special meaning:\n \tgit-upload-pack, or git-upload-archive) of the service\n \tgit wants to invoke.\n \n-'%G' (must be first characters in argument)::\n+'%G' (must be the first characters in an argument)::\n \tThis argument will not be passed to 'program'. Instead, it\n-\twill cause helper to start by sending git:// service request to\n-\tremote side with service field set to approiate value and\n-\trepository field set to rest of the argument. Default is not to send\n-\tsuch request.\n+\twill cause the helper to start by sending git:// service requests to\n+\tthe remote side with the service field set to an appropriate value and\n+\tthe repository field set to rest of the argument. Default is not to send\n+\tsuch a request.\n +\n This is useful if remote side is git:// server accessed over\n some tunnel.\n \n '%V' (must be first characters in argument)::\n \tThis argument will not be passed to 'program'. Instead it sets\n-\tthe vhost field in git:// service request (to rest of the argument).\n+\tthe vhost field in the git:// service request (to rest of the argument).\n \tDefault is not to send vhost in such request (if sent).\n \n ENVIRONMENT VARIABLES:\ndiff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt\nindex abc4944..4aecd4d 100644\n--- a/Documentation/git-remote-fd.txt\n+++ b/Documentation/git-remote-fd.txt\n@@ -11,20 +11,20 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-This helper uses specified file descriptors to connect to remote git server.\n+This helper uses specified file descriptors to connect to a remote git server.\n This is not meant for end users but for programs and scripts calling git\n fetch, push or archive.\n \n-If only <infd> is given, it is assumed to be bidirectional socket connected\n+If only <infd> is given, it is assumed to be a bidirectional socket connected\n to remote git server (git-upload-pack, git-receive-pack or\n git-upload-achive). If both <infd> and <outfd> are given, they are assumed\n-to be pipes connected to remote git server (<infd> being the inbound pipe\n+to be pipes connected to a remote git server (<infd> being the inbound pipe\n and <outfd> being the outbound pipe.\n \n It is assumed that any handshaking procedures have already been completed\n (such as sending service request for git://) before this helper is started.\n \n-<anything> can be any string. It is ignored. It is meant for provoding\n+<anything> can be any string. It is ignored. It is meant for providing\n information to user in the URL in case that URL is displayed in some\n context.\n \ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex 139d314..254d044 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -613,7 +613,7 @@ old references to SVN revision numbers in existing documentation, bug\n reports and archives.  If you plan to eventually migrate from SVN to git\n and are certain about dropping SVN history, consider\n linkgit:git-filter-branch[1] instead.  filter-branch also allows\n-reformating of metadata for ease-of-reading and rewriting authorship\n+reformatting of metadata for ease-of-reading and rewriting authorship\n info for non-\"svn.authorsFile\" users.\n \n svn.useSvmProps::\ndiff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt\nindex 6c93202..6897794 100644\n--- a/Documentation/gitmodules.txt\n+++ b/Documentation/gitmodules.txt\n@@ -49,7 +49,7 @@ submodule.<name>.fetchRecurseSubmodules::\n \tsubmodule. If this option is also present in the submodules entry in\n \t.git/config of the superproject, the setting there will override the\n \tone found in .gitmodules.\n-\tBoth settings can be overriden on the command line by using the\n+\tBoth settings can be overridden on the command line by using the\n \t\"--[no-]recurse-submodules\" option to \"git fetch\" and \"git pull\"..\n \n submodule.<name>.ignore::\ndiff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt\nindex 92772e7..1e5c22c 100644\n--- a/Documentation/merge-config.txt\n+++ b/Documentation/merge-config.txt\n@@ -10,7 +10,7 @@ merge.log::\n \tIn addition to branch names, populate the log message with at\n \tmost the specified number of one-line descriptions from the\n \tactual commits that are being merged.  Defaults to false, and\n-\ttrue is a synoym for 20.\n+\ttrue is a synonym for 20.\n \n merge.renameLimit::\n \tThe number of files to consider when performing rename detection\ndiff --git a/Documentation/technical/api-sigchain.txt b/Documentation/technical/api-sigchain.txt\nindex 535cdff..9e1189e 100644\n--- a/Documentation/technical/api-sigchain.txt\n+++ b/Documentation/technical/api-sigchain.txt\n@@ -32,7 +32,7 @@ and installation code should look something like:\n   }\n ------------------------------------------\n \n-Handlers are given the typdef of sigchain_fun. This is the same type\n+Handlers are given the typedef of sigchain_fun. This is the same type\n that is given to signal() or sigaction(). It is perfectly reasonable to\n push SIG_DFL or SIG_IGN onto the stack.\n \n-- \n1.7.4.rc0\n"},{"id":"158850","messageId":"1294077450.12519.15.camel@drew-northup.unet.maine.edu","threadId":"26174","inReplyTo":"20110102055653.GI19818@gmx.de","subject":"Re: [PATCH] Fix typos in the documentation","fromName":"Drew Northup","fromEmail":"drew.northup@maine.edu","sentAt":"2011-01-03T17:57:30Z","receivedAt":"2011-01-03T17:57:30Z","isPatch":true,"sender":{"key":"drew.northup@maine.edu","avatar":"https://avatars.githubusercontent.com/u/18331571?v=4"},"body":"\nOn Sun, 2011-01-02 at 06:56 +0100, Ralf Wildenhues wrote:\n\n<snip for clarity> \n> diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt\n> index b736d39..5619641 100644\n> --- a/Documentation/RelNotes/1.7.4.txt\n> +++ b/Documentation/RelNotes/1.7.4.txt\n> @@ -8,12 +8,11 @@ Updates since v1.7.3\n>     docbook-xsl >= 1.73. If you have older versions, you can set\n>     ASCIIDOC7 and ASCIIDOC_ROFF, respectively.\n>  \n> - * The option parsers of various commands that create new branch (or\n> + * The option parsers of various commands that create new branches (or\n>     rename existing ones to a new name) were too loose and users were\n> -   allowed to call a branch with a name that begins with a dash by\n> -   creative abuse of their command line options, which only lead to\n> -   burn themselves.  The name of a branch cannot begin with a dash\n> -   now.\n> +   allowed to give a branch a name that begins with a dash by creative\n> +   abuse of their command line options, which only led to burn themselves.\n> +   The name of a branch cannot begin with a dash now.\n>  \n>   * System-wide fallback default attributes can be stored in\n>     /etc/gitattributes; core.attributesfile configuration variable can\n<snip for clarity>\n\nRalf,\nPerhaps that should be:\n\n- * The option parsers of various commands that create new branch (or\n+ * The option parsers of various commands that create new branches (or\n    rename existing ones to a new name) were too loose and users were\n-   allowed to call a branch with a name that begins with a dash by\n-   creative abuse of their command line options, which only lead to\n-   burn themselves.  The name of a branch cannot begin with a dash\n-   now.\n+   allowed to give a branch a name that begins with a dash by creative\n+   abuse of their command line options, which only led to burning \n+   themselves. The name of a branch cannot begin with a dash now.\n\n(for consistency)?\n\n-- \n-Drew Northup N1XIM\n   AKA RvnPhnx on OPN\n________________________________________________\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"158853","messageId":"20110103190334.GA3767@gmx.de","threadId":"26174","inReplyTo":"1294077450.12519.15.camel@drew-northup.unet.maine.edu","subject":"[PATCH] Fix typos in the documentation","fromName":"Ralf Wildenhues","fromEmail":"ralf.wildenhues@gmx.de","sentAt":"2011-01-03T19:03:34Z","receivedAt":"2011-01-03T19:03:34Z","isPatch":true,"sender":{"key":"ralf.wildenhues@gmx.de","avatar":null},"body":"Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>\n---\n\nHello Drew,\n\n* Drew Northup wrote on Mon, Jan 03, 2011 at 06:57:30PM CET:\n> On Sun, 2011-01-02 at 06:56 +0100, Ralf Wildenhues wrote:\n> > --- a/Documentation/RelNotes/1.7.4.txt\n> > +++ b/Documentation/RelNotes/1.7.4.txt\n\n> > - * The option parsers of various commands that create new branch (or\n> > + * The option parsers of various commands that create new branches (or\n> >     rename existing ones to a new name) were too loose and users were\n> > -   allowed to call a branch with a name that begins with a dash by\n> > -   creative abuse of their command line options, which only lead to\n> > -   burn themselves.  The name of a branch cannot begin with a dash\n> > -   now.\n> > +   allowed to give a branch a name that begins with a dash by creative\n> > +   abuse of their command line options, which only led to burn themselves.\n> > +   The name of a branch cannot begin with a dash now.\n\n> Ralf,\n> Perhaps that should be:\n> \n> - * The option parsers of various commands that create new branch (or\n> + * The option parsers of various commands that create new branches (or\n>     rename existing ones to a new name) were too loose and users were\n> -   allowed to call a branch with a name that begins with a dash by\n> -   creative abuse of their command line options, which only lead to\n> -   burn themselves.  The name of a branch cannot begin with a dash\n> -   now.\n> +   allowed to give a branch a name that begins with a dash by creative\n> +   abuse of their command line options, which only led to burning \n> +   themselves. The name of a branch cannot begin with a dash now.\n> \n> (for consistency)?\n\nAs far as I can see, the only difference between my and your change is\n\"burn\" vs. \"burning\" (ignoring trailing white space).  I don't see what\nyour version is consistent to that mine isn't, but I think that yours\nis the grammatically correct way.  I'm not a native speaker though.\nAnyway, here's the updated patch.\n\nThanks,\nRalf\n\n Documentation/CodingGuidelines           |    2 +-\n Documentation/RelNotes/1.7.4.txt         |    9 ++++-----\n Documentation/config.txt                 |    4 ++--\n Documentation/git-add.txt                |    2 +-\n Documentation/git-bundle.txt             |    2 +-\n Documentation/git-fmt-merge-msg.txt      |    2 +-\n Documentation/git-remote-ext.txt         |   16 ++++++++--------\n Documentation/git-remote-fd.txt          |    8 ++++----\n Documentation/git-svn.txt                |    2 +-\n Documentation/gitmodules.txt             |    2 +-\n Documentation/merge-config.txt           |    2 +-\n Documentation/technical/api-sigchain.txt |    2 +-\n 12 files changed, 26 insertions(+), 27 deletions(-)\n\ndiff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines\nindex 1b1c45d..ba2006d 100644\n--- a/Documentation/CodingGuidelines\n+++ b/Documentation/CodingGuidelines\n@@ -157,7 +157,7 @@ Writing Documentation:\n    --sort=<key>\n    --abbrev[=<n>]\n \n- Possibility of multiple occurences is indicated by three dots:\n+ Possibility of multiple occurrences is indicated by three dots:\n    <file>...\n    (One or more of <file>.)\n \ndiff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt\nindex b736d39..375fea1 100644\n--- a/Documentation/RelNotes/1.7.4.txt\n+++ b/Documentation/RelNotes/1.7.4.txt\n@@ -8,12 +8,11 @@ Updates since v1.7.3\n    docbook-xsl >= 1.73. If you have older versions, you can set\n    ASCIIDOC7 and ASCIIDOC_ROFF, respectively.\n \n- * The option parsers of various commands that create new branch (or\n+ * The option parsers of various commands that create new branches (or\n    rename existing ones to a new name) were too loose and users were\n-   allowed to call a branch with a name that begins with a dash by\n-   creative abuse of their command line options, which only lead to\n-   burn themselves.  The name of a branch cannot begin with a dash\n-   now.\n+   allowed to give a branch a name that begins with a dash by creative\n+   abuse of their command line options, which only led to burning\n+   themselves.  The name of a branch cannot begin with a dash now.\n \n  * System-wide fallback default attributes can be stored in\n    /etc/gitattributes; core.attributesfile configuration variable can\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex a8759cf..ff7c225 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -892,7 +892,7 @@ diff.wordRegex::\n \n fetch.recurseSubmodules::\n \tA boolean value which changes the behavior for fetch and pull, the\n-\tdefault is to not recursively fetch populated sumodules unless\n+\tdefault is to not recursively fetch populated submodules unless\n \tconfigured otherwise.\n \n fetch.unpackLimit::\n@@ -1811,7 +1811,7 @@ submodule.<name>.update::\n \n submodule.<name>.fetchRecurseSubmodules::\n \tThis option can be used to enable/disable recursive fetching of this\n-\tsubmodule. It can be overriden by using the --[no-]recurse-submodules\n+\tsubmodule. It can be overridden by using the --[no-]recurse-submodules\n \tcommand line option to \"git fetch\" and \"git pull\".\n \tThis setting will override that from in the linkgit:gitmodules[5]\n \tfile.\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex 54aaaeb..a03448f 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -333,7 +333,7 @@ likely to introduce confusing changes to the index.\n There are also more complex operations that can be performed. But beware\n that because the patch is applied only to the index and not the working\n tree, the working tree will appear to \"undo\" the change in the index.\n-For example, introducing a a new line into the index that is in neither\n+For example, introducing a new line into the index that is in neither\n the HEAD nor the working tree will stage the new line for commit, but\n the line will appear to be reverted in the working tree.\n \ndiff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt\nindex 6266a3a..299007b 100644\n--- a/Documentation/git-bundle.txt\n+++ b/Documentation/git-bundle.txt\n@@ -59,7 +59,7 @@ unbundle <file>::\n \n <git-rev-list-args>::\n \tA list of arguments, acceptable to 'git rev-parse' and\n-\t'git rev-list' (and containg a named ref, see SPECIFYING REFERENCES\n+\t'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES\n \tbelow), that specifies the specific objects and references\n \tto transport.  For example, `master{tilde}10..master` causes the\n \tcurrent master reference to be packaged along with all objects\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nindex 40dba8c..75adf7a 100644\n--- a/Documentation/git-fmt-merge-msg.txt\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -57,7 +57,7 @@ merge.log::\n \tIn addition to branch names, populate the log message with at\n \tmost the specified number of one-line descriptions from the\n \tactual commits that are being merged.  Defaults to false, and\n-\ttrue is a synoym for 20.\n+\ttrue is a synonym for 20.\n \n merge.summary::\n \tSynonym to `merge.log`; this is deprecated and will be removed in\ndiff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt\nindex f4fbf67..2d65cfe 100644\n--- a/Documentation/git-remote-ext.txt\n+++ b/Documentation/git-remote-ext.txt\n@@ -15,12 +15,12 @@ This remote helper uses the specified 'program' to connect\n to a remote git server.\n \n Data written to stdin of this specified 'program' is assumed\n-to be sent to git:// server, git-upload-pack, git-receive-pack\n+to be sent to a git:// server, git-upload-pack, git-receive-pack\n or git-upload-archive (depending on situation), and data read\n from stdout of this program is assumed to be received from\n the same service.\n \n-Command and arguments are separated by unescaped space.\n+Command and arguments are separated by an unescaped space.\n \n The following sequences have a special meaning:\n \n@@ -39,19 +39,19 @@ The following sequences have a special meaning:\n \tgit-upload-pack, or git-upload-archive) of the service\n \tgit wants to invoke.\n \n-'%G' (must be first characters in argument)::\n+'%G' (must be the first characters in an argument)::\n \tThis argument will not be passed to 'program'. Instead, it\n-\twill cause helper to start by sending git:// service request to\n-\tremote side with service field set to approiate value and\n-\trepository field set to rest of the argument. Default is not to send\n-\tsuch request.\n+\twill cause the helper to start by sending git:// service requests to\n+\tthe remote side with the service field set to an appropriate value and\n+\tthe repository field set to rest of the argument. Default is not to send\n+\tsuch a request.\n +\n This is useful if remote side is git:// server accessed over\n some tunnel.\n \n '%V' (must be first characters in argument)::\n \tThis argument will not be passed to 'program'. Instead it sets\n-\tthe vhost field in git:// service request (to rest of the argument).\n+\tthe vhost field in the git:// service request (to rest of the argument).\n \tDefault is not to send vhost in such request (if sent).\n \n ENVIRONMENT VARIABLES:\ndiff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt\nindex abc4944..4aecd4d 100644\n--- a/Documentation/git-remote-fd.txt\n+++ b/Documentation/git-remote-fd.txt\n@@ -11,20 +11,20 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-This helper uses specified file descriptors to connect to remote git server.\n+This helper uses specified file descriptors to connect to a remote git server.\n This is not meant for end users but for programs and scripts calling git\n fetch, push or archive.\n \n-If only <infd> is given, it is assumed to be bidirectional socket connected\n+If only <infd> is given, it is assumed to be a bidirectional socket connected\n to remote git server (git-upload-pack, git-receive-pack or\n git-upload-achive). If both <infd> and <outfd> are given, they are assumed\n-to be pipes connected to remote git server (<infd> being the inbound pipe\n+to be pipes connected to a remote git server (<infd> being the inbound pipe\n and <outfd> being the outbound pipe.\n \n It is assumed that any handshaking procedures have already been completed\n (such as sending service request for git://) before this helper is started.\n \n-<anything> can be any string. It is ignored. It is meant for provoding\n+<anything> can be any string. It is ignored. It is meant for providing\n information to user in the URL in case that URL is displayed in some\n context.\n \ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex 139d314..254d044 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -613,7 +613,7 @@ old references to SVN revision numbers in existing documentation, bug\n reports and archives.  If you plan to eventually migrate from SVN to git\n and are certain about dropping SVN history, consider\n linkgit:git-filter-branch[1] instead.  filter-branch also allows\n-reformating of metadata for ease-of-reading and rewriting authorship\n+reformatting of metadata for ease-of-reading and rewriting authorship\n info for non-\"svn.authorsFile\" users.\n \n svn.useSvmProps::\ndiff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt\nindex 6c93202..6897794 100644\n--- a/Documentation/gitmodules.txt\n+++ b/Documentation/gitmodules.txt\n@@ -49,7 +49,7 @@ submodule.<name>.fetchRecurseSubmodules::\n \tsubmodule. If this option is also present in the submodules entry in\n \t.git/config of the superproject, the setting there will override the\n \tone found in .gitmodules.\n-\tBoth settings can be overriden on the command line by using the\n+\tBoth settings can be overridden on the command line by using the\n \t\"--[no-]recurse-submodules\" option to \"git fetch\" and \"git pull\"..\n \n submodule.<name>.ignore::\ndiff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt\nindex 92772e7..1e5c22c 100644\n--- a/Documentation/merge-config.txt\n+++ b/Documentation/merge-config.txt\n@@ -10,7 +10,7 @@ merge.log::\n \tIn addition to branch names, populate the log message with at\n \tmost the specified number of one-line descriptions from the\n \tactual commits that are being merged.  Defaults to false, and\n-\ttrue is a synoym for 20.\n+\ttrue is a synonym for 20.\n \n merge.renameLimit::\n \tThe number of files to consider when performing rename detection\ndiff --git a/Documentation/technical/api-sigchain.txt b/Documentation/technical/api-sigchain.txt\nindex 535cdff..9e1189e 100644\n--- a/Documentation/technical/api-sigchain.txt\n+++ b/Documentation/technical/api-sigchain.txt\n@@ -32,7 +32,7 @@ and installation code should look something like:\n   }\n ------------------------------------------\n \n-Handlers are given the typdef of sigchain_fun. This is the same type\n+Handlers are given the typedef of sigchain_fun. This is the same type\n that is given to signal() or sigaction(). It is perfectly reasonable to\n push SIG_DFL or SIG_IGN onto the stack.\n \n-- \n1.7.4.rc0\n"},{"id":"158904","messageId":"7vr5csfpfn.fsf@alter.siamese.dyndns.org","threadId":"26174","inReplyTo":"20110103190334.GA3767@gmx.de","subject":"Re: [PATCH] Fix typos in the documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-01-04T19:18:20Z","receivedAt":"2011-01-04T19:18:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Wildenhues <Ralf.Wildenhues@gmx.de> writes:\n\n> Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>\n> ---\n>\n> ...\n> As far as I can see, the only difference between my and your change is\n> \"burn\" vs. \"burning\" (ignoring trailing white space).  I don't see what\n> your version is consistent to that mine isn't, but I think that yours\n> is the grammatically correct way.  I'm not a native speaker though.\n> Anyway, here's the updated patch.\n\nThanks for your attention to the details.  Will apply.\n"}]}