[PATCH] Fix typos in the documentation.

[PATCH] Fix typos in the documentation.

[Ralf Wildenhues]

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

This patch is against pu.

Cheers, and thanks for git,
Ralf

 Documentation/RelNotes-1.6.0.4.txt        |    2 +-
 Documentation/RelNotes-1.6.1.txt          |    6 +++---
 Documentation/config.txt                  |    2 +-
 Documentation/git-add.txt                 |    2 +-
 Documentation/git-bisect.txt              |    6 +++---
 Documentation/git-commit.txt              |    2 +-
 Documentation/git-svn.txt                 |    2 +-
 Documentation/technical/pack-protocol.txt |    4 ++--
 Documentation/user-manual.txt             |    2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Documentation/RelNotes-1.6.0.4.txt b/Documentation/RelNotes-1.6.0.4.txt
index fba3f30..d522661 100644
--- a/Documentation/RelNotes-1.6.0.4.txt
+++ b/Documentation/RelNotes-1.6.0.4.txt
@@ -30,7 +30,7 @@ Fixes since v1.6.0.3
 * 'git status' incorrectly reported a submodule directory as an untracked
   directory.
 
-* 'git svn' used deprecated 'git-foo' form of subcommand invocaition.
+* 'git svn' used deprecated 'git-foo' form of subcommand invocation.
 
 * 'git update-ref -d' to remove a reference did not honor --no-deref option.
 
diff --git a/Documentation/RelNotes-1.6.1.txt b/Documentation/RelNotes-1.6.1.txt
index 7fdf83f..848541a 100644
--- a/Documentation/RelNotes-1.6.1.txt
+++ b/Documentation/RelNotes-1.6.1.txt
@@ -55,9 +55,9 @@ on.
   to a non-zero value to accept the suggestion when git can uniquely
   guess.
 
-* The packfile machinery hopefully is more robust when dealilng with
+* The packfile machinery hopefully is more robust when dealing with
   corrupt packs if redundant objects involved in the corruption are
-  available elsehwere.
+  available elsewhere.
 
 * "git add -N path..." adds the named paths as an empty blob, so that
   subsequent "git diff" will show a diff as if they are creation events.
@@ -157,7 +157,7 @@ on.
 * "git log" learned "--source" to show what ref each commit was reached
   from.
 
-* "git log" also learned "--simplify-by-decration" to show the
+* "git log" also learned "--simplify-by-decoration" to show the
   birds-eye-view of the topology of the history.
 
 * "git log --pretty=format:" learned "%d" format element that inserts
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2283300..6d51967 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -841,7 +841,7 @@ gui.fastcopyblame::
 	repositories at the expense of less thorough copy detection.
 
 gui.copyblamethreshold::
-	Specifies the theshold to use in 'git gui blame' original location
+	Specifies the threshold to use in 'git gui blame' original location
 	detection, measured in alphanumeric characters. See the
 	linkgit:git-blame[1] manual for more information on copy detection.
 
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 6fc20b0..7c129cb 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -98,7 +98,7 @@ OPTIONS
 	Record only the fact that the path will be added later. An entry
 	for the path is placed in the index with no content. This is
 	useful for, among other things, showing the unstaged content of
-	such files with 'git diff' and commiting them with 'git commit
+	such files with 'git diff' and committing them with 'git commit
 	-a'.
 
 --refresh::
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 2ac77fb..75083e6 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -192,10 +192,10 @@ Bisect replace
 
 This subcommand can help when you have a branch or a part of a
 branch that isn't easily bisectable because of a bug that has been
-fixed latter.
+fixed later.
 
 We suppose that a bug as been introduced at some point, say A, and
-that it has been fixed latter at another point, say B, but that
+that it has been fixed later at another point, say B, but that
 between these points the code is not easily testable because of the
 bug, so it's not easy to bisect between these points.
 
