[PATCH] fix doc typos

[PATCH] fix doc typos

[Jim Meyering]

Signed-off-by: Jim Meyering <meyering@redhat.com>
---
 Documentation/RelNotes-1.5.3.3.txt   |    2 +-
 Documentation/git-config.txt         |    2 +-
 Documentation/git-cvsserver.txt      |    4 ++--
 Documentation/git-rev-parse.txt      |    6 +++---
 Documentation/technical/racy-git.txt |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/RelNotes-1.5.3.3.txt b/Documentation/RelNotes-1.5.3.3.txt
index 2a7bfdd..d213846 100644
--- a/Documentation/RelNotes-1.5.3.3.txt
+++ b/Documentation/RelNotes-1.5.3.3.txt
@@ -12,7 +12,7 @@ Fixes since v1.5.3.2
  * The default shell on some FreeBSD did not execute the
    argument parsing code correctly and made git unusable.

- * git-svn incorrectly spawned pager even when the user user
+ * git-svn incorrectly spawned pager even when the user
    explicitly asked not to.

  * sample post-receive hook overquoted the envelope sender
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index e4d0e47..fa16171 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -130,7 +130,7 @@ See also <<FILES>>.

 -z, --null::
 	For all options that output values and/or keys, always
-	end values with with the null character (instead of a
+	end values with the null character (instead of a
 	newline). Use newline instead as a delimiter between
 	key and value. This allows for secure parsing of the
 	output without getting confused e.g. by values that
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index d75e401..c831548 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -204,7 +204,7 @@ about `DBI->connect()`.

 gitcvs.dbname::
 	Database name. The exact meaning depends on the
-	used database driver, for SQLite this is a filename.
+	selected database driver, for SQLite this is a filename.
 	Supports variable substitution (see below). May
 	not contain semicolons (`;`).
 	Default: '%Ggitcvs.%m.sqlite'
@@ -215,7 +215,7 @@ gitcvs.dbdriver::
 	with 'DBD::SQLite', reported to work with
 	'DBD::Pg', and reported *not* to work with 'DBD::mysql'.
 	Please regard this as an experimental feature. May not
-	contain double colons (`:`).
+	contain colons (`:`).
 	Default: 'SQLite'

 gitcvs.dbuser::
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 5d9c369..af98882 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -229,13 +229,13 @@ blobs contained in a commit.
 * A colon, optionally followed by a stage number (0 to 3) and a
   colon, followed by a path; this names a blob object in the
   index at the given path.  Missing stage number (and the colon
-  that follows it) names an stage 0 entry. During a merge, stage
+  that follows it) names a stage 0 entry. During a merge, stage
   1 is the common ancestor, stage 2 is the target branch's version
   (typically the current branch), and stage 3 is the version from
   the branch being merged.

 Here is an illustration, by Jon Loeliger.  Both node B and C are
-a commit parents of commit node A.  Parent commits are ordered
+commit parents of commit node A.  Parent commits are ordered
 left-to-right.

     G   H   I   J
@@ -291,7 +291,7 @@ and its parent commits exists.  `r1{caret}@` notation means all
 parents of `r1`.  `r1{caret}!` includes commit `r1` but excludes
 its all parents.

-Here are a handful examples:
+Here are a handful of examples:

    D                G H D
    D F              G H I J D F
diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt
index 5030d9f..6bdf034 100644
--- a/Documentation/technical/racy-git.txt
+++ b/Documentation/technical/racy-git.txt
@@ -184,7 +184,7 @@ In a large project where raciness avoidance cost really matters,
 however, the initial computation of all object names in the
 index takes more than one second, and the index file is written
 out after all that happens.  Therefore the timestamp of the
-index file will be more than one seconds later than the the
+index file will be more than one seconds later than the
 youngest file in the working tree.  This means that in these
 cases there actually will not be any racily clean entry in
 the resulting index.
--
1.5.4.rc5.1.ge6bfe

Re: [PATCH] fix doc typos

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

