Autogenerated HTML docs for v1.5.4-rc5-11-g0eab8

diff --git a/RelNotes-1.5.3.3.txt b/RelNotes-1.5.3.3.txt
index 2a7bfdd..d213846 100644 (file)
--- a/RelNotes-1.5.3.3.txt
+++ b/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/git-config.html b/git-config.html
index 5b5ff95..8d29af9 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -493,7 +493,7 @@ rather than from all available files.</p>
 <dd>\r
 <p>\r
         For all options that output values and/or keys, always\r
-        end values with with the null character (instead of a\r
+        end values with the null character (instead of a\r
         newline). Use newline instead as a delimiter between\r
         key and value. This allows for secure parsing of the\r
         output without getting confused e.g. by values that\r
@@ -2213,7 +2213,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Jan-2008 09:44:48 UTC\r
+Last updated 30-Jan-2008 08:28:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-config.txt b/git-config.txt
index e4d0e47..fa16171 100644 (file)
--- a/git-config.txt
+++ b/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/git-cvsserver.html b/git-cvsserver.html
index 4e2da4b..d36a41f 100644 (file)
--- a/git-cvsserver.html
+++ b/git-cvsserver.html
@@ -492,7 +492,7 @@ gitcvs.dbname
 <dd>\r
 <p>\r
         Database name. The exact meaning depends on the\r
-        used database driver, for SQLite this is a filename.\r
+        selected database driver, for SQLite this is a filename.\r
         Supports variable substitution (see below). May\r
         not contain semicolons (<tt>;</tt>).\r
         Default: <em>%Ggitcvs.%m.sqlite</em>\r
@@ -508,7 +508,7 @@ gitcvs.dbdriver
         with <em>DBD::SQLite</em>, reported to work with\r
         <em>DBD::Pg</em>, and reported <strong>not</strong> to work with <em>DBD::mysql</em>.\r
         Please regard this as an experimental feature. May not\r
-        contain double colons (<tt>:</tt>).\r
+        contain colons (<tt>:</tt>).\r
         Default: <em>SQLite</em>\r
 </p>\r
 </dd>\r
@@ -691,7 +691,7 @@ Martin Langhoff &lt;martin@catalyst.net.nz&gt;
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:10 UTC\r
+Last updated 30-Jan-2008 08:28:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsserver.txt b/git-cvsserver.txt
index d75e401..c831548 100644 (file)
--- a/git-cvsserver.txt
+++ b/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/git-rev-parse.html b/git-rev-parse.html
index 67594b9..c197b0c 100644 (file)
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -680,7 +680,7 @@ A suffix <em>:</em> followed by a path; this names the blob or tree
 A colon, optionally followed by a stage number (0 to 3) and a\r
   colon, followed by a path; this names a blob object in the\r
   index at the given path.  Missing stage number (and the colon\r
-  that follows it) names an stage 0 entry. During a merge, stage\r
+  that follows it) names a stage 0 entry. During a merge, stage\r
   1 is the common ancestor, stage 2 is the target branch's version\r
   (typically the current branch), and stage 3 is the version from\r
   the branch being merged.\r
@@ -688,7 +688,7 @@ A colon, optionally followed by a stage number (0 to 3) and a
 </li>\r
 </ul>\r
 <p>Here is an illustration, by Jon Loeliger.  Both node B and C are\r
-a commit parents of commit node A.  Parent commits are ordered\r
+commit parents of commit node A.  Parent commits are ordered\r
 left-to-right.</p>\r
 <div class="literalblock">\r
 <div class="content">\r
@@ -740,7 +740,7 @@ It is the set of commits that are reachable from either one of
 and its parent commits exists.  <tt>r1&#94;@</tt> notation means all\r
 parents of <tt>r1</tt>.  <tt>r1&#94;!</tt> includes commit <tt>r1</tt> but excludes\r
 its all parents.</p>\r
-<p>Here are a handful examples:</p>\r
+<p>Here are a handful of examples:</p>\r
 <div class="literalblock">\r
 <div class="content">\r
 <pre><tt>D                G H D\r
@@ -834,7 +834,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Pierre Habouzit &lt;madcoder@debian.or
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:44 UTC\r
+Last updated 30-Jan-2008 08:28:23 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index 5d9c369..af98882 100644 (file)
--- a/git-rev-parse.txt
+++ b/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/technical/racy-git.txt b/technical/racy-git.txt
index 5030d9f..6bdf034 100644 (file)
--- a/technical/racy-git.txt
+++ b/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.