@@ -244,7 +244,7 @@ because the bug introduced by commit A and fixed by commit B will not
 annoy you anymore.
 
 As the refs created by "git bisect replace" can be shared between
-developers, this feature might be especially usefull on big projects
+developers, this feature might be especially useful on big projects
 where many people often bisect the same code base.
 
 If you give the `--no-replace` to "git bisect start", then the
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index a1ce9a8..6203461 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -95,7 +95,7 @@ OPTIONS
 
 -s::
 --signoff::
-	Add Signed-off-by line by the commiter at the end of the commit
+	Add Signed-off-by line by the committer at the end of the commit
 	log message.
 
 -n::
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index ba94cd1..8d0c421 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -109,7 +109,7 @@ COMMANDS
 
 This works similarly to `svn update` or 'git-pull' except that
 it preserves linear history with 'git-rebase' instead of
-'git-merge' for ease of dcommiting with 'git-svn'.
+'git-merge' for ease of dcommitting with 'git-svn'.
 
 This accepts all options that 'git-svn fetch' and 'git-rebase'
 accept.  However, '--fetch-all' only fetches from the current
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index 7396f69..696dd00 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -59,13 +59,13 @@ When tellme-more extension is used:
 	C: SHA1 old-SHA1 -- This is ancestor of that, you might know
 	C: SHA1 old-SHA1
 	C: ...
-	C: # flush -- have you heard ehough?
+	C: # flush -- have you heard enough?
 	S: tellme-more old-SHA1' -- I still want to know more about this one
 	S: # flush -- please give me more
 	C: SHA1 old-SHA1'
 	C: SHA1 old-SHA1'
 	C: ...
-	C: # flush -- have you heard ehough?
+	C: # flush -- have you heard enough?
 	S: # flush -- yes, thanks, we've heard enough
 	S: XXXXXXX --- packfile contents.
 
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index c0d8caf..da9c6b2 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -546,7 +546,7 @@ $ git bisect skip
 -------------------------------------------------
 
 In this case, though, git may not eventually be able to tell the first
-bad one between some first skipped commits and a latter bad commit.
+bad one between some first skipped commits and a later bad commit.
 
 There are also ways to automate the bisecting process if you have a
 test script that can tell a good from a bad commit. See
-- 
1.6.0.4.766.g6fc4a

Re: [PATCH] Fix typos in the documentation.

[Andreas Ericsson]

Ralf Wildenhues wrote:
> Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
> ---
> 
> This patch is against pu.
> 

'pu' is a moving target in git. For future reference, it's
better to send patches against 'master'.

Other than that:
Acked-by: Andreas Ericsson <ae@op5.se>

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231

Re: [PATCH] Fix typos in the documentation.

[Junio C Hamano]

Ralf Wildenhues <Ralf.Wildenhues@gmx.de> writes:

> Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
> ---
>
> This patch is against pu.

While I appreciate your fix, it would have been nicer to have at least
three patches in this case, organized like this:

 * patch 1 applies to 'maint'. Let's call the result of such application
   'maint plus fix';

   In other words:

	$ git checkout -b rw/maint-typofix maint
        $ git am -s patch-1

 * patch 2 is to be applied on top of the result of merging 'maint plus
   fix' into 'master';

   In other words:

	$ git checkout -b rw/typofix master
        $ git merge rw/maint-typofix
        $ git am -s patch-2

 * patch 3 is to contain everything else (it would be even nicer if they
   are split up to apply to individual topic branches that are responsible
   for introducing the typos, but I realize that it would be asking too
   much).

   In other words:

	$ git checkout pu
        $ git merge rw/typofix
        $ git am -s patch-3

I've done the above splitting myself and further did:

	$ git checkout maint
        $ git merge rw/maint-typofix
        $ git branch -d rw/maint-typofix
        $ git checkout master
        $ git merge rw/typofix
        $ git branch -d rw/typofix

