fix doc typos

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes-1.5.3.3.txt b/Documentation/RelNotes-1.5.3.3.txt
index 2a7bfdd5cc7b0a9494f3f151ba593146553a4945..d2138469511d3dc111d81b9354f100ed344d9524 100644 (file)
--- 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.
 
  * 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
    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 e4d0e475292654664f800b27f76e347de32af9e4..fa161718dd33a0b4c3b58fb3898e74369bcc3d94 100644 (file)
--- 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
 
 -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
        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 d75e4013431c82d11d853e1c84bea09c9695e671..c831548d4abfe8c2da7c8fc9b033d56b94f7a6cd 100644 (file)
--- 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
 
 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'
        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
        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::
        Default: 'SQLite'
 
 gitcvs.dbuser::

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 5d9c36985f4e37cdbecf29e4be52918dc4e8781f..af988821b81ee03fecb02ce038a16ca49220009c 100644 (file)
--- 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
 * 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
   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
 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.
 
 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
 
    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 5030d9f2f831651f231d5c40d0e2110564646ef2..6bdf034b3af55c8d881fee9153d5cd1824660692 100644 (file)
--- 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
 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.
 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.