On Tue, Jan 29, 2008 at 08:38:55PM +0100, Jim Meyering <jim@meyering.net> wrote:
>  Here is an illustration, by Jon Loeliger.  Both node B and C are
> -a commit parents of commit node A.  Parent commits are ordered
> +commit parents of commit node A.  Parent commits are ordered

wouldn't this be "Both commit node B and C are parents of commit node A."?

- VMiklos

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] fix doc typos

[Jim Meyering]

Miklos Vajna <vmiklos@frugalware.org> wrote:
> On Tue, Jan 29, 2008 at 08:38:55PM +0100, Jim Meyering <jim@meyering.net> wrote:
>>  Here is an illustration, by Jon Loeliger.  Both node B and C are
>> -a commit parents of commit node A.  Parent commits are ordered
>> +commit parents of commit node A.  Parent commits are ordered
>
> wouldn't this be "Both commit node B and C are parents of commit node A."?

That does sound better.
While you're word-smithing, how about s/node B/nodes B/, too:

  "Both commit nodes B and C are parents of commit node A."

Send a patch.

[PATCH] Documentation: Fix typo

[Jean-Luc Herren]

Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
---

Beside the obvious s/if/is/ typo, is it easier to read this way?
It might be my ears but "is run" sounds strange to me.

jlh

 Documentation/git-cvsserver.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index c831548..d3e9993 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -183,7 +183,7 @@ access method and requested operation.
 That means that even if you offer only read access (e.g. by using
 the pserver method), git-cvsserver should have write access to
 the database to work reliably (otherwise you need to make sure
-that the database if up-to-date all the time git-cvsserver is run).
+that the database is up-to-date any time git-cvsserver is executed).
 
 By default it uses SQLite databases in the git directory, named
 `gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates
-- 
1.5.3.8

[PATCH] git rev-parse manpage: spelling fix

[Miklos Vajna]

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---

On Wed, Jan 30, 2008 at 09:56:27PM +0100, Jim Meyering <jim@meyering.net> wrote:
> Send a patch.

here it is.

 Documentation/git-rev-parse.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index af98882..f02f6bb 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -234,8 +234,8 @@ blobs contained in a commit.
   (typically the current branch), and stage 3 is the version from
   the branch being merged.
 
-Here is an illustration, by Jon Loeliger.  Both node B and C are
-commit parents of commit node A.  Parent commits are ordered
+Here is an illustration, by Jon Loeliger.  Both commit nodes B
+and C are parents of commit node A.  Parent commits are ordered
 left-to-right.
 
     G   H   I   J
-- 
1.5.4.rc5-dirty

[PATCH] Fix doc typos.

[Ralf Wildenhues]

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---
 Documentation/git-grep.txt                  |    2 +-
 Documentation/technical/api-run-command.txt |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 71a7335..a97f055 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -78,7 +78,7 @@ OPTIONS
 -l | --files-with-matches | --name-only | -L | --files-without-match::
 	Instead of showing every matched line, show only the
 	names of files that contain (or do not contain) matches.
-	For better compatability with git-diff, --name-only is a
+	For better compatibility with git-diff, --name-only is a
 	synonym for --files-with-matches.
 
 -c | --count::
diff --git a/Documentation/technical/api-run-command.txt b/Documentation/technical/api-run-command.txt
index dfbf9ac..fde3b45 100644
--- a/Documentation/technical/api-run-command.txt
+++ b/Documentation/technical/api-run-command.txt
@@ -49,7 +49,7 @@ Functions
 
 `finish_async`::
 
-	Wait for the completeion of an asynchronous function that was
+	Wait for the completion of an asynchronous function that was
 	started with start_async().
 
 
@@ -121,8 +121,8 @@ string pointers (NULL terminated) in .env:
 . If the string is of the form "VAR=value", i.e. it contains '='
   the variable is added to the child process's environment.
 
-. If the string does not contain '=', it names an environement
-  variable that will be removed from the child process's envionment.
+. If the string does not contain '=', it names an environment
+  variable that will be removed from the child process's environment.
 
 To specify a new initial working directory for the sub-process,
 specify it in the .dir member.
-- 
1.5.4.3.366.g56462