I did not create a single "patch-3" but squashed the fixes in to the
respective commits on the topic branches, as they are only on 'pu' and not
part of 'next' (hence I am free to amend and rebase them).

Thanks.

Re: [PATCH] Fix typos in the documentation.

[Ralf Wildenhues]

Hello Andreas, Junio,

* Andreas Ericsson wrote on Thu, Nov 27, 2008 at 10:10:45AM CET:
> Ralf Wildenhues wrote:
>>
>> This patch is against pu.

> 'pu' is a moving target in git. For future reference, it's
> better to send patches against 'master'.

* Junio C Hamano wrote on Thu, Nov 27, 2008 at 10:48:56AM CET:
> 
> While I appreciate your fix, it would have been nicer to have at least
> three patches in this case, organized like this:

Both obvious improvements.  Thanks for teaching me again how to properly
behave on this list, I've not been following it for a while and forgot.

Cheers, and keep up the good work,
Ralf

[PATCH] Fix typos in the documentation

[Ralf Wildenhues]

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

Based on master not maint as the former has more typos.

Thanks for git,
Ralf

 Documentation/CodingGuidelines           |    2 +-
 Documentation/RelNotes/1.7.4.txt         |    9 ++++-----
 Documentation/config.txt                 |    4 ++--
 Documentation/git-add.txt                |    2 +-
 Documentation/git-bundle.txt             |    2 +-
 Documentation/git-fmt-merge-msg.txt      |    2 +-
 Documentation/git-remote-ext.txt         |   16 ++++++++--------
 Documentation/git-remote-fd.txt          |    8 ++++----
 Documentation/git-svn.txt                |    2 +-
 Documentation/gitmodules.txt             |    2 +-
 Documentation/merge-config.txt           |    2 +-
 Documentation/technical/api-sigchain.txt |    2 +-
 12 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 1b1c45d..ba2006d 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -157,7 +157,7 @@ Writing Documentation:
    --sort=<key>
    --abbrev[=<n>]
 
- Possibility of multiple occurences is indicated by three dots:
+ Possibility of multiple occurrences is indicated by three dots:
    <file>...
    (One or more of <file>.)
 
diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
index b736d39..5619641 100644
--- a/Documentation/RelNotes/1.7.4.txt
+++ b/Documentation/RelNotes/1.7.4.txt
@@ -8,12 +8,11 @@ Updates since v1.7.3
    docbook-xsl >= 1.73. If you have older versions, you can set
    ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
 
- * The option parsers of various commands that create new branch (or
+ * The option parsers of various commands that create new branches (or
    rename existing ones to a new name) were too loose and users were
-   allowed to call a branch with a name that begins with a dash by
-   creative abuse of their command line options, which only lead to
-   burn themselves.  The name of a branch cannot begin with a dash
-   now.
+   allowed to give a branch a name that begins with a dash by creative
+   abuse of their command line options, which only led to burn themselves.
+   The name of a branch cannot begin with a dash now.
 
  * System-wide fallback default attributes can be stored in
    /etc/gitattributes; core.attributesfile configuration variable can
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a8759cf..ff7c225 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -892,7 +892,7 @@ diff.wordRegex::
 
 fetch.recurseSubmodules::
 	A boolean value which changes the behavior for fetch and pull, the
-	default is to not recursively fetch populated sumodules unless
+	default is to not recursively fetch populated submodules unless
 	configured otherwise.
 
 fetch.unpackLimit::
@@ -1811,7 +1811,7 @@ submodule.<name>.update::
 
 submodule.<name>.fetchRecurseSubmodules::
 	This option can be used to enable/disable recursive fetching of this
-	submodule. It can be overriden by using the --[no-]recurse-submodules
+	submodule. It can be overridden by using the --[no-]recurse-submodules
 	command line option to "git fetch" and "git pull".
 	This setting will override that from in the linkgit:gitmodules[5]
 	file.
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 54aaaeb..a03448f 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -333,7 +333,7 @@ likely to introduce confusing changes to the index.
 There are also more complex operations that can be performed. But beware
 that because the patch is applied only to the index and not the working
 tree, the working tree will appear to "undo" the change in the index.
-For example, introducing a a new line into the index that is in neither
+For example, introducing a new line into the index that is in neither
 the HEAD nor the working tree will stage the new line for commit, but
 the line will appear to be reverted in the working tree.
 
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index 6266a3a..299007b 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -59,7 +59,7 @@ unbundle <file>::
 
 <git-rev-list-args>::
 	A list of arguments, acceptable to 'git rev-parse' and
-	'git rev-list' (and containg a named ref, see SPECIFYING REFERENCES
+	'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES
 	below), that specifies the specific objects and references
 	to transport.  For example, `master{tilde}10..master` causes the
 	current master reference to be packaged along with all objects
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 40dba8c..75adf7a 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -57,7 +57,7 @@ merge.log::
 	In addition to branch names, populate the log message with at
 	most the specified number of one-line descriptions from the
 	actual commits that are being merged.  Defaults to false, and
-	true is a synoym for 20.
+	true is a synonym for 20.
 
 merge.summary::
 	Synonym to `merge.log`; this is deprecated and will be removed in
diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt
index f4fbf67..2d65cfe 100644
--- a/Documentation/git-remote-ext.txt
+++ b/Documentation/git-remote-ext.txt
@@ -15,12 +15,12 @@ This remote helper uses the specified 'program' to connect
 to a remote git server.
 
 Data written to stdin of this specified 'program' is assumed
-to be sent to git:// server, git-upload-pack, git-receive-pack
+to be sent to a git:// server, git-upload-pack, git-receive-pack
 or git-upload-archive (depending on situation), and data read
 from stdout of this program is assumed to be received from
 the same service.
 
-Command and arguments are separated by unescaped space.
+Command and arguments are separated by an unescaped space.
 
 The following sequences have a special meaning:
 
@@ -39,19 +39,19 @@ The following sequences have a special meaning:
 	git-upload-pack, or git-upload-archive) of the service
 	git wants to invoke.
 
-'%G' (must be first characters in argument)::
+'%G' (must be the first characters in an argument)::
 	This argument will not be passed to 'program'. Instead, it
-	will cause helper to start by sending git:// service request to
-	remote side with service field set to approiate value and
-	repository field set to rest of the argument. Default is not to send
-	such request.
+	will cause the helper to start by sending git:// service requests to
+	the remote side with the service field set to an appropriate value and
+	the repository field set to rest of the argument. Default is not to send
+	such a request.
 +
 This is useful if remote side is git:// server accessed over
 some tunnel.
 
 '%V' (must be first characters in argument)::
 	This argument will not be passed to 'program'. Instead it sets
-	the vhost field in git:// service request (to rest of the argument).
+	the vhost field in the git:// service request (to rest of the argument).
 	Default is not to send vhost in such request (if sent).
 
 ENVIRONMENT VARIABLES:
diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt
index abc4944..4aecd4d 100644
--- a/Documentation/git-remote-fd.txt
+++ b/Documentation/git-remote-fd.txt
@@ -11,20 +11,20 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-This helper uses specified file descriptors to connect to remote git server.
+This helper uses specified file descriptors to connect to a remote git server.
 This is not meant for end users but for programs and scripts calling git
 fetch, push or archive.
 
-If only <infd> is given, it is assumed to be bidirectional socket connected
+If only <infd> is given, it is assumed to be a bidirectional socket connected
 to remote git server (git-upload-pack, git-receive-pack or
 git-upload-achive). If both <infd> and <outfd> are given, they are assumed
-to be pipes connected to remote git server (<infd> being the inbound pipe
+to be pipes connected to a remote git server (<infd> being the inbound pipe
 and <outfd> being the outbound pipe.
 
 It is assumed that any handshaking procedures have already been completed
 (such as sending service request for git://) before this helper is started.
 
-<anything> can be any string. It is ignored. It is meant for provoding
+<anything> can be any string. It is ignored. It is meant for providing
 information to user in the URL in case that URL is displayed in some
 context.
 
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 139d314..254d044 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -613,7 +613,7 @@ old references to SVN revision numbers in existing documentation, bug
 reports and archives.  If you plan to eventually migrate from SVN to git
 and are certain about dropping SVN history, consider
 linkgit:git-filter-branch[1] instead.  filter-branch also allows
-reformating of metadata for ease-of-reading and rewriting authorship
+reformatting of metadata for ease-of-reading and rewriting authorship
 info for non-"svn.authorsFile" users.
 
 svn.useSvmProps::
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 6c93202..6897794 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -49,7 +49,7 @@ submodule.<name>.fetchRecurseSubmodules::
 	submodule. If this option is also present in the submodules entry in
 	.git/config of the superproject, the setting there will override the
 	one found in .gitmodules.
-	Both settings can be overriden on the command line by using the
+	Both settings can be overridden on the command line by using the
 	"--[no-]recurse-submodules" option to "git fetch" and "git pull"..
 
 submodule.<name>.ignore::
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 92772e7..1e5c22c 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -10,7 +10,7 @@ merge.log::
 	In addition to branch names, populate the log message with at
 	most the specified number of one-line descriptions from the
 	actual commits that are being merged.  Defaults to false, and
-	true is a synoym for 20.
+	true is a synonym for 20.
 
 merge.renameLimit::
 	The number of files to consider when performing rename detection
diff --git a/Documentation/technical/api-sigchain.txt b/Documentation/technical/api-sigchain.txt
index 535cdff..9e1189e 100644
--- a/Documentation/technical/api-sigchain.txt
+++ b/Documentation/technical/api-sigchain.txt
@@ -32,7 +32,7 @@ and installation code should look something like:
   }
 ------------------------------------------
 
-Handlers are given the typdef of sigchain_fun. This is the same type
+Handlers are given the typedef of sigchain_fun. This is the same type
 that is given to signal() or sigaction(). It is perfectly reasonable to
 push SIG_DFL or SIG_IGN onto the stack.
 
-- 
1.7.4.rc0

Re: [PATCH] Fix typos in the documentation

[Drew Northup]

On Sun, 2011-01-02 at 06:56 +0100, Ralf Wildenhues wrote:

<snip for clarity> 
> diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
> index b736d39..5619641 100644
> --- a/Documentation/RelNotes/1.7.4.txt
> +++ b/Documentation/RelNotes/1.7.4.txt
> @@ -8,12 +8,11 @@ Updates since v1.7.3
>     docbook-xsl >= 1.73. If you have older versions, you can set
>     ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
>  
> - * The option parsers of various commands that create new branch (or
> + * The option parsers of various commands that create new branches (or
>     rename existing ones to a new name) were too loose and users were
> -   allowed to call a branch with a name that begins with a dash by
> -   creative abuse of their command line options, which only lead to
> -   burn themselves.  The name of a branch cannot begin with a dash
> -   now.
> +   allowed to give a branch a name that begins with a dash by creative
> +   abuse of their command line options, which only led to burn themselves.
> +   The name of a branch cannot begin with a dash now.
>  
>   * System-wide fallback default attributes can be stored in
>     /etc/gitattributes; core.attributesfile configuration variable can
<snip for clarity>

Ralf,
Perhaps that should be:

- * The option parsers of various commands that create new branch (or
+ * The option parsers of various commands that create new branches (or
    rename existing ones to a new name) were too loose and users were
-   allowed to call a branch with a name that begins with a dash by
-   creative abuse of their command line options, which only lead to
-   burn themselves.  The name of a branch cannot begin with a dash
-   now.
+   allowed to give a branch a name that begins with a dash by creative
+   abuse of their command line options, which only led to burning 
+   themselves. The name of a branch cannot begin with a dash now.

(for consistency)?

-- 
-Drew Northup N1XIM
   AKA RvnPhnx on OPN
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59

[PATCH] Fix typos in the documentation

[Ralf Wildenhues]

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

Hello Drew,

* Drew Northup wrote on Mon, Jan 03, 2011 at 06:57:30PM CET:
> On Sun, 2011-01-02 at 06:56 +0100, Ralf Wildenhues wrote:
> > --- a/Documentation/RelNotes/1.7.4.txt
> > +++ b/Documentation/RelNotes/1.7.4.txt

> > - * The option parsers of various commands that create new branch (or
> > + * The option parsers of various commands that create new branches (or
> >     rename existing ones to a new name) were too loose and users were
> > -   allowed to call a branch with a name that begins with a dash by
> > -   creative abuse of their command line options, which only lead to
> > -   burn themselves.  The name of a branch cannot begin with a dash
> > -   now.
> > +   allowed to give a branch a name that begins with a dash by creative
> > +   abuse of their command line options, which only led to burn themselves.
> > +   The name of a branch cannot begin with a dash now.

> Ralf,
> Perhaps that should be:
> 
> - * The option parsers of various commands that create new branch (or
> + * The option parsers of various commands that create new branches (or
>     rename existing ones to a new name) were too loose and users were
> -   allowed to call a branch with a name that begins with a dash by
> -   creative abuse of their command line options, which only lead to
> -   burn themselves.  The name of a branch cannot begin with a dash
> -   now.
> +   allowed to give a branch a name that begins with a dash by creative
> +   abuse of their command line options, which only led to burning 
> +   themselves. The name of a branch cannot begin with a dash now.
> 
> (for consistency)?

As far as I can see, the only difference between my and your change is
"burn" vs. "burning" (ignoring trailing white space).  I don't see what
your version is consistent to that mine isn't, but I think that yours
is the grammatically correct way.  I'm not a native speaker though.
Anyway, here's the updated patch.

Thanks,
Ralf

 Documentation/CodingGuidelines           |    2 +-
 Documentation/RelNotes/1.7.4.txt         |    9 ++++-----
 Documentation/config.txt                 |    4 ++--
 Documentation/git-add.txt                |    2 +-
 Documentation/git-bundle.txt             |    2 +-
 Documentation/git-fmt-merge-msg.txt      |    2 +-
 Documentation/git-remote-ext.txt         |   16 ++++++++--------
 Documentation/git-remote-fd.txt          |    8 ++++----
 Documentation/git-svn.txt                |    2 +-
 Documentation/gitmodules.txt             |    2 +-
 Documentation/merge-config.txt           |    2 +-
 Documentation/technical/api-sigchain.txt |    2 +-
 12 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 1b1c45d..ba2006d 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -157,7 +157,7 @@ Writing Documentation:
    --sort=<key>
    --abbrev[=<n>]
 
- Possibility of multiple occurences is indicated by three dots:
+ Possibility of multiple occurrences is indicated by three dots:
    <file>...
    (One or more of <file>.)
 
diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
index b736d39..375fea1 100644
--- a/Documentation/RelNotes/1.7.4.txt
+++ b/Documentation/RelNotes/1.7.4.txt
@@ -8,12 +8,11 @@ Updates since v1.7.3
    docbook-xsl >= 1.73. If you have older versions, you can set
    ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
 
- * The option parsers of various commands that create new branch (or
+ * The option parsers of various commands that create new branches (or
    rename existing ones to a new name) were too loose and users were
-   allowed to call a branch with a name that begins with a dash by
-   creative abuse of their command line options, which only lead to
-   burn themselves.  The name of a branch cannot begin with a dash
-   now.
+   allowed to give a branch a name that begins with a dash by creative
+   abuse of their command line options, which only led to burning
+   themselves.  The name of a branch cannot begin with a dash now.
 
  * System-wide fallback default attributes can be stored in
    /etc/gitattributes; core.attributesfile configuration variable can
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a8759cf..ff7c225 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -892,7 +892,7 @@ diff.wordRegex::
 
 fetch.recurseSubmodules::
 	A boolean value which changes the behavior for fetch and pull, the
-	default is to not recursively fetch populated sumodules unless
+	default is to not recursively fetch populated submodules unless
 	configured otherwise.
 
 fetch.unpackLimit::
@@ -1811,7 +1811,7 @@ submodule.<name>.update::
 
 submodule.<name>.fetchRecurseSubmodules::
 	This option can be used to enable/disable recursive fetching of this
-	submodule. It can be overriden by using the --[no-]recurse-submodules
+	submodule. It can be overridden by using the --[no-]recurse-submodules
 	command line option to "git fetch" and "git pull".
 	This setting will override that from in the linkgit:gitmodules[5]
 	file.
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 54aaaeb..a03448f 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -333,7 +333,7 @@ likely to introduce confusing changes to the index.
 There are also more complex operations that can be performed. But beware
 that because the patch is applied only to the index and not the working
 tree, the working tree will appear to "undo" the change in the index.
-For example, introducing a a new line into the index that is in neither
+For example, introducing a new line into the index that is in neither
 the HEAD nor the working tree will stage the new line for commit, but
 the line will appear to be reverted in the working tree.
 
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index 6266a3a..299007b 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -59,7 +59,7 @@ unbundle <file>::
 
 <git-rev-list-args>::
 	A list of arguments, acceptable to 'git rev-parse' and
-	'git rev-list' (and containg a named ref, see SPECIFYING REFERENCES
+	'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES
 	below), that specifies the specific objects and references
 	to transport.  For example, `master{tilde}10..master` causes the
 	current master reference to be packaged along with all objects
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 40dba8c..75adf7a 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -57,7 +57,7 @@ merge.log::
 	In addition to branch names, populate the log message with at
 	most the specified number of one-line descriptions from the
 	actual commits that are being merged.  Defaults to false, and
-	true is a synoym for 20.
+	true is a synonym for 20.
 
 merge.summary::
 	Synonym to `merge.log`; this is deprecated and will be removed in
diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt
index f4fbf67..2d65cfe 100644
--- a/Documentation/git-remote-ext.txt
+++ b/Documentation/git-remote-ext.txt
@@ -15,12 +15,12 @@ This remote helper uses the specified 'program' to connect
 to a remote git server.
 
 Data written to stdin of this specified 'program' is assumed
-to be sent to git:// server, git-upload-pack, git-receive-pack
+to be sent to a git:// server, git-upload-pack, git-receive-pack
 or git-upload-archive (depending on situation), and data read
 from stdout of this program is assumed to be received from
 the same service.
 
-Command and arguments are separated by unescaped space.
+Command and arguments are separated by an unescaped space.
 
 The following sequences have a special meaning:
 
@@ -39,19 +39,19 @@ The following sequences have a special meaning:
 	git-upload-pack, or git-upload-archive) of the service
 	git wants to invoke.
 
-'%G' (must be first characters in argument)::
+'%G' (must be the first characters in an argument)::
 	This argument will not be passed to 'program'. Instead, it
-	will cause helper to start by sending git:// service request to
-	remote side with service field set to approiate value and
-	repository field set to rest of the argument. Default is not to send
-	such request.
+	will cause the helper to start by sending git:// service requests to
+	the remote side with the service field set to an appropriate value and
+	the repository field set to rest of the argument. Default is not to send
+	such a request.
 +
 This is useful if remote side is git:// server accessed over
 some tunnel.
 
 '%V' (must be first characters in argument)::
 	This argument will not be passed to 'program'. Instead it sets
-	the vhost field in git:// service request (to rest of the argument).
+	the vhost field in the git:// service request (to rest of the argument).
 	Default is not to send vhost in such request (if sent).
 
 ENVIRONMENT VARIABLES:
diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt
index abc4944..4aecd4d 100644
--- a/Documentation/git-remote-fd.txt
+++ b/Documentation/git-remote-fd.txt
@@ -11,20 +11,20 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-This helper uses specified file descriptors to connect to remote git server.
+This helper uses specified file descriptors to connect to a remote git server.
 This is not meant for end users but for programs and scripts calling git
 fetch, push or archive.
 
-If only <infd> is given, it is assumed to be bidirectional socket connected
+If only <infd> is given, it is assumed to be a bidirectional socket connected
 to remote git server (git-upload-pack, git-receive-pack or
 git-upload-achive). If both <infd> and <outfd> are given, they are assumed
-to be pipes connected to remote git server (<infd> being the inbound pipe
+to be pipes connected to a remote git server (<infd> being the inbound pipe
 and <outfd> being the outbound pipe.
 
 It is assumed that any handshaking procedures have already been completed
 (such as sending service request for git://) before this helper is started.
 
-<anything> can be any string. It is ignored. It is meant for provoding
+<anything> can be any string. It is ignored. It is meant for providing
 information to user in the URL in case that URL is displayed in some
 context.
 
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 139d314..254d044 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -613,7 +613,7 @@ old references to SVN revision numbers in existing documentation, bug
 reports and archives.  If you plan to eventually migrate from SVN to git
 and are certain about dropping SVN history, consider
 linkgit:git-filter-branch[1] instead.  filter-branch also allows
-reformating of metadata for ease-of-reading and rewriting authorship
+reformatting of metadata for ease-of-reading and rewriting authorship
 info for non-"svn.authorsFile" users.
 
 svn.useSvmProps::
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 6c93202..6897794 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -49,7 +49,7 @@ submodule.<name>.fetchRecurseSubmodules::
 	submodule. If this option is also present in the submodules entry in
 	.git/config of the superproject, the setting there will override the
 	one found in .gitmodules.
-	Both settings can be overriden on the command line by using the
+	Both settings can be overridden on the command line by using the
 	"--[no-]recurse-submodules" option to "git fetch" and "git pull"..
 
 submodule.<name>.ignore::
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 92772e7..1e5c22c 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -10,7 +10,7 @@ merge.log::
 	In addition to branch names, populate the log message with at
 	most the specified number of one-line descriptions from the
 	actual commits that are being merged.  Defaults to false, and
-	true is a synoym for 20.
+	true is a synonym for 20.
 
 merge.renameLimit::
 	The number of files to consider when performing rename detection
diff --git a/Documentation/technical/api-sigchain.txt b/Documentation/technical/api-sigchain.txt
index 535cdff..9e1189e 100644
--- a/Documentation/technical/api-sigchain.txt
+++ b/Documentation/technical/api-sigchain.txt
@@ -32,7 +32,7 @@ and installation code should look something like:
   }
 ------------------------------------------
 
-Handlers are given the typdef of sigchain_fun. This is the same type
+Handlers are given the typedef of sigchain_fun. This is the same type
 that is given to signal() or sigaction(). It is perfectly reasonable to
 push SIG_DFL or SIG_IGN onto the stack.
 
-- 
1.7.4.rc0

Re: [PATCH] Fix typos in the documentation

[Junio C Hamano]

Ralf Wildenhues <Ralf.Wildenhues@gmx.de> writes:

> Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
> ---
>
> ...
> As far as I can see, the only difference between my and your change is
> "burn" vs. "burning" (ignoring trailing white space).  I don't see what
> your version is consistent to that mine isn't, but I think that yours
> is the grammatically correct way.  I'm not a native speaker though.
> Anyway, here's the updated patch.

Thanks for your attention to the details.  Will